New commits:
commit 783a4e6ec292e17e2524c1fff1887ac6e0e52703
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
coreutils: 6.9 #13574
i made the assumption that using gnu-verified.gpg means it is a verified
keyring
commit 71dbd816b01bd34aa965b1cbbc4f4350ef9a4824
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
properly fix #7311
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 351e251..8539cff 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2007-04-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * mountall.sh: add /proc to mtab, take two #7311
+
2007-03-05 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Fixed error in kernel version checking that in some
cases erroneously caused udev-old to be pulled in.
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 55bf15d..4235fd5 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -92,6 +92,11 @@ start()
mount -a -t tmpfs
evaluate_retval
+ # bug 7311 - if proc was mounted, list it in mtab; awk is /usr friendly
+ if awk 'BEGIN{proc=1} /\/proc/{proc=0} END{exit proc}' /proc/mounts; then
+ builtin echo 'none /proc proc rw 0 0' >> /etc/mtab
+ fi
+
#As per FHS sm bug #10509
echo "Cleaning out /var/run..."
[ -d /var/run ] && recursive_rm /var/run/*
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 1305671..e90b34c 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,13 +1,12 @@
SPELL=coreutils
- VERSION=6.4
+ VERSION=6.9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
- SOURCE_GPG=gnu-verified.gpg:$SOURCE2
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=3
WEB_SITE=http://www.gnu.org/software/coreutils/
ENTERED=20030409
LICENSE[0]=GPL
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 0856939..212cdd2 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,7 @@
+2007-04-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * hostname.diff: updated for the new version
+ * DETAILS: updated spell to 6.9, added key qualifier to SOURCE_GPG
+
2007-02-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated patchlevel for stable 0.7 release purposes