| 1 |
hwoarang 11/11/25 23:33:09 |
| 2 |
|
| 3 |
Modified: jail-1.9-r3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add missing die statements. Stable on amd64 wrt bug #391579 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-misc/jail/jail-1.9-r3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: jail-1.9-r3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- jail-1.9-r3.ebuild 17 Sep 2010 05:36:42 -0000 1.1 |
| 23 |
+++ jail-1.9-r3.ebuild 25 Nov 2011 23:33:09 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v 1.1 2010/09/17 05:36:42 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r3.ebuild,v 1.2 2011/11/25 23:33:09 hwoarang Exp $ |
| 30 |
|
| 31 |
EAPI="2" |
| 32 |
|
| 33 |
@@ -13,7 +13,7 @@ |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
-KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 38 |
+KEYWORDS="amd64 ~ppc ~sparc ~x86" |
| 39 |
IUSE="" |
| 40 |
|
| 41 |
DEPEND=">=sys-apps/sed-4" |
| 42 |
@@ -30,12 +30,12 @@ |
| 43 |
|
| 44 |
src_compile() { |
| 45 |
# configuration files should be installed in /etc not /usr/etc |
| 46 |
- sed -i "s:\$4/etc:\${D}/etc:g" install.sh |
| 47 |
+ sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die |
| 48 |
|
| 49 |
# the destination directory should be /usr not /usr/local |
| 50 |
cd "${S}"/src |
| 51 |
sed -i -e "s:usr/local:${D}/usr:g" \ |
| 52 |
- -e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile |
| 53 |
+ -e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile || die |
| 54 |
|
| 55 |
# Below didn't work. Don't know why |
| 56 |
#append-ldflags -Wl,-z,now |
| 57 |
@@ -44,7 +44,7 @@ |
| 58 |
|
| 59 |
src_install() { |
| 60 |
cd "${S}"/src |
| 61 |
- einstall |
| 62 |
+ einstall || die |
| 63 |
|
| 64 |
# remove //var/tmp/portage/jail-1.9/image//usr from files |
| 65 |
FILES=( "${D}/usr/bin/mkjailenv" |
| 66 |
@@ -66,12 +66,12 @@ |
| 67 |
for f in "${FILES[@]}"; do |
| 68 |
# documentation says funtion 'dosed' is supposed to do this, but didn't know how to make it work :'( |
| 69 |
# dosed ${file} || die "error in dosed" |
| 70 |
- sed -i "s:/${D}/usr:/usr:g" ${f} |
| 71 |
+ sed -i "s:/${D}/usr:/usr:g" ${f} || die |
| 72 |
done |
| 73 |
|
| 74 |
cd "${D}"/usr/lib |
| 75 |
- sed -i "s:/usr/etc:/etc:" libjail.pm |
| 76 |
+ sed -i "s:/usr/etc:/etc:" libjail.pm || die |
| 77 |
|
| 78 |
cd "${S}"/doc |
| 79 |
- dodoc CHANGELOG INSTALL README SECURITY VERSION |
| 80 |
+ dodoc CHANGELOG INSTALL README SECURITY VERSION || die |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.27 app-misc/jail/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?rev=1.27&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?rev=1.27&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/jail/ChangeLog?r1=1.26&r2=1.27 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v |
| 94 |
retrieving revision 1.26 |
| 95 |
retrieving revision 1.27 |
| 96 |
diff -u -r1.26 -r1.27 |
| 97 |
--- ChangeLog 17 Sep 2010 05:36:42 -0000 1.26 |
| 98 |
+++ ChangeLog 25 Nov 2011 23:33:09 -0000 1.27 |
| 99 |
@@ -1,6 +1,9 @@ |
| 100 |
# ChangeLog for app-misc/jail |
| 101 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.26 2010/09/17 05:36:42 jer Exp $ |
| 103 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.27 2011/11/25 23:33:09 hwoarang Exp $ |
| 105 |
+ |
| 106 |
+ 25 Nov 2011; Markos Chandras <hwoarang@g.o> jail-1.9-r3.ebuild: |
| 107 |
+ Add missing die statements. Stable on amd64 wrt bug #391579 |
| 108 |
|
| 109 |
*jail-1.9-r3 (17 Sep 2010) |
Archives