From cb54678669c5863c3a0d57b598105d53e3c4a061 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 25 Nov 2011 23:33:09 +0000 Subject: [PATCH] Add missing die statements. Stable on amd64 wrt bug #391579 Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- app-misc/bottlerocket/Manifest | 24 ++++++++++++++++-------- app-misc/jail/ChangeLog | 7 +++++-- app-misc/jail/Manifest | 24 ++++++++++++++++-------- app-misc/jail/jail-1.9-r3.ebuild | 18 +++++++++--------- 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/app-misc/bottlerocket/Manifest b/app-misc/bottlerocket/Manifest index 1a0ee9394b35..d15470f8ac39 100644 --- a/app-misc/bottlerocket/Manifest +++ b/app-misc/bottlerocket/Manifest @@ -1,17 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 DIST bottlerocket-0.04c.tar.gz 40533 RMD160 d1db2caa29faf599132e7c7f6036a7d170778718 SHA1 70f4877cea17653ae8e21d93c1a620c7ddeeeb69 SHA256 deb8fbf8856f87af15fa9883e07b1fddb2aa78f6b4c7d119ae4bd664dc1d19ae -EBUILD bottlerocket-0.04c-r1.ebuild 1005 RMD160 b380c2a9eaf88cc4499ae997d3d29182761fca1c SHA1 fe567a4c79c5e56e84e3ffd9641f1b829cde3ee0 SHA256 614d23e6589cbd56ee40d1482544dd42ef1ac42dc0ce3a98cee98464666a0b81 +EBUILD bottlerocket-0.04c-r1.ebuild 1009 RMD160 f242f0b64fcb5bcf2f5da185a5815d868b447783 SHA1 ab68875ba4842b983ddfb32ff077ff8ab1e40e68 SHA256 9c4fd34a8c5e001c19ac1f7ceef7c8583baf00c137125c610acb6883cce18d02 EBUILD bottlerocket-0.04c.ebuild 832 RMD160 827a0dc6c7b0b503fd6be43fa88fd87f2a17467b SHA1 009717836c1b880af1bf730bc4672568b2823aa6 SHA256 1714eb521baddffcf0a96f8e92e1381a6ecba0d3073057b80fd57183ab55f129 -MISC ChangeLog 1310 RMD160 9b6951bc747edbbd51dc92912557d8aa1ff25100 SHA1 3d1135fadd5cb0c513449ce603c4dc43c6a6bc34 SHA256 a4c4c82859cb01aafdea83ceff1dade2f6e2b961b7c6349df91c04d15e839171 +MISC ChangeLog 1435 RMD160 8e1f14b298facd3ef4afdf9ff840d53d595f26f6 SHA1 79cbbbbc7d16ec0062d25c3ef6c287b23d1c5cf6 SHA256 c340a6a996a646a9156738916ac2f399d036c7758a7ee264c07d505f9cfc915a MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk58/40ACgkQfXuS5UK5QB245QP/etPIY2ZgMOAG39JzJdlFpFkL -uo7dw13/kyP2mG2MZhbYc6DGurZmwI8sUVyoawV581igGaRWax525uzU6txD3mlv -Wff1cgI/LnBW1SoVoMDM97yO6L+KG4kf7mlgKbWM+NYNobjf0BGWIYjGvnIfWWrN -bddHyoK1MAtfOe2vFSY= -=6ItM +iQIcBAEBCgAGBQJO0CbKAAoJEPqDWhW0r/LCSMoQAIEvl9Rs3dzP313YKz/tM2yM +NrcgYvuBv7OulZuhVMp1SEVtUpJ9aL1URFYgbxb9+ZX9bCxQQ+ukBXESWVzP+7/R +RWeI9nPB6cgBL4uSa25QqB3pSRXvFzMa/dYairwWVlbsKihaeIfSjuRBpuqlHeug +Salfj3Kdh2eqv+RpF4+/p5KsWupSz5tuvrGRRf4GgswlPVDpa/64r+sPEYwuq0cs ++hKxkamma1YlvLeBHX6RYjodTWtpVch1GgOpEoqh4rtA7ziXoQc6eGt86eDynuOB +Tu1CIsuvrAOzWWI0ziuuDHPlbfYv0TgqdkOPnjNcw5JFZh0b1gideyi8k1LdiXV0 +ilVOsewb0V8jQNXtedzFSwhhaNhbWsPgsQO6EgmVEbDwS0h56GDMk8NfFvJCqUp4 +j2+mVsPRS3LUyAOpKsb+tiTkt4kvcZCSw8P7IJ/xnZFlxkK/HyXhS8sj65aIhgeA +xIcxnnIOmIjts6JRbKUsnxCRj7W/Ed4yrqdCDoJp0+Bqz1LVOVa03cVeLknC1hZ9 +AsQrItcW45eft0YTohEyb5qeqBXJFJtcKQjzZprpnwiLrCzvars4dsBbsh8qZ5D/ +QUUD6nYWDMynDIKbRvjTXoOEK3uDeltWUXd1I59jlP7OtzwUuVJ4Hxrobsy+XQJ3 +3BU+tbmLmm7SXPmhwzg0 +=5jOZ -----END PGP SIGNATURE----- diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog index 16ba8cdc7443..63717bad75fe 100644 --- a/app-misc/jail/ChangeLog +++ b/app-misc/jail/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/jail -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.26 2010/09/17 05:36:42 jer Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.27 2011/11/25 23:33:09 hwoarang Exp $ + + 25 Nov 2011; Markos Chandras jail-1.9-r3.ebuild: + Add missing die statements. Stable on amd64 wrt bug #391579 *jail-1.9-r3 (17 Sep 2010) diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest index 1aef4e74d2a8..d2f3619a4cf0 100644 --- a/app-misc/jail/Manifest +++ b/app-misc/jail/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX jail-1.9-gentoo.patch 3186 RMD160 fc1474469012656830905a13c18a507c97179430 SHA1 b70281b33d3a095116cf60874cf96b3024a9fb64 SHA256 bf3c42da26870dca1295f1fc5ca1d49eb1073137d7518f88d54b427fdb30ca61 AUX jail-1.9-ldflags.patch 328 RMD160 61541519c9c6023194ccfa581a59e326624f4164 SHA1 26630da7670267ac7590021d92918cc2ff9509d9 SHA256 26034a6e25281483ac3add1deb42c49bcfcde00693f958aaf0eda542ba98bd37 @@ -7,15 +7,23 @@ AUX jail-1.9-multiuser-rsa.patch 856 RMD160 a1d876261fc2ebbd1d9c666a3f3d97d8ddb1 AUX jail-1.9-wrongshell.patch 330 RMD160 be9d95c6956cb665f94fb4d298f2e7cf14e38262 SHA1 ec0f0c14bfe2c4bb8c7c68a92229e068e45582ff SHA256 d9de983e7c31e09927a87ac56c028ffb4f2f9692825aba765a157a63908eb07f DIST jail_1.9.tar.gz 32994 RMD160 12a43f7c0aa533ff0ffa91a1b97bf7b59c89cb78 SHA1 c233f81281c00b681d79ab7150e099fe358447ea SHA256 1d997739b2dfe84ff975673b1357d3814cd3c2ee0cf3d61031f6f95a3e2080e3 EBUILD jail-1.9-r2.ebuild 2304 RMD160 32e8c90e879b1d4e9bd0542ce9caf64bf6535c7b SHA1 ae9fe5abab47ce8460167d6610eae1ca6f90ea50 SHA256 e395e2cd6300ecaa6d0752bb3e50abde24ea5513952a502ff8d83f3189738786 -EBUILD jail-1.9-r3.ebuild 2220 RMD160 517d7e0328259731617b9888565f460568ef24a4 SHA1 57d73a9dae6956bc4737830c8e6db4a7f1898dd5 SHA256 6bf2a4b7c6d06f237d8015a8d3507ecbd09dd46d66872b4b61735bbcf1ac2e71 -MISC ChangeLog 3102 RMD160 b78a6770681ec41425a56609a2dcf3a67fdc95c9 SHA1 7bb86351d87a1889b69fbd930c29771d65a521f8 SHA256 8073a9a3c79a6c86bfe5d9049af86cc64b17b52ccfb1e1a5a7ea387534d5bce4 +EBUILD jail-1.9-r3.ebuild 2266 RMD160 a81ed28a50d27d82033c793be151ab2c1042a1f1 SHA1 4fce8ed34c077013174f5e504fdd4d538fa67561 SHA256 6f1f58b035c2e7296cc721fc9bcd37c65d7169e6a326142437dacb3c5e39f81b +MISC ChangeLog 3243 RMD160 12e7670c1180d127718912d843a3fd5aefd269da SHA1 db2694524815a45ffd9b05e202b0dc2e4b3f096d SHA256 3494a4773a13f5fb4252501889103557e9bc78b7847be17d357395a3c7751b13 MISC metadata.xml 732 RMD160 cffe3089483abc04882dc2418cb08d9c6874f0be SHA1 5276a0133f7939fd5daa98c0d1cbaae84fc6a3e4 SHA256 3c834970681eb57c098cdc64aea81fd309609090858ee8d123a3937af89112b5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk58/40ACgkQfXuS5UK5QB0JBwQArjpxDpT4973y4WVJYAreR0ge -+i8L83pAyBmOFSR3gqPfPIqBgsWoFC4QhoLHnUtJzuv8Fi9J3T/VXKu9dZvov8is -n5zOtfEI6nDJoL/LdQ7ChAY50ePu6FUSuhc5wqgBr4HTOL4zkLUClGDFQaN5amZV -XFxKWOLUm6I1ajthq0M= -=Zt5n +iQIcBAEBCgAGBQJO0CW1AAoJEPqDWhW0r/LCqX8P/ifuc4iZYZ9aOVVarBdwF64w +dteTBCSFkr7Yza06K0a7I3QTQHI+Ysps06vJ/jvIrnMQYR3DTHKn/AK4o8rrUxXd +rL3tk3Nb/Qjp/1gY1rs/Hd2Nw+jOi7sVY4vRu55rjr5HR/NLXJXUKRAOwjCD20Pk +mWDMw32+/I2CGKpOEtcA8zlzAaK6qFG02avZ2xvV/DS0tuqKi3BFfJ8kloka1efW +GbzoFDflRIjAs+9ETKFSeEp0P28E6FP4lnCw9bWHY9zAtLS0KjYJrwuLfxez0P5v +oVoaVzR2RCzL3GNl5QPmmXIoOqKrZtMe1XqlYYCg7TYoHApkUxaH8SnVQiu7CS/K +QrxZ51sTuEVqBeM2lxW2vaWwbhVgSwIvBlnIUhhuFOWADb3oJSdhaTm0810vJPUF +oQipmGpoRP8aBOY2OAnPYwhbYQDLU0CNFyrBWlFsHst4rU9TPU7QS4TEd3fyI139 +BJrpexu6XuLK5VPwX8LX8Wq14fEas+E8mrAo+8MTRTW9wBVWjZd+6AWiuPTy/jyq +LibGe9hClHpoY4N/OZLsDfcRBXcAvnWPBtjlfW2TRZxacSGj9ep8zRDrT/jEkD8n +WOkV5N1QjYpfZTdu+vUHXM7yJisL5Dz+yd4wQraxz0iPeARFYZCZbUMdR7QBvhpW +S8X66d8A7ZXKyg6YZApi +=VSNV -----END PGP SIGNATURE----- diff --git a/app-misc/jail/jail-1.9-r3.ebuild b/app-misc/jail/jail-1.9-r3.ebuild index 82ca77dc9ab6..86a59e2cad5e 100644 --- a/app-misc/jail/jail-1.9-r3.ebuild +++ b/app-misc/jail/jail-1.9-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v 1.1 2010/09/17 05:36:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v 1.2 2011/11/25 23:33:09 hwoarang Exp $ EAPI="2" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" IUSE="" DEPEND=">=sys-apps/sed-4" @@ -30,12 +30,12 @@ src_prepare() { src_compile() { # configuration files should be installed in /etc not /usr/etc - sed -i "s:\$4/etc:\${D}/etc:g" install.sh + sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die # the destination directory should be /usr not /usr/local cd "${S}"/src sed -i -e "s:usr/local:${D}/usr:g" \ - -e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile + -e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile || die # Below didn't work. Don't know why #append-ldflags -Wl,-z,now @@ -44,7 +44,7 @@ src_compile() { src_install() { cd "${S}"/src - einstall + einstall || die # remove //var/tmp/portage/jail-1.9/image//usr from files FILES=( "${D}/usr/bin/mkjailenv" @@ -66,12 +66,12 @@ src_install() { for f in "${FILES[@]}"; do # documentation says funtion 'dosed' is supposed to do this, but didn't know how to make it work :'( # dosed ${file} || die "error in dosed" - sed -i "s:/${D}/usr:/usr:g" ${f} + sed -i "s:/${D}/usr:/usr:g" ${f} || die done cd "${D}"/usr/lib - sed -i "s:/usr/etc:/etc:" libjail.pm + sed -i "s:/usr/etc:/etc:" libjail.pm || die cd "${S}"/doc - dodoc CHANGELOG INSTALL README SECURITY VERSION + dodoc CHANGELOG INSTALL README SECURITY VERSION || die } -- 2.26.2