Adding a patch to fix runlevel scripts for older baselayouts. util-vserver-0.30.212...

Package-Manager: portage-2.1.2-r1

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 12ee86e2a4432b765262e94c27d5689ed0c42003..f96b95c11057a71d9e1a602f2ed11f076dc77217 100644 (file)
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.69 2007/01/20 12:35:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.70 2007/01/21 00:10:13 phreak Exp $
+
+  20 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +files/util-vserver-0.30.212-initpost.patch, util-vserver-0.30.212.ebuild:
+  Adding a patch to fix runlevel scripts for older baselayouts.
+  util-vserver-0.30.212 going stable on amd64 and x86.
 
   20 Jan 2007; Christian Heim <phreak@gentoo.org>
   util-vserver-0.30.212.ebuild:

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 7433d772b1dad89df19088e61e5f3c10aa425918..7a27184e91f3d68aad1c463420c0625adf94eb2a 100644 (file)
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -13,6 +13,10 @@ AUX init.d/vservers.default 328 RMD160 4ae796520847688da33befaa551faefd58be8184
 MD5 50181061681eac3cb085af7766987557 files/init.d/vservers.default 328
 RMD160 4ae796520847688da33befaa551faefd58be8184 files/init.d/vservers.default 328
 SHA256 cdab1911b6d13a3253c2744ee1b007eda16d28c24d9eeea732d63934a1bdaaba files/init.d/vservers.default 328
+AUX util-vserver-0.30.212-initpost.patch 1839 RMD160 6062d18b81980849538d5c74183f5d3980b78f7b SHA1 951699a58a11f466f26083512d792aa31313b748 SHA256 741df3db8d685f59df21645b14911f8e928dd64113bd1df82a02b8f1068eadab
+MD5 aa933a1cebf2ad772153cd52d312f429 files/util-vserver-0.30.212-initpost.patch 1839
+RMD160 6062d18b81980849538d5c74183f5d3980b78f7b files/util-vserver-0.30.212-initpost.patch 1839
+SHA256 741df3db8d685f59df21645b14911f8e928dd64113bd1df82a02b8f1068eadab files/util-vserver-0.30.212-initpost.patch 1839
 AUX util-vserver-0.30.212-wrapper.patch 1349 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 SHA1 2b5e04383bc3e5a52ae2fde86eb77a8f3cf8eeb5 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe
 MD5 bc15d959f59fbe0250e0be2f2ca9ee70 files/util-vserver-0.30.212-wrapper.patch 1349
 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrapper.patch 1349
@@ -30,14 +34,14 @@ EBUILD util-vserver-0.30.211.ebuild 3748 RMD160 cb6beaaa6489d3e5511049f5fa700610
 MD5 7083d9253ab270405c9854605edabf09 util-vserver-0.30.211.ebuild 3748
 RMD160 cb6beaaa6489d3e5511049f5fa700610642e8758 util-vserver-0.30.211.ebuild 3748
 SHA256 8282a7f9a115458390ba13ea9a6e47ec48a5af9b81747f265bc211c821568c48 util-vserver-0.30.211.ebuild 3748
-EBUILD util-vserver-0.30.212.ebuild 3835 RMD160 d418b900a498069e88ff7b8a2657e50dc20eaf5e SHA1 566f6c0b2a7d6ffc8766ace0e26a6fa8a8d63f8e SHA256 c6b084daad7761586c8ef3400927bbcc4710f0d7f099cb8c54e9582acbecbbb2
-MD5 f544cf1c49efabe237d31c684bf033e5 util-vserver-0.30.212.ebuild 3835
-RMD160 d418b900a498069e88ff7b8a2657e50dc20eaf5e util-vserver-0.30.212.ebuild 3835
-SHA256 c6b084daad7761586c8ef3400927bbcc4710f0d7f099cb8c54e9582acbecbbb2 util-vserver-0.30.212.ebuild 3835
-MISC ChangeLog 14316 RMD160 60b90942052629aca13084bc6d36d2b51ef0daae SHA1 c4f86c9b2a02e8b7ad71accf44b2e6d0f96b542c SHA256 f6f5e7b4556650963e8d33b2969bc55f05e01f1dbd1c68ea3d1ba33cbf3310a9
-MD5 3d4c047d3df01a94a0ce314b54be952a ChangeLog 14316
-RMD160 60b90942052629aca13084bc6d36d2b51ef0daae ChangeLog 14316
-SHA256 f6f5e7b4556650963e8d33b2969bc55f05e01f1dbd1c68ea3d1ba33cbf3310a9 ChangeLog 14316
+EBUILD util-vserver-0.30.212.ebuild 3875 RMD160 3f4ff37cda1235b461ef95722a972830b4d82767 SHA1 51a82e5b1763d9002e0c832d579ced02cac5f487 SHA256 fd57aef55adc84a43ccb40707278488dd57ea1a733cbbb1cdcc3ba53d060b1c3
+MD5 0f22bdf549bc6749a3f8980c372a73c4 util-vserver-0.30.212.ebuild 3875
+RMD160 3f4ff37cda1235b461ef95722a972830b4d82767 util-vserver-0.30.212.ebuild 3875
+SHA256 fd57aef55adc84a43ccb40707278488dd57ea1a733cbbb1cdcc3ba53d060b1c3 util-vserver-0.30.212.ebuild 3875
+MISC ChangeLog 14563 RMD160 bb4a922baa49c1c2f430c9cff157b6e9e1e63ada SHA1 117589f695896df880ddd45f7d4eb55d164dd864 SHA256 61e3e44b8bcd2a141d1972b47571b50ef3133ec7fe47444dff25b14ff016271a
+MD5 adafb51e66107629cf29e5556f80d8f8 ChangeLog 14563
+RMD160 bb4a922baa49c1c2f430c9cff157b6e9e1e63ada ChangeLog 14563
+SHA256 61e3e44b8bcd2a141d1972b47571b50ef3133ec7fe47444dff25b14ff016271a ChangeLog 14563
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -54,7 +58,7 @@ SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFsgx7yuNVb5qfaOYRAuckAJ9i98u+g0++sM5D5vuZ+DTBzQfntwCgu5/F
-j7V04Qiqs92PytXAtoXHjFU=
-=Dz3M
+iD8DBQFFsq87yuNVb5qfaOYRAkfbAJwPWXSzFIL9QFWGiZptpmPVbRWZ4gCguIWQ
+tzeQR5fBV51g6iNtENxFznA=
+=kyOS
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch
new file mode 100644 (file)
index 0000000..dfb45db
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch
@@ -0,0 +1,62 @@
+Index: /trunk/distrib/gentoo/initpost\r
+===================================================================\r
+--- /trunk/distrib/gentoo/initpost (revision 2366)\r
++++ /trunk/distrib/gentoo/initpost (revision 2465)\r
+@@ -18,5 +18,6 @@\r
+ ## Called as: initpost <cfgdir> <path of util-vserver-vars>\r
+ \r
+-vdir="$1"/vdir\r
++cfgdir="$1"\r
++vdir="$cfgdir"/vdir\r
+ . "$2"\r
+ \r
+@@ -30,5 +31,5 @@\r
+ # gentoo initstyle magic\r
+ initstyle=sysv\r
+-test -e "$1"/apps/init/style && initstyle=$(<"$1"/apps/init/style)\r
++test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)\r
+ \r
+ if test "$initstyle" == "gentoo"; then\r
+@@ -52,4 +53,29 @@\r
+       echo "!!!"\r
+ fi\r
++\r
++\r
++# unneeded runlevel scripts\r
++pushd "$vdir" &>/dev/null\r
++echo ">>> Fixing default runlevel scripts ... "\r
++$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :\r
++$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :\r
++popd &>/dev/null\r
++\r
++\r
++# setting hostname\r
++pushd "$vdir" &>/dev/null\r
++\r
++if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then\r
++      echo ">>> Setting hostname ... "\r
++      hostnametmp=$($_MKTEMP hostname.XXXXXX)\r
++\r
++      $_CHROOT_SH cat /etc/conf.d/hostname | \\r
++      $_SED "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":" > $hostnametmp\r
++      $_CHROOT_SH truncate /etc/conf.d/hostname  < $hostnametmp\r
++\r
++      $_RM -f $hostnametmp\r
++fi\r
++\r
++popd &>/dev/null\r
+ \r
+ \r
+@@ -89,12 +115,4 @@\r
+ \r
+ \r
+-# unneeded runlevel scripts\r
+-pushd "$vdir" &>/dev/null\r
+-echo ">>> Fixing default runlevel scripts ... "\r
+-$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :\r
+-$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :\r
+-popd &>/dev/null\r
+-\r
+-\r
+ # fix fstab for checkfs/localmount\r
+ pushd "$vdir" &>/dev/null\r

diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
index 3e9326a89aeb7ab559cc3912c65c14d4b6a9cbe1..d2fd0ab446f4352ed184ea9fdf985d57f7f85653 100644 (file)
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild,v 1.3 2007/01/20 12:35:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild,v 1.4 2007/01/21 00:10:13 phreak Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="latest"
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE=""
 
@@ -47,6 +47,7 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}"/${P}-wrapper.patch
+       epatch "${FILESDIR}"/${P}-initpost.patch
 }
 
 src_compile() {