app-admin/jailkit: version bump

svn path=/sunrise/; revision=3504

7 files changed, 111 insertions, 131 deletions

diff --git a/app-admin/jailkit/ChangeLog b/app-admin/jailkit/ChangeLog
index 02b8df010..305730b34 100644
--- a/app-admin/jailkit/ChangeLog
+++ b/app-admin/jailkit/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Apr 2007; Ali Polatel (hawking) <polatel@gmail.com>
+  -files/jailkit-2.0-destdir.patch, -jailkit-2.1.ebuild,
+  -files/jailkit-2.1-gentoo-sandbox.patch, +jailkit-2.3.ebuild,
+  +files/jailkit-2.3-destdir.patch, +files/jailkit-2.3-nostrip.patch:
+  Version bump
+
   28 Nov 2006; Stefan Schweizer <genstef@gentoo.org> -jailkit-2.0.ebuild,
   -files/jailkit-2.0-gentoo-sandbox.patch:
   remove obsolete old ebuilds, thanks pcheck
diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest
index a832241cf..6a76e0488 100644
--- a/app-admin/jailkit/Manifest
+++ b/app-admin/jailkit/Manifest
@@ -1,7 +1,7 @@
 AUX jailkit 277 RMD160 3008e6f78a67af2eb318988c034f58197c54abc1 SHA1 a365679a5c9f80db63c3737f979c5b1c99d8f5d4 SHA256 58a7fcdaae6b1706d0183c826b4ff5856c99f24ba41eaf7956b42ff8e35388a7
-AUX jailkit-2.0-destdir.patch 2492 RMD160 075a9f76161051b634b2e8d8c116e15aebc80fdb SHA1 c2569eda7df4c01e605a94823496234035db2518 SHA256 7da9cafbc87abda669571ccb8858d72d84636f45c0839ea6dfef060e8b1063bf
-AUX jailkit-2.1-gentoo-sandbox.patch 2184 RMD160 a5a5994b1a1d30d970fab5c8db5adef2cc1ddad3 SHA1 a4cfe8f2526ae6b703fad5b474380d5485c54cf7 SHA256 83037a22d9126684ec5eb262c527062b919a7deb205a41b74e90e3385d32990b
-DIST jailkit-2.1.tar.bz2 93332 RMD160 b4d7dfe44f04d060152dd97d1a5df326f5159a1a SHA1 d4e730a8cc04397b4111fbeb08f37fb9d1994582 SHA256 c6431e0dda749372d41bc3fa2813bd681650ace98cf08d84a00b33348b48d612
-EBUILD jailkit-2.1.ebuild 980 RMD160 a319365aa0f8823860002eca9d18c9f2bea6b67f SHA1 5dae7ea3592aadfc087d163f604283f4fd439b22 SHA256 212f7d4ec0a4ace026d0250f30ba35336db4c89e7f4973b684f0609d1f2be7f3
+AUX jailkit-2.3-destdir.patch 2529 RMD160 c028cf1cc9f936c92ff32df79b32b86f26cc0948 SHA1 75dea81bc9ccab15860c2d79dd8e8c085c6ca4a0 SHA256 8be61e804cd48b3fdc9d3dec55681c94c7d3b5fd78a3ddc95f177a7968cb1a69
+AUX jailkit-2.3-nostrip.patch 926 RMD160 3b7681d21f0b8e179823738bb730223326665b86 SHA1 a8aa6317b6b4867a3dd6fefa70d73ad421dd89ef SHA256 97c229f93df4c1a279545cfa7fe4177095cf28aa766d91cc136dfe1dd24f4e0e
+DIST jailkit-2.3.tar.bz2 96241 RMD160 d36cf509e7b1c91f5261ce3246ba903388ccb039 SHA1 a2326881ed5497441a73737696d945043968fcb9 SHA256 4f1a1a38568fedb7790e77de5e2fdfce0c8a31c3c41646d8c6456dacc93814f4
+EBUILD jailkit-2.3.ebuild 870 RMD160 08d9ecd009efc38ac02b8f28ff1516e1f6e066d1 SHA1 f87d7314c882f9d23f0ad89309c5245c9a2d305d SHA256 327a05f46330d94518197437e6d0c3d4929566e0f4ecce35f5d317765ffa0630
 MISC ChangeLog 777 RMD160 7cbedc033f0d885ee38d295b2fbebb808a8bfc06 SHA1 31fdb4c14dba6727bee3a6ea6c74ac81c0132a5f SHA256 6f4d68811cc4c15c383adc9af3ea9181d764ec9f56ef3c3c2c9e3cdf6e2d8beb
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-admin/jailkit/files/jailkit-2.0-destdir.patch b/app-admin/jailkit/files/jailkit-2.0-destdir.patch
deleted file mode 100644
index c87efe9fb..000000000
--- a/app-admin/jailkit/files/jailkit-2.0-destdir.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ur jailkit-2.0.orig/Makefile.in jailkit-2.0/Makefile.in
---- jailkit-2.0.orig/Makefile.in	2005-07-30 23:52:54.000000000 +0200
-+++ jailkit-2.0/Makefile.in	2006-09-03 17:34:56.000000000 +0200
-@@ -28,8 +28,8 @@
- #POSSIBILITY OF SUCH DAMAGE.
- #
- INSTALL = @INSTALL@
--prefix = @prefix@
--iniprefix =/etc/jailkit/
-+prefix = $(DESTDIR)@prefix@
-+iniprefix = $(DESTDIR)/etc/jailkit/
- PACKAGE = @PACKAGE@
- 
- INIFILES = jk_check.ini jk_init.ini jk_lsh.ini jk_socketd.ini jk_chrootsh.ini
-@@ -70,14 +70,14 @@
- 	@cd man/ && $(MAKE) install
- 	# test if the jk_chrootsh is already in /etc/shells
- 	# this previously had @echo but that fails on FreeBSD
--	if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \
--		echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\
--		echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\
-+	if ! grep @prefix@/sbin/jk_chrootsh $(DESTDIR)/etc/shells ; then \
-+		echo "appending @prefix@/sbin/jk_chrootsh to $(DESTDIR)/etc/shells";\
-+		echo @prefix@/sbin/jk_chrootsh >> $(DESTDIR)/etc/shells ;\
- 	fi
- 
- 
- uninstall:
--	rm -f /etc/jailkit/*.ini
-+	rm -f $(DESTDIR)/etc/jailkit/*.ini
- 	@cd py/ && $(MAKE) uninstall
- 	@cd man/ && $(MAKE) uninstall
- 	@cd src/ && $(MAKE) uninstall
-Only in jailkit-2.0: jailkit-2.0-destdir.patch
-diff -ur jailkit-2.0.orig/man/Makefile.in jailkit-2.0/man/Makefile.in
---- jailkit-2.0.orig/man/Makefile.in	2005-07-30 15:08:30.000000000 +0200
-+++ jailkit-2.0/man/Makefile.in	2006-09-03 17:12:40.000000000 +0200
-@@ -1,5 +1,5 @@
- INSTALL = @INSTALL@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- 
- SRCS = jailkit.8 jk_chrootsh.8 jk_lsh.8 jk_socketd.8 jk_init.8 jk_check.8 jk_cp.8 jk_chrootlaunch.8 jk_procmailwrapper.8 jk_addjailuser.8 jk_jailuser.8
- OBJS = $(SRCS:.8=.8.gz)
-diff -ur jailkit-2.0.orig/py/Makefile.in jailkit-2.0/py/Makefile.in
---- jailkit-2.0.orig/py/Makefile.in	2005-07-30 23:52:54.000000000 +0200
-+++ jailkit-2.0/py/Makefile.in	2006-09-03 17:12:40.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- INSTALL = @INSTALL@
- PACKAGE = @PACKAGE@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- PYTHONPATH = @PYTHONPATH@
- 
- PYLIBDIR=${prefix}/share/${PACKAGE}
-diff -ur jailkit-2.0.orig/src/Makefile.in jailkit-2.0/src/Makefile.in
---- jailkit-2.0.orig/src/Makefile.in	2005-07-10 15:23:08.000000000 +0200
-+++ jailkit-2.0/src/Makefile.in	2006-09-03 17:12:40.000000000 +0200
-@@ -4,7 +4,7 @@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- PTHREAD_LIBS = @PTHREAD_LIBS@
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- 
- #CFLAGS = ${CFLAGS} -g -O2 -Wall -pipe
- 
diff --git a/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch b/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch
deleted file mode 100644
index a54e3e4bd..000000000
--- a/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur jailkit.orig/Makefile.in jailkit/Makefile.in
---- jailkit.orig/Makefile.in	2006-11-12 16:41:47.000000000 +0100
-+++ jailkit/Makefile.in	2006-11-12 16:42:32.000000000 +0100
-@@ -70,10 +70,10 @@
- 	@cd man/ && $(MAKE) install
- 	# test if the jk_chrootsh is already in /etc/shells
- 	# this previously had @echo but that fails on FreeBSD
--	if ! grep @prefix@/sbin/jk_chrootsh $(DESTDIR)/etc/shells ; then \
--		echo "appending @prefix@/sbin/jk_chrootsh to $(DESTDIR)/etc/shells";\
--		echo @prefix@/sbin/jk_chrootsh >> $(DESTDIR)/etc/shells ;\
--	fi
-+	# if ! grep @prefix@/sbin/jk_chrootsh $(DESTDIR)/etc/shells ; then \
-+	# 	echo "appending @prefix@/sbin/jk_chrootsh to $(DESTDIR)/etc/shells";\
-+	# 	echo @prefix@/sbin/jk_chrootsh >> $(DESTDIR)/etc/shells ;\
-+	# fi
- 
- 
- uninstall:
-diff -ur jailkit.orig/py/Makefile.in jailkit/py/Makefile.in
---- jailkit.orig/py/Makefile.in	2006-11-12 16:41:47.000000000 +0100
-+++ jailkit/py/Makefile.in	2006-11-12 16:42:06.000000000 +0100
-@@ -39,22 +39,22 @@
- 	python -c "import py_compile;py_compile.compile('jk_lib.py')"
- 
- jk_init: jk_init.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_init.in > jk_init
-+	cp jk_init.in jk_init
- 
- jk_check: jk_check.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_check.in > jk_check
-+	cp jk_check.in jk_check
- 
- jk_cp: jk_cp.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_cp.in > jk_cp
-+	cp jk_cp.in jk_cp
- 
- jk_list: jk_list.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_list.in > jk_list
-+	cp jk_list.in jk_list
- 
- jk_addjailuser: jk_addjailuser.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_addjailuser.in > jk_addjailuser
-+	cp jk_addjailuser.in jk_addjailuser
- 
- jk_jailuser: jk_jailuser.in
--	sed -e "s!LIBDIR='[a-z/]*'!LIBDIR='${PYLIBDIR}'!" -e "s:#!/usr/bin/python:#!$(PYTHONPATH):" < jk_jailuser.in > jk_jailuser
-+	cp jk_jailuser.in jk_jailuser
- 
- jailkit: jk_lib.pyc jk_cp jk_init jk_check jk_addjailuser jk_jailuser jk_list 
- 
diff --git a/app-admin/jailkit/files/jailkit-2.3-destdir.patch b/app-admin/jailkit/files/jailkit-2.3-destdir.patch
new file mode 100644
index 000000000..95419eaf0
--- /dev/null
+++ b/app-admin/jailkit/files/jailkit-2.3-destdir.patch
@@ -0,0 +1,70 @@
+diff -ur jailkit-2.3/Makefile.in jailkit-2.3-destdir/Makefile.in
+--- jailkit-2.3/Makefile.in	2006-12-24 16:26:10.000000000 +0200
++++ jailkit-2.3-gentoo/Makefile.in	2007-04-21 21:01:19.000000000 +0300
+@@ -28,8 +28,8 @@
+ #POSSIBILITY OF SUCH DAMAGE.
+ #
+ INSTALL = @INSTALL@
+-prefix = @prefix@
+-sysconfdir = @sysconfdir@
++prefix = $(DESTDIR)@prefix@
++sysconfdir = $(DESTDIR)@sysconfdir@
+ iniprefix = ${sysconfdir}/jailkit
+ PACKAGE = @PACKAGE@
+ 
+@@ -72,8 +72,8 @@
+ 	# test if the jk_chrootsh is already in /etc/shells
+ 	# this previously had @echo but that fails on FreeBSD
+ 	if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \
+-		echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\
+-		echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\
++		echo "appending ${prefix}/sbin/jk_chrootsh to $(DESTDIR)/etc/shells";\
++		echo ${prefix}/sbin/jk_chrootsh >> $(DESTDIR)/etc/shells ;\
+ 	fi
+ 
+ 
+diff -ur jailkit-2.3/man/Makefile.in jailkit-2.3-destdir/man/Makefile.in
+--- jailkit-2.3/man/Makefile.in	2006-12-20 01:25:18.000000000 +0200
++++ jailkit-2.3-gentoo/man/Makefile.in	2007-04-21 21:01:36.000000000 +0300
+@@ -1,5 +1,5 @@
+ INSTALL = @INSTALL@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ 
+ SRCS = jailkit.8 jk_chrootsh.8 jk_lsh.8 jk_socketd.8 jk_init.8 jk_check.8 jk_cp.8 jk_chrootlaunch.8 jk_procmailwrapper.8 jk_addjailuser.8 jk_jailuser.8 jk_list.8 jk_update.8
+ OBJS = $(SRCS:.8=.8.gz)
+diff -ur jailkit-2.3/py/Makefile.in jailkit-2.3-destdir/py/Makefile.in
+--- jailkit-2.3/py/Makefile.in	2006-12-28 11:48:12.000000000 +0200
++++ jailkit-2.3-gentoo/py/Makefile.in	2007-04-21 21:02:00.000000000 +0300
+@@ -30,8 +30,8 @@
+ 
+ INSTALL = @INSTALL@
+ PACKAGE = @PACKAGE@
+-prefix = @prefix@
+-sysconfdir = @sysconfdir@
++prefix = $(DESTDIR)@prefix@
++sysconfdir = $(DESTDIR)@sysconfdir@
+ INIPREFIX = ${sysconfdir}/jailkit
+ PREFIX = ${prefix}
+ PYTHONINTERPRETER = @PYTHONINTERPRETER@
+diff -ur jailkit-2.3/src/Makefile.in jailkit-2.3-destdir/src/Makefile.in
+--- jailkit-2.3/src/Makefile.in	2006-11-16 22:10:56.000000000 +0200
++++ jailkit-2.3-gentoo/src/Makefile.in	2007-04-21 21:02:27.000000000 +0300
+@@ -28,8 +28,8 @@
+ #POSSIBILITY OF SUCH DAMAGE.
+ #
+ 
+-prefix = @prefix@
+-sysconfdir = @sysconfdir@
++prefix = $(DESTDIR)@prefix@
++sysconfdir = $(DESTDIR)@sysconfdir@
+ iniprefix = ${sysconfdir}/jailkit
+ INSTALL = @INSTALL@
+ CC = @CC@
+@@ -95,4 +95,4 @@
+ iniparsertester: iniparser.o iniparsertester.o jk_lib.o
+ 	$(CC) $(DEFS) -o iniparsertester iniparsertester.o iniparser.o jk_lib.o $(LDFLAGS) $(LIBS)
+ 
+-	
+\ No newline at end of file
++	
diff --git a/app-admin/jailkit/files/jailkit-2.3-nostrip.patch b/app-admin/jailkit/files/jailkit-2.3-nostrip.patch
new file mode 100644
index 000000000..64b9056d7
--- /dev/null
+++ b/app-admin/jailkit/files/jailkit-2.3-nostrip.patch
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	2007-04-21 20:51:08.000000000 +0300
++++ src/Makefile.in	2007-04-21 20:57:09.000000000 +0300
+@@ -77,12 +77,12 @@
+ install: ${BINARIES}
+ 	${INSTALL} -d -m 755 ${prefix}
+ 	${INSTALL} -d -m 755 ${prefix}/sbin
+-	${INSTALL} -g 0 -o 0 -s -m 0755 jk_socketd ${prefix}/sbin/
+-	${INSTALL} -g 0 -o 0 -s -m 0755 jk_chrootlaunch ${prefix}/sbin/
+-	${INSTALL} -g 0 -o 0 -s -m 0755 jk_lsh  ${prefix}/sbin/
+-	${INSTALL} -g 0 -o 0 -s -m 4755 jk_chrootsh  ${prefix}/sbin/
++	${INSTALL} -g 0 -o 0 -m 0755 jk_socketd ${prefix}/sbin/
++	${INSTALL} -g 0 -o 0 -m 0755 jk_chrootlaunch ${prefix}/sbin/
++	${INSTALL} -g 0 -o 0 -m 0755 jk_lsh  ${prefix}/sbin/
++	${INSTALL} -g 0 -o 0 -m 4755 jk_chrootsh  ${prefix}/sbin/
+ 	if [ ${HAVEPROCMAIL} -eq "1" ]; then \
+-		${INSTALL} -g 0 -o root -s -m 4755 jk_procmailwrapper  ${prefix}/sbin/ ;\
++		${INSTALL} -g 0 -o root -m 4755 jk_procmailwrapper  ${prefix}/sbin/ ;\
+ 	fi
+ 	
+ uninstall:
diff --git a/app-admin/jailkit/jailkit-2.1.ebuild b/app-admin/jailkit/jailkit-2.3.ebuild
index 5ff61b118..6b35caf72 100644
--- a/app-admin/jailkit/jailkit-2.1.ebuild
+++ b/app-admin/jailkit/jailkit-2.3.ebuild
@@ -3,27 +3,29 @@
 # $Header: $
 
 inherit eutils
+
 DESCRIPTION="Allows you to easily put programs and users in a chrooted environment"
 HOMEPAGE="http://olivier.sessink.nl/jailkit/"
-SRC_URI="http://olivier.sessink.nl/jailkit/${P}.tar.bz2"
+SRC_URI="http://olivier.sessink.nl/${PN}/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND="dev-lang/python"
-RDEPEND="${DEPEND}"
-# The following line is for version 2.1 only
-S="${WORKDIR}/${PN}"
+
+DEPEND=""
+RDEPEND=""
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/jailkit-2.0-destdir.patch"
-	epatch "${FILESDIR}/jailkit-2.1-gentoo-sandbox.patch"
+
+	epatch "${FILESDIR}/${P}-destdir.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	doinitd "${FILESDIR}/jailkit"
 }