Revision bump, fixing the initpost patch (thanks to Karel Hala <stripe at suchdol.net> in #163045).

Package-Manager: portage-2.1.2-r1

5 files changed, 98 insertions, 82 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index f96b95c11057..721ff43ef787 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2007/01/21 00:10:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.71 2007/01/21 11:34:53 phreak Exp $
+
+*util-vserver-0.30.212-r1 (21 Jan 2007)
+
+  21 Jan 2007; Christian Heim <phreak@gentoo.org>
+  files/util-vserver-0.30.212-initpost.patch, -util-vserver-0.30.212.ebuild,
+  +util-vserver-0.30.212-r1.ebuild:
+  Revision bump, fixing the initpost patch (thanks to Karel Hala <stripe at
+  suchdol.net> in #163045).
 
   20 Jan 2007; Christian Heim <phreak@gentoo.org>
   +files/util-vserver-0.30.212-initpost.patch, util-vserver-0.30.212.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 7a27184e91f3..a5aa6e79a878 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -13,10 +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-initpost.patch 2066 RMD160 70194e005c573eba073d95415188c9ed779511e9 SHA1 180fe7a2187af1247f3695e1687efe506d1ac929 SHA256 231c86e9f2ce2aa2ac1643662162c9e064fbeff620b6781fd13e5edb2439d527
+MD5 793e69e656b487e92db95a258049413b files/util-vserver-0.30.212-initpost.patch 2066
+RMD160 70194e005c573eba073d95415188c9ed779511e9 files/util-vserver-0.30.212-initpost.patch 2066
+SHA256 231c86e9f2ce2aa2ac1643662162c9e064fbeff620b6781fd13e5edb2439d527 files/util-vserver-0.30.212-initpost.patch 2066
 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
@@ -34,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 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
+EBUILD util-vserver-0.30.212-r1.ebuild 3878 RMD160 ec103558f9bf0672b4b38d43c7e50099d6821ff8 SHA1 63f718bf0eb74487fc07a68692ef625a642b604d SHA256 1ec37f0b2467cbd6f43a720af5816d107a08382e581bc65ccc8a4fb90650a535
+MD5 320f4f6642f34ea1f3cc08e867baeecc util-vserver-0.30.212-r1.ebuild 3878
+RMD160 ec103558f9bf0672b4b38d43c7e50099d6821ff8 util-vserver-0.30.212-r1.ebuild 3878
+SHA256 1ec37f0b2467cbd6f43a720af5816d107a08382e581bc65ccc8a4fb90650a535 util-vserver-0.30.212-r1.ebuild 3878
+MISC ChangeLog 14872 RMD160 0490392bbe951cde49c5012ed99850271c33e1e3 SHA1 29b591be2f103157ce64729a2abf9a00487aea8b SHA256 6e10acd77829903e4423e4c65b6ea02586782ec7bf0b2c5e62169e4af957a811
+MD5 e96d36549b4a5c987806e7e6acd8d421 ChangeLog 14872
+RMD160 0490392bbe951cde49c5012ed99850271c33e1e3 ChangeLog 14872
+SHA256 6e10acd77829903e4423e4c65b6ea02586782ec7bf0b2c5e62169e4af957a811 ChangeLog 14872
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -52,13 +52,13 @@ SHA256 79be461cd53fcb5001642cba8bb6209721985b5ded8d0a1069a5fa5b00ac77f0 files/di
 MD5 ff2bb7ab2945af029601c34945d1176c files/digest-util-vserver-0.30.211 557
 RMD160 08e44f5e8344556e27c2e02c43761b7f6540a139 files/digest-util-vserver-0.30.211 557
 SHA256 9eb1f127a0ef112a1d8b41df3d1327f70735edeabdc5927089bcdafdd322ef59 files/digest-util-vserver-0.30.211 557
-MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212 268
-RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212 268
-SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212 268
+MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212-r1 268
+RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212-r1 268
+SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212-r1 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFsq87yuNVb5qfaOYRAkfbAJwPWXSzFIL9QFWGiZptpmPVbRWZ4gCguIWQ
-tzeQR5fBV51g6iNtENxFznA=
-=kyOS
+iD8DBQFFs0+1yuNVb5qfaOYRAtkqAKCXCeBMV/+5K/zIQxUm/KKNybu7vgCfXNNm
+YDYVxoQ13qOPTgzM8Bjh+jw=
+=dAYF
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
index 0babb2f87de0..0babb2f87de0 100644
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
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
index dfb45db9c4f5..27178416d3a8 100644
--- 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
@@ -1,62 +1,70 @@
-Index: /trunk/distrib/gentoo/initpost

-===================================================================

---- /trunk/distrib/gentoo/initpost (revision 2366)

-+++ /trunk/distrib/gentoo/initpost (revision 2465)

-@@ -18,5 +18,6 @@

- ## Called as: initpost <cfgdir> <path of util-vserver-vars>

- 

--vdir="$1"/vdir

-+cfgdir="$1"

-+vdir="$cfgdir"/vdir

- . "$2"

- 

-@@ -30,5 +31,5 @@

- # gentoo initstyle magic

- initstyle=sysv

--test -e "$1"/apps/init/style && initstyle=$(<"$1"/apps/init/style)

-+test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)

- 

- if test "$initstyle" == "gentoo"; then

-@@ -52,4 +53,29 @@

- 	echo "!!!"

- fi

-+

-+

-+# unneeded runlevel scripts

-+pushd "$vdir" &>/dev/null

-+echo ">>> Fixing default runlevel scripts ... "

-+$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :

-+$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :

-+popd &>/dev/null

-+

-+

-+# setting hostname

-+pushd "$vdir" &>/dev/null

-+

-+if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then

-+	echo ">>> Setting hostname ... "

-+	hostnametmp=$($_MKTEMP hostname.XXXXXX)

-+

-+	$_CHROOT_SH cat /etc/conf.d/hostname | \

-+	$_SED "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":" > $hostnametmp

-+	$_CHROOT_SH truncate /etc/conf.d/hostname  < $hostnametmp

-+

-+	$_RM -f $hostnametmp

-+fi

-+

-+popd &>/dev/null

- 

- 

-@@ -89,12 +115,4 @@

- 

- 

--# unneeded runlevel scripts

--pushd "$vdir" &>/dev/null

--echo ">>> Fixing default runlevel scripts ... "

--$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :

--$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :

--popd &>/dev/null

--

--

- # fix fstab for checkfs/localmount

- pushd "$vdir" &>/dev/null

+Index: util-vserver-0.30.212/distrib/gentoo/initpost
+===================================================================
+--- util-vserver-0.30.212.orig/distrib/gentoo/initpost
++++ util-vserver-0.30.212/distrib/gentoo/initpost
+@@ -17,7 +17,8 @@
+ 
+ ## Called as: initpost <cfgdir> <path of util-vserver-vars>
+ 
+-vdir="$1"/vdir
++cfgdir="$1"
++vdir="$cfgdir"/vdir
+ . "$2"
+ 
+ # portage stuff
+@@ -29,7 +30,7 @@ popd &>/dev/null
+ 
+ # gentoo initstyle magic
+ initstyle=sysv
+-test -e "$1"/apps/init/style && initstyle=$(<"$1"/apps/init/style)
++test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
+ 
+ if test "$initstyle" == "gentoo"; then
+ 	pushd "$vdir" &>/dev/null
+@@ -53,6 +54,31 @@ if test "$initstyle" == "gentoo"; then
+ fi
+ 
+ 
++# unneeded runlevel scripts
++pushd "$vdir" &>/dev/null
++echo ">>> Fixing default runlevel scripts ... "
++$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
++$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
++popd &>/dev/null
++
++
++# setting hostname
++pushd "$vdir" &>/dev/null
++
++if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then
++	echo ">>> Setting hostname ... "
++	hostnametmp=$($_MKTEMP hostname.XXXXXX)
++
++	$_CHROOT_SH cat /etc/conf.d/hostname | \
++	$_SED "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":" > $hostnametmp
++	$_CHROOT_SH truncate /etc/conf.d/hostname  < $hostnametmp
++
++	$_RM -f $hostnametmp
++fi
++
++popd &>/dev/null
++
++
+ # check for baselayout >= 1.13
+ pushd "$vdir" &>/dev/null
+ basever=$($_CHROOT_SH cat /etc/gentoo-release | $_AWK '{print $5}')
+@@ -88,14 +114,6 @@ fi
+ popd &>/dev/null
+ 
+ 
+-# unneeded runlevel scripts
+-pushd "$vdir" &>/dev/null
+-echo ">>> Fixing default runlevel scripts ... "
+-$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
+-$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
+-popd &>/dev/null
+-
+-
+ # fix fstab for checkfs/localmount
+ pushd "$vdir" &>/dev/null
+ echo ">>> Fixing fstab ... "
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild
index d2fd0ab446f4..3c2d2c032e28 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212-r1.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.4 2007/01/21 00:10:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild,v 1.1 2007/01/21 11:34:53 phreak Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="latest"