Clean up patches (including their names). Respect LDFLAGS (bug #335679).

(Portage version: 2.2_rc82/cvs/Linux i686)

8 files changed, 120 insertions, 27 deletions

diff --git a/app-misc/jail/ChangeLog b/app-misc/jail/ChangeLog
index 536fc131c3c3..16ba8cdc7443 100644
--- a/app-misc/jail/ChangeLog
+++ b/app-misc/jail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/jail
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/ChangeLog,v 1.25 2009/09/23 16:03:58 patrick Exp $
+# 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 $
+
+*jail-1.9-r3 (17 Sep 2010)
+
+  17 Sep 2010; Jeroen Roovers <jer@gentoo.org> jail-1.9-r2.ebuild,
+  +jail-1.9-r3.ebuild, +files/jail-1.9-gentoo.patch,
+  +files/jail-1.9-ldflags.patch, +files/jail-1.9-multiuser-rsa.patch,
+  +files/jail-1.9-wrongshell.patch, -files/jail-gentoo.diff,
+  -files/multiuser-rsa.patch, -files/wrongshell.patch:
+  Clean up patches (including their names). Respect LDFLAGS (bug #335679).
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> jail-1.9-r2.ebuild:
   Remove virtual/libc
diff --git a/app-misc/jail/files/jail-gentoo.diff b/app-misc/jail/files/jail-1.9-gentoo.patch
index 0c12ce9a12ba..74d48561004c 100644
--- a/app-misc/jail/files/jail-gentoo.diff
+++ b/app-misc/jail/files/jail-1.9-gentoo.patch
@@ -1,6 +1,5 @@
-diff -urN install.sh install.sh
---- install.sh	Fri Oct 26 11:37:07 2001
-+++ install.sh	Sat Jul 20 04:43:09 2002
+--- a/install.sh	Fri Oct 26 11:37:07 2001
++++ b/install.sh	Sat Jul 20 04:43:09 2002
 @@ -23,7 +23,7 @@
  #
  ##############################################################################
@@ -118,9 +117,8 @@ diff -urN install.sh install.sh
  
  }
  
-diff -urN src/preinstall.sh src/preinstall.sh
---- src/preinstall.sh	Fri Oct 26 11:36:09 2001
-+++ src/preinstall.sh	Sat Jul 20 04:44:11 2002
+--- a/src/preinstall.sh	Fri Oct 26 11:36:09 2001
++++ b/src/preinstall.sh	Sat Jul 20 04:44:11 2002
 @@ -23,7 +23,7 @@
  #
  ##############################################################################
diff --git a/app-misc/jail/files/jail-1.9-ldflags.patch b/app-misc/jail/files/jail-1.9-ldflags.patch
new file mode 100644
index 000000000000..6b9e5731bb27
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2001-10-29 18:40:48.000000000 +0100
++++ b/src/Makefile	2010-09-17 07:28:09.000000000 +0200
+@@ -60,7 +60,7 @@
+ all:	jail
+ 
+ jail:	jail.c $(OBJ)
+-	$(CC) $(CFLAGS) $(INCLUDE) jail.c -o jail $(OBJ) $(LIBS) && \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) jail.c -o jail $(OBJ) $(LIBS) && \
+ 	cp jail ../bin
+ 
+ clean:
diff --git a/app-misc/jail/files/multiuser-rsa.patch b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
index e7c94e274ba3..e0aad4f65c72 100644
--- a/app-misc/jail/files/multiuser-rsa.patch
+++ b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
@@ -1,5 +1,5 @@
---- jail.c	2004-09-19 23:48:14.000000000 -0500
-+++ jail.c	2004-09-20 00:07:48.000000000 -0500
+--- a/src/jail.c	2004-09-19 23:48:14.000000000 -0500
++++ b/src/jail.c	2004-09-20 00:07:48.000000000 -0500
 @@ -115,6 +115,20 @@
  #include "helpers.h"
  #include "types.h"
diff --git a/app-misc/jail/files/jail-1.9-wrongshell.patch b/app-misc/jail/files/jail-1.9-wrongshell.patch
new file mode 100644
index 000000000000..1924337d06e4
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-wrongshell.patch
@@ -0,0 +1,11 @@
+--- a/lib/arch/generic/functions	2001-10-26 04:36:09.000000000 -0500
++++ b/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/files/wrongshell.patch b/app-misc/jail/files/wrongshell.patch
deleted file mode 100644
index a08a4241ce4d..000000000000
--- a/app-misc/jail/files/wrongshell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-r2.ebuild b/app-misc/jail/jail-1.9-r2.ebuild
index 794628609a80..01d13d8c9ebb 100644
--- a/app-misc/jail/jail-1.9-r2.ebuild
+++ b/app-misc/jail/jail-1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r2.ebuild,v 1.13 2010/01/01 19:05:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r2.ebuild,v 1.14 2010/09/17 05:36:42 jer Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,10 +21,9 @@ RDEPEND="dev-lang/perl
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-gentoo.diff || die "failed to apply patch"
-	epatch "${FILESDIR}"/wrongshell.patch || die "failed to apply patch"
-	cd src
-	epatch "${FILESDIR}"/multiuser-rsa.patch || die "failed to apply patch"
+	epatch "${FILESDIR}"/${P}-gentoo.patch || die "failed to apply patch"
+	epatch "${FILESDIR}"/${P}-wrongshell.patch || die "failed to apply patch"
+	epatch "${FILESDIR}"/${P}-multiuser-rsa.patch || die "failed to apply patch"
 }
 
 src_compile() {
diff --git a/app-misc/jail/jail-1.9-r3.ebuild b/app-misc/jail/jail-1.9-r3.ebuild
new file mode 100644
index 000000000000..82ca77dc9ab6
--- /dev/null
+++ b/app-misc/jail/jail-1.9-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 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 $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/${PN}_1-9_stable"
+DESCRIPTION="a tool that builds a chroot and configures all the required files, directories and libraries"
+HOMEPAGE="http://www.jmcresearch.com/projects/jail/"
+SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="dev-lang/perl
+	dev-util/strace"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-wrongshell.patch \
+		"${FILESDIR}"/${P}-multiuser-rsa.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	# configuration files should be installed in /etc not /usr/etc
+	sed -i "s:\$4/etc:\${D}/etc:g" install.sh
+
+	# 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
+
+	# Below didn't work. Don't know why
+	#append-ldflags -Wl,-z,now
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	cd "${S}"/src
+	einstall
+
+	# remove //var/tmp/portage/jail-1.9/image//usr from files
+	FILES=( "${D}/usr/bin/mkjailenv"
+		"${D}/usr/bin/addjailsw"
+		"${D}/usr/bin/addjailuser"
+		"${D}/etc/jail.conf"
+		"${D}/usr/lib/libjail.pm"
+		"${D}/usr/lib/arch/generic/definitions"
+		"${D}/usr/lib/arch/generic/functions"
+		"${D}/usr/lib/arch/linux/definitions"
+		"${D}/usr/lib/arch/linux/functions"
+		"${D}/usr/lib/arch/freebsd/definitions"
+		"${D}/usr/lib/arch/freebsd/functions"
+		"${D}/usr/lib/arch/irix/definitions"
+		"${D}/usr/lib/arch/irix/functions"
+		"${D}/usr/lib/arch/solaris/definitions"
+		"${D}/usr/lib/arch/solaris/functions" )
+
+	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}
+	done
+
+	cd "${D}"/usr/lib
+	sed -i "s:/usr/etc:/etc:" libjail.pm
+
+	cd "${S}"/doc
+	dodoc CHANGELOG INSTALL README SECURITY VERSION
+}