Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (ab1e7a858c491a93147b43233ff262f517ce858d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (ab1e7a858c491a93147b43233ff262f517ce858d)
  • Date: Fri, 19 Jan 2007 03:48:08 -0600

GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ftp/wget/HISTORY | 4 ++++
ftp/wget/INSTALL | 4 ++--
ftp/wget/POST_REMOVE | 3 ++-
utils/coreutils/HISTORY | 3 +++
utils/coreutils/PRE_BUILD | 13 +++++++------
utils/grep/HISTORY | 4 ++++
utils/grep/INSTALL | 4 ++--
utils/grep/POST_REMOVE | 3 ++-
8 files changed, 26 insertions(+), 12 deletions(-)

New commits:
commit ab1e7a858c491a93147b43233ff262f517ce858d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx 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.

Conflicts:

utils/coreutils/PRE_BUILD

also disabling the EPERM patch as per the bug

commit 09c64110e20e27da1b5bb253553ea7f199504607
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

grep: fixing bug 12808

commit b343aa669a55691c36f3db8989e5ff31241ff5c3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

wget: fixing bug 12807

Conflicts:

ftp/wget/HISTORY

diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 53431c4..6d9e5fa 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,7 @@
+2007-01-18 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * POST_REMOVE, INSTALL: fixing bug #12807 (problems with install-info
+ * from dpkg spell).
+
2007-01-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: added UPSTREAM_KEY, fixes bug#12946

diff --git a/ftp/wget/INSTALL b/ftp/wget/INSTALL
index b9d4991..47159f5 100755
--- a/ftp/wget/INSTALL
+++ b/ftp/wget/INSTALL
@@ -1,3 +1,3 @@
make install DESTDIR=$INSTALL_ROOT &&
-install-info ${INSTALL_ROOT}/usr/share/info/wget.info \
- --info-dir ${INSTALL_ROOT}/usr/share/info
+install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
+ ${INSTALL_ROOT}/usr/share/info/wget.info
diff --git a/ftp/wget/POST_REMOVE b/ftp/wget/POST_REMOVE
index 3229abb..76b363f 100755
--- a/ftp/wget/POST_REMOVE
+++ b/ftp/wget/POST_REMOVE
@@ -1 +1,2 @@
-install-info --delete wget --info-dir ${INSTALL_ROOT}/usr/share/info
+install-info --remove --info-dir="${INSTALL_ROOT}/usr/share/info"\
+ ${INSTALL_ROOT}/usr/share/info/wget.info
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 9d63abd..713bc4f 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 d4e463c..4526171 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -1,6 +1,12 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
#patch -p1 < $SCRIPT_DIRECTORY/coreutils-cp-mv-oMFS-bug.patch &&
+
+#
+# Don't install coreutils' hostname (Bug #7089)
+#
+patch -p1 < $SCRIPT_DIRECTORY/hostname.diff &&
+
#
# patch for pam support in su
#
@@ -8,9 +14,4 @@ if echo $OPTS | grep -q enable-pam
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
+fi
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index ea614db..4d9bde7 100755
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,7 @@
+2007-01-18 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * INSTALL, POST_REMOVE: fixing bug #12808 (problems with install-info
+ * from dpkg spell)
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/grep/INSTALL b/utils/grep/INSTALL
index a5b8ab0..28598d4 100755
--- a/utils/grep/INSTALL
+++ b/utils/grep/INSTALL
@@ -1,3 +1,3 @@
make install DESTDIR=$INSTALL_ROOT &&
-install-info ${INSTALL_ROOT}/usr/share/info/grep.info \
- --info-dir=${INSTALL_ROOT}/usr/share/info
+install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
+ ${INSTALL_ROOT}/usr/share/info/grep.info
diff --git a/utils/grep/POST_REMOVE b/utils/grep/POST_REMOVE
index ec74f46..2ab5fc5 100755
--- a/utils/grep/POST_REMOVE
+++ b/utils/grep/POST_REMOVE
@@ -1 +1,2 @@
-install-info --delete grep --info-dir ${INSTALL_ROOT}/usr/share/info
+install-info --remove --info-dir="${INSTALL_ROOT}/usr/share/info"\
+ ${INSTALL_ROOT}/usr/share/info/grep.info



  • [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jaka Kranjc (ab1e7a858c491a93147b43233ff262f517ce858d), Jaka Kranjc, 01/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page