diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-03-02 22:27:16 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-03-02 22:27:16 +0000 |
| commit | df4cee999b4689f43e75cd2cbe4199f5f3975e47 (patch) | |
| tree | 523fa07c27b56b3c47a72067a2fbc6d4634d8da3 /sys-apps/baselayout | |
| parent | Stable on hppa (bug #90793). (diff) | |
| download | historical-df4cee999b4689f43e75cd2cbe4199f5f3975e47.tar.gz historical-df4cee999b4689f43e75cd2cbe4199f5f3975e47.tar.bz2 historical-df4cee999b4689f43e75cd2cbe4199f5f3975e47.zip | |
Fixed patch - again!
Package-Manager: portage-2.1_pre5-r2
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch | 66 |
2 files changed, 42 insertions, 40 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 15d8bfa69b87..4ae0afeb0fb9 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 ce0afe5a9763b20da26d18e7ff28181d ChangeLog 70991 RMD160 d33aecad05a97f37a28421aa659c546c02b6d88f ChangeLog 70991 SHA256 b01da2502d5ec64748699b61b72c46ff523d87fe336256cccdcd00b95d59700f ChangeLog 70991 @@ -19,9 +16,9 @@ SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030 files/ba MD5 ec29ba4690f7c58a8d562195bc9eed42 files/baselayout-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f files/baselayout-1.11.14-adsl.patch 501 SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/baselayout-1.11.14-adsl.patch 501 -MD5 ffce60ad3561be077e3925c98a8e5c35 files/baselayout-1.11.14-depscan.patch 3574 -RMD160 433ecdf87171c19452ec5408fa7a0a02b20f9fee files/baselayout-1.11.14-depscan.patch 3574 -SHA256 5aaf7c9d9db9508403abb737ae5a5966a234b419fe7d479f1721f67b2bdb749c files/baselayout-1.11.14-depscan.patch 3574 +MD5 08bc03119bcc983bc0d3ed981e014132 files/baselayout-1.11.14-depscan.patch 4105 +RMD160 ce5d8e4002a80008de3890cc0ab377dee9ba0835 files/baselayout-1.11.14-depscan.patch 4105 +SHA256 897d20710f0ff5c62b2116ac8b077b239db674284bfee3c95de891753412198d files/baselayout-1.11.14-depscan.patch 4105 MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-1.11.14-essidnet.patch 619 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-1.11.14-essidnet.patch 619 @@ -55,10 +52,3 @@ SHA256 4800938394cdc3186eb178b7e9a0dc7d2f24954b860f697d00dfdb02fce94e74 files/di MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 RMD160 99e2546d3cc014ca5af909b5adb2f43693664bad metadata.xml 385 SHA256 fbd7e4a5615d68c8d6f9438136dd18e41c43b393a9c00b0bea12661d790441e1 metadata.xml 385 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) - -iD8DBQFEB10CTOXg++0VvJQRAqXVAKDUOLAO3f2bC88WTilffeSqSr2AUwCgvG72 -8WXKjqFvlgNh1F2ORrBpLi4= -=lknr ------END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch index 3141e24c3188..8c532fd7a738 100644 --- a/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch +++ b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch @@ -1,36 +1,10 @@ -Index: sbin/rc -=================================================================== ---- sbin/rc (revision 1934) -+++ sbin/rc (working copy) -@@ -407,7 +407,7 @@ - grep -ve '\(depcache\|deptree\|envcache\)') - - # Update the dependency cache -- /sbin/depscan.sh -u -+ /sbin/depscan.sh - - # Now that the dependency cache are up to date, make sure these - # are marked as started ... -Index: sbin/rc-services.sh -=================================================================== ---- sbin/rc-services.sh (revision 1934) -+++ sbin/rc-services.sh (working copy) -@@ -10,7 +10,7 @@ - - if [ "${RC_GOT_DEPTREE_INFO}" != "yes" ] - then -- if ! /sbin/depscan.sh -u -+ if ! /sbin/depscan.sh - then - echo - eerror "Error running '/sbin/depscan.sh'!" --- sbin/depscan.sh 2005-07-22 01:24:27.000000000 +0100 +++ sbin/depscan.sh 2006-03-02 20:28:03.000000000 +0000 @@ -1,58 +1,64 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 --# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.2 2006/03/02 20:34:20 uberlord Exp $ +-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.3 2006/03/02 22:27:16 uberlord Exp $ -source /etc/init.d/functions.sh - @@ -143,3 +117,41 @@ Index: sbin/rc-services.sh - # vim:ts=4 +--- sbin/rc 2006-03-02 22:10:56.000000000 +0000 ++++ sbin/rc 2006-03-02 20:28:03.000000000 +0000 +@@ -1,5 +1,5 @@ + #!/bin/bash +-# Copyright 1999-2005 Gentoo Foundation ++# Copyright 1999-2006 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + # $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.3 2006/03/02 22:27:16 uberlord Exp $ + +@@ -111,7 +111,7 @@ + + echo + echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}" +- echo -e " Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2" ++ echo -e " Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2" + echo + + check_statedir /proc +@@ -407,7 +407,7 @@ + grep -ve '\(depcache\|deptree\|envcache\)') + + # Update the dependency cache +- /sbin/depscan.sh -u ++ /sbin/depscan.sh + + # Now that the dependency cache are up to date, make sure these + # are marked as started ... +--- sbin/rc-services.sh 2005-03-08 16:07:30.000000000 +0000 ++++ sbin/rc-services.sh 2006-03-02 20:28:03.000000000 +0000 +@@ -10,7 +10,7 @@ + + if [ "${RC_GOT_DEPTREE_INFO}" != "yes" ] + then +- if ! /sbin/depscan.sh -u ++ if ! /sbin/depscan.sh + then + echo + eerror "Error running '/sbin/depscan.sh'!" |