[SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0a91c39c883fdec99889295ed7974d08ffb567b)

Thomas Orgis scm at mail.sourcemage.org
Thu Jan 18 11:45:16 EST 2007


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 utils/coreutils/HISTORY   |    3 +++
 utils/coreutils/PRE_BUILD |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit c0a91c39c883fdec99889295ed7974d08ffb567b
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    Fix coreutils again, now with patch order.
    I didn't encounter this on my testing last week, now I got hostname.diff failing after the autoreconf from PAM - has it been there back then?
    Now applying all other patches before the PAM stuff.

diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index b56286f..6f3069e 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2007-01-18 Thomas Orgis <sobukus at sourcemage.org>
+	* PRE_BUILD: do PAM patch and autoreconf _after_ all other patches
+
 2007-01-14 Thomas Orgis <sobukus at sourcemage.org>
 	* DEPENDS: depend on autoconf if PAM is enabled
 	* BUILD, PRE_BUILD: fixed the PAM fix, regenerating configure
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index 48f77aa..9e7f49d 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -1,23 +1,24 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 #patch  -p1  <  $SCRIPT_DIRECTORY/coreutils-cp-mv-oMFS-bug.patch  &&
-#
-# patch for pam support in su
-#
-if  echo  $OPTS  |  grep  -q  enable-pam;  then
-   message "${MESSAGE_COLOR} linux-pam is  enabled ${DEFAULT_COLOR}"   &&
-   patch  -p1  <  $SCRIPT_DIRECTORY/coreutils-pam.patch &&
-   autoreconf --force # make sure to give clear situation with automake-1.9
-fi  &&
 
 #
 # Don't install coreutils' hostname  (Bug #7089)
 #
-patch  -p1  <  $SCRIPT_DIRECTORY/hostname.diff
+patch  -p1  <  $SCRIPT_DIRECTORY/hostname.diff &&
 
 #
 # Cause mv(1) to try a backup strategy more often when rename(2) fails
 # (needed for inter-directory file moving on a 9p mount in particular)
 # Bug #13377
 #
-patch  -p1  <  $SCRIPT_DIRECTORY/coreutils-6.4_9p_mv_EPERM.patch
+patch  -p1  <  $SCRIPT_DIRECTORY/coreutils-6.4_9p_mv_EPERM.patch &&
+
+#
+# patch for pam support in su
+#
+if  echo  $OPTS  |  grep  -q  enable-pam;  then
+   message "${MESSAGE_COLOR} linux-pam is  enabled ${DEFAULT_COLOR}"   &&
+   patch  -p1  <  $SCRIPT_DIRECTORY/coreutils-pam.patch &&
+   autoreconf --force # make sure to give clear situation with automake-1.9
+fi



More information about the SM-Commit mailing list