4 files changed, 196 insertions, 0 deletions
diff --git a/app-misc/jail/files/jail-1.9-gentoo.patch b/app-misc/jail/files/jail-1.9-gentoo.patch
new file mode 100644
index 000000000000..74d48561004c
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-gentoo.patch
@@ -0,0 +1,130 @@
+--- a/install.sh	Fri Oct 26 11:37:07 2001
++++ b/install.sh	Sat Jul 20 04:43:09 2002
+@@ -23,7 +23,7 @@
+ #
+ ##############################################################################
+ 
+-TMPFILE=/tmp/jail.tmp
++TMPFILE=jail.tmp
+ 
+ # ----------------------------------------------------------------------------
+ 
+@@ -63,16 +63,16 @@
+ 
+ gen_jail_conf() {
+ 
+-cp etc/jail.conf /tmp/jail.conf.tmp
++cp etc/jail.conf jail.conf.tmp
+ 
+-parse_tag /tmp/jail.conf.tmp __VERSION__    $1
+-parse_tag /tmp/jail.conf.tmp __ARCH__       $2
+-parse_tag /tmp/jail.conf.tmp __DEBUG__      $3
+-parse_tag /tmp/jail.conf.tmp __INSTALLDIR__ $4
+-
+-mv /tmp/jail.conf.tmp /tmp/jail.conf
+-install_file /tmp/jail.conf $4/etc $5 $6 $7
+-rm /tmp/jail.conf
++parse_tag jail.conf.tmp __VERSION__    $1
++parse_tag jail.conf.tmp __ARCH__       $2
++parse_tag jail.conf.tmp __DEBUG__      $3
++parse_tag jail.conf.tmp __INSTALLDIR__ $4
++
++mv jail.conf.tmp jail.conf
++install_file jail.conf $4/etc $5 $6 $7
++rm jail.conf
+ 
+ }
+ 
+@@ -80,13 +80,13 @@
+ 
+ gen_libjail() {
+ 
+-cp lib/libjail.pm /tmp/libjail.pm.tmp
++cp lib/libjail.pm libjail.pm.tmp
+ 
+-parse_tag /tmp/libjail.pm.tmp __INSTALLDIR__ $1
++parse_tag libjail.pm.tmp __INSTALLDIR__ $1
+ 
+-mv /tmp/libjail.pm.tmp /tmp/libjail.pm
+-install_file /tmp/libjail.pm $1/lib $2 $3 $4
+-rm /tmp/libjail.pm
++mv libjail.pm.tmp libjail.pm
++install_file libjail.pm $1/lib $2 $3 $4
++rm libjail.pm
+ 
+ }
+ 
+@@ -94,14 +94,14 @@
+ 
+ gen_mkenv() {
+ 
+-cp bin/mkjailenv /tmp/mkjailenv.tmp
++cp bin/mkjailenv mkjailenv.tmp
+ 
+-parse_tag /tmp/mkjailenv.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/mkjailenv.tmp __PERL__ $2
++parse_tag mkjailenv.tmp __INSTALLDIR__ $1
++parse_tag mkjailenv.tmp __PERL__ $2
+ 
+-mv /tmp/mkjailenv.tmp /tmp/mkjailenv
+-install_file /tmp/mkjailenv $1/bin $3 $4 $5
+-rm /tmp/mkjailenv
++mv mkjailenv.tmp mkjailenv
++install_file mkjailenv $1/bin $3 $4 $5
++rm mkjailenv
+ 
+ }
+ 
+@@ -109,14 +109,14 @@
+ 
+ gen_addjailsw() {
+ 
+-cp bin/addjailsw /tmp/addjailsw.tmp
++cp bin/addjailsw addjailsw.tmp
+ 
+-parse_tag /tmp/addjailsw.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/addjailsw.tmp __PERL__ $2
++parse_tag addjailsw.tmp __INSTALLDIR__ $1
++parse_tag addjailsw.tmp __PERL__ $2
+ 
+-mv /tmp/addjailsw.tmp /tmp/addjailsw
+-install_file /tmp/addjailsw $1/bin $3 $4 $5
+-rm /tmp/addjailsw
++mv addjailsw.tmp addjailsw
++install_file addjailsw $1/bin $3 $4 $5
++rm addjailsw
+ 
+ }
+ 
+@@ -125,14 +125,14 @@
+ 
+ gen_addjailuser() {
+ 
+-cp bin/addjailuser /tmp/addjailuser.tmp
++cp bin/addjailuser addjailuser.tmp
+ 
+-parse_tag /tmp/addjailuser.tmp __INSTALLDIR__ $1
+-parse_tag /tmp/addjailuser.tmp __PERL__ $2
++parse_tag addjailuser.tmp __INSTALLDIR__ $1
++parse_tag addjailuser.tmp __PERL__ $2
+ 
+-mv /tmp/addjailuser.tmp /tmp/addjailuser
+-install_file /tmp/addjailuser $1/bin $3 $4 $5
+-rm /tmp/addjailuser
++mv addjailuser.tmp addjailuser
++install_file addjailuser $1/bin $3 $4 $5
++rm addjailuser
+ 
+ }
+ 
+--- 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 @@
+ #
+ ##############################################################################
+ 
+-TMPFILE=/tmp/jail.tmp
++TMPFILE=jail.tmp
+ 
+ 
+ # ----------------------------------------------------------------------------
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/jail-1.9-multiuser-rsa.patch b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
new file mode 100644
index 000000000000..e0aad4f65c72
--- /dev/null
+++ b/app-misc/jail/files/jail-1.9-multiuser-rsa.patch
@@ -0,0 +1,44 @@
+--- 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"
+ 
++
++
++void make_jail_dir( char*  dir )
++{
++    for( ; *dir != '\0'; ++dir )
++    {
++        if( *dir == '.' )
++        {
++            *dir = '\0';
++            break;
++	}
++    }
++}
++
+ //////////////////////////////////////////////////////////////////////////////
+ //
+ // main()
+@@ -211,6 +225,7 @@
+ 	fprintf(stderr,"jail: can't get passwd info for uid %d\n",uid);
+ 	exit(-1);
+     }
++    make_jail_dir(pwdent->dir);
+ 
+     //
+     // create the terminal devices here
+@@ -289,7 +304,6 @@
+     free(pwdent->dir);
+     pwdent->dir = tmp_str;
+ 
+-
+     #if DEBUG != 0
+      fprintf(stderr,"jail: doing chdir(%s)\n",pwdent->dir);
+     #endif 
+@@ -494,4 +508,3 @@
+     return(-4); 
+ }
+ 
+-    
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);
+   } 
+ }