summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hadaway <raker@gentoo.org>2003-07-30 23:46:52 +0000
committerNick Hadaway <raker@gentoo.org>2003-07-30 23:46:52 +0000
commit73b04144a052759a4bda72ee16595e24798a9968 (patch)
treece7e9d7671e3e916bbadba7848e9bb8fe79b4c7f /app-misc/jail
parentadded a patch so /etc/shells is updated correctly (diff)
downloadgentoo-2-73b04144a052759a4bda72ee16595e24798a9968.tar.gz
gentoo-2-73b04144a052759a4bda72ee16595e24798a9968.tar.bz2
gentoo-2-73b04144a052759a4bda72ee16595e24798a9968.zip
added a patch so /etc/shells is updated correctly
Diffstat (limited to 'app-misc/jail')
-rw-r--r--app-misc/jail/ChangeLog7
-rw-r--r--app-misc/jail/Manifest4
-rw-r--r--app-misc/jail/files/wrongshell.patch12
-rw-r--r--app-misc/jail/jail-1.9-r1.ebuild3
4 files changed, 21 insertions, 5 deletions
diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog
index f31e3e59e9d4..de258853cf83 100644
--- a/app-misc/jail/ChangeLog
+++ b/app-misc/jail/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/jail
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.8 2003/02/12 05:01:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.9 2003/07/30 23:46:46 raker Exp $
+
+ 30 Jul 2003; Nick Hadaway <raker@gentoo.org> jail-1.9-r1.ebuild:
+ Added a patch so /etc/shells gets the correct entry. Thanks to
+ Florian Blumel on bug #25390 for noticing this.
*jail-1.9-r1 (28 Jan 2003)
@@ -18,7 +22,6 @@
26 Jul 2002; Nick Hadaway <raker@gentoo.org>
jail-1.9.ebuild, files/digest-jail-1.9, files/jail-gentoo.diff :
-
Initial ebuild in portage. Thanks to Pau Oliva for doing the initial ebuild
legwork. Made some very minor adjustments in ebuild for FHS compliance.
Pau Oliva <pau@eSlack.org
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index e4b34c759c69..f3e8d41fe1d1 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -1,6 +1,6 @@
-MD5 551c22c0defcb811e42b7e41dc3bbf67 jail-1.9-r1.ebuild 2228
+MD5 c30296a5644ebef2e3e4cc666ebacf09 jail-1.9-r1.ebuild 2226
MD5 76adc9c2ac972f43a031bf45a25dc9a3 jail-1.9.ebuild 2053
-MD5 3e1e5fa28b471ae4e4f04310327d98c5 ChangeLog 924
+MD5 d74747fadefd76a51ab0d5b2fcd0e93e ChangeLog 1107
MD5 e06c54745344bca0608e4ec56dfd0ed0 files/digest-jail-1.9-r1 59
MD5 0f9cdbda612ae4e1df19de25b045bf2d files/jail-gentoo.diff 3256
MD5 c3db70e66c86804965b502d3eb50dd2c files/wrongshell.patch 472
diff --git a/app-misc/jail/files/wrongshell.patch b/app-misc/jail/files/wrongshell.patch
new file mode 100644
index 000000000000..a08a4241ce4d
--- /dev/null
+++ b/app-misc/jail/files/wrongshell.patch
@@ -0,0 +1,12 @@
+diff -urN jail_1-9_stable/lib/arch/generic/functions jail_1-9_stable-modified/lib/arch/generic/functions
+--- jail_1-9_stable/lib/arch/generic/functions 2001-10-26 04:36:09.000000000 -0500
++++ jail_1-9_stable-modified/lib/arch/generic/functions 2003-07-30 18:23:57.000000000 -0500
+@@ -831,7 +831,7 @@
+
+ if (!$found || !-e $SHELLS_FILE) {
+ open(F,">>".$SHELLS_FILE);
+- print F "$INSTALL_DIR/jail\n";
++ print F "$INSTALL_DIR/bin/jail\n";
+ close(F);
+ }
+ }
diff --git a/app-misc/jail/jail-1.9-r1.ebuild b/app-misc/jail/jail-1.9-r1.ebuild
index fda7128334a5..3a4e7b1d3eae 100644
--- a/app-misc/jail/jail-1.9-r1.ebuild
+++ b/app-misc/jail/jail-1.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r1.ebuild,v 1.4 2003/03/11 21:11:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r1.ebuild,v 1.5 2003/07/30 23:46:46 raker Exp $
inherit eutils
@@ -21,6 +21,7 @@ src_unpack() {
unpack ${PN}_${PV}.tar.gz
cd ${S}
epatch ${FILESDIR}/${PN}-gentoo.diff
+ epatch ${FILESDIR}/wrongshell.patch
}
src_compile() {