From 7b955a283f33b772a6536e7cd1ea6f7d5286ca33 Mon Sep 17 00:00:00 2001 From: "Stephen Tallowitz (geta2)" Date: Sun, 12 Nov 2006 17:16:35 +0000 Subject: [PATCH] app-admin/jailkit: New version of jailkit. Thanks to #gentoo-sunrise - especially shillelagh - on helping with the ebuild svn path=/sunrise/; revision=1900 --- app-admin/jailkit/ChangeLog | 5 ++ app-admin/jailkit/Manifest | 20 ++++++-- app-admin/jailkit/files/digest-jailkit-2.1 | 3 ++ .../files/jailkit-2.1-gentoo-sandbox.patch | 50 +++++++++++++++++++ app-admin/jailkit/jailkit-2.1.ebuild | 37 ++++++++++++++ 5 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 app-admin/jailkit/files/digest-jailkit-2.1 create mode 100644 app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch create mode 100644 app-admin/jailkit/jailkit-2.1.ebuild diff --git a/app-admin/jailkit/ChangeLog b/app-admin/jailkit/ChangeLog index 184dae5b4..5b7a08713 100644 --- a/app-admin/jailkit/ChangeLog +++ b/app-admin/jailkit/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Nov 2006; Stephen Tallowitz (geta2) + +jailkit-2.1.ebuild, +files/jailkit-2.1-gentoo-sandbox.patch: + New version of jailkit. Thanks to #gentoo-sunrise - especially shillelagh - + on helping with the ebuild + 03 Sep 2006; Stephen Tallowitz (geta2) +jailkit-2.0.ebuild, +files/jailkit-2.0-destdir.patch, +files/jailkit-2.0-gentoo-sandbox.patch, +files/jailkit, +metadata.xml: diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest index 956c4a252..8a53736f7 100644 --- a/app-admin/jailkit/Manifest +++ b/app-admin/jailkit/Manifest @@ -10,15 +10,24 @@ AUX jailkit-2.0-gentoo-sandbox.patch 1246 RMD160 8f8f840cfd7b885c3ab8ee317e4687f MD5 9d54e5a3b5fa0735a3de08ccfc6d28e6 files/jailkit-2.0-gentoo-sandbox.patch 1246 RMD160 8f8f840cfd7b885c3ab8ee317e4687f91b46082e files/jailkit-2.0-gentoo-sandbox.patch 1246 SHA256 fe5a43a0b74e9c56d750a3f9fced9c10d190bd2ff514ca2df6e44c8bdea4f49f files/jailkit-2.0-gentoo-sandbox.patch 1246 +AUX jailkit-2.1-gentoo-sandbox.patch 2184 RMD160 a5a5994b1a1d30d970fab5c8db5adef2cc1ddad3 SHA1 a4cfe8f2526ae6b703fad5b474380d5485c54cf7 SHA256 83037a22d9126684ec5eb262c527062b919a7deb205a41b74e90e3385d32990b +MD5 617d977640eed8e9ea7a665b1061de72 files/jailkit-2.1-gentoo-sandbox.patch 2184 +RMD160 a5a5994b1a1d30d970fab5c8db5adef2cc1ddad3 files/jailkit-2.1-gentoo-sandbox.patch 2184 +SHA256 83037a22d9126684ec5eb262c527062b919a7deb205a41b74e90e3385d32990b files/jailkit-2.1-gentoo-sandbox.patch 2184 DIST jailkit-2.0.tar.bz2 80997 RMD160 f82d2075b32beb6451ea023b1b95781fa6c23704 SHA1 431f89c7f5015793768ea595cf2a7790a547ebb4 SHA256 57562ef537e6ea66a50595eeb0ea8cb65f6389a5cbb5a599d16c5c43d7889ca1 +DIST jailkit-2.1.tar.bz2 93332 RMD160 b4d7dfe44f04d060152dd97d1a5df326f5159a1a SHA1 d4e730a8cc04397b4111fbeb08f37fb9d1994582 SHA256 c6431e0dda749372d41bc3fa2813bd681650ace98cf08d84a00b33348b48d612 EBUILD jailkit-2.0.ebuild 776 RMD160 d8ddf8aff2db2ad9bc97bf2ed72d59f0c46988bc SHA1 6c78be921b467d82761e2a5d1b976e3c22e94af8 SHA256 e2eef7e390a5c43393c43f5a67666a4d60162210406304221d378ff87f2eccbb MD5 0d2e04ead67eb7a0e93afd0312052cbd jailkit-2.0.ebuild 776 RMD160 d8ddf8aff2db2ad9bc97bf2ed72d59f0c46988bc jailkit-2.0.ebuild 776 SHA256 e2eef7e390a5c43393c43f5a67666a4d60162210406304221d378ff87f2eccbb jailkit-2.0.ebuild 776 -MISC ChangeLog 382 RMD160 7d6ab4fdd24752b1de74afc6026c30442da5b3cf SHA1 b3bc58fbdc673aa3f163d5c1c0e1c2a210714632 SHA256 0d81d9bebe46fa28cb05eb4cdbef15df34ee47cb155360a12b35e8885c2be9a0 -MD5 b5f4e38e617f95880e83c73010e2efe1 ChangeLog 382 -RMD160 7d6ab4fdd24752b1de74afc6026c30442da5b3cf ChangeLog 382 -SHA256 0d81d9bebe46fa28cb05eb4cdbef15df34ee47cb155360a12b35e8885c2be9a0 ChangeLog 382 +EBUILD jailkit-2.1.ebuild 980 RMD160 3f057c5b610f705b13302fa70802ebbbc50cff95 SHA1 69ba3e8b50131a04028aea33c2fbc49099dd03fe SHA256 c96d426d73be02713de937814969a13513ce7a7555430c84f32742a59e74cbcc +MD5 672e46df45aba40527c298b96012211b jailkit-2.1.ebuild 980 +RMD160 3f057c5b610f705b13302fa70802ebbbc50cff95 jailkit-2.1.ebuild 980 +SHA256 c96d426d73be02713de937814969a13513ce7a7555430c84f32742a59e74cbcc jailkit-2.1.ebuild 980 +MISC ChangeLog 614 RMD160 aae4441a22e9fdb6ff61c5f8230107c552490e87 SHA1 904c34626aa765bce3b602a1431b5bac0d454453 SHA256 00b2e26e2cd074c61d0db68e5a4db0277c452c8362f722ed9763ed9266068191 +MD5 dc2527735fbc678e8f96ecfb91e1ce03 ChangeLog 614 +RMD160 aae4441a22e9fdb6ff61c5f8230107c552490e87 ChangeLog 614 +SHA256 00b2e26e2cd074c61d0db68e5a4db0277c452c8362f722ed9763ed9266068191 ChangeLog 614 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -26,3 +35,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata MD5 dd6dc1f80bac54ecf01a3d99f4e56909 files/digest-jailkit-2.0 235 RMD160 b459cf08ac0e03be5d797961fe2b01c89b5262eb files/digest-jailkit-2.0 235 SHA256 3e366f5f738e52a92c6e0c961cf09330e8542747182f6f6f6f6f85548d7ff1b8 files/digest-jailkit-2.0 235 +MD5 289dc94dcf8cd162c53c57f2b6671b7b files/digest-jailkit-2.1 235 +RMD160 cd4514c1836726b879257fb221daa2da016e8a4c files/digest-jailkit-2.1 235 +SHA256 38aa5d42b60dae71b5dcbdbd4ed76fd01ee2555a606f146c8ff7c31949ba01fd files/digest-jailkit-2.1 235 diff --git a/app-admin/jailkit/files/digest-jailkit-2.1 b/app-admin/jailkit/files/digest-jailkit-2.1 new file mode 100644 index 000000000..6f0b56da8 --- /dev/null +++ b/app-admin/jailkit/files/digest-jailkit-2.1 @@ -0,0 +1,3 @@ +MD5 7c61576a75e72e9c3839fb33e958dbfb jailkit-2.1.tar.bz2 93332 +RMD160 b4d7dfe44f04d060152dd97d1a5df326f5159a1a jailkit-2.1.tar.bz2 93332 +SHA256 c6431e0dda749372d41bc3fa2813bd681650ace98cf08d84a00b33348b48d612 jailkit-2.1.tar.bz2 93332 diff --git a/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch b/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch new file mode 100644 index 000000000..a54e3e4bd --- /dev/null +++ b/app-admin/jailkit/files/jailkit-2.1-gentoo-sandbox.patch @@ -0,0 +1,50 @@ +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/jailkit-2.1.ebuild b/app-admin/jailkit/jailkit-2.1.ebuild new file mode 100644 index 000000000..5306b5696 --- /dev/null +++ b/app-admin/jailkit/jailkit-2.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $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" +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}" + +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/jailkit-2.0-destdir.patch" + epatch "${FILESDIR}/jailkit-2.1-gentoo-sandbox.patch" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + doinitd "${FILESDIR}/jailkit" +} + +pkg_postinst() { + elog "Don't forget to add /usr/sbin/jk_chrootsh to /etc/shells." +} + +pkg_postrm() { + elog "If you want to keep your system clean, don't forget to remove" + elog "the line containing /usr/sbin/jk_chrootsh from /etc/shells." +} -- 2.43.2