cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Jailkit to 2.15, patch-configure is not needed anymore

Browse Source 
(applied upstream), while here, USE_GROFF is not needed and zap some
white space.

Ok sebastia@ (maintainer), aja@
This commit is contained in:
gonzalo 2012-06-15 13:50:58 +00:00
parent 88f65c9e12
commit 4487e8afed
4 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/jailkit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2012/03/12 17:56:44 sebastia Exp $
# $OpenBSD: Makefile,v 1.8 2012/06/15 13:50:58 gonzalo Exp $
COMMENT= utilities for jailing a user or process
DISTNAME= jailkit-2.14
CATEGORIES= security sysutils
DISTNAME= jailkit-2.15
CATEGORIES= security sysutils
HOMEPAGE= http://olivier.sessink.nl/jailkit/
MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
@ -27,7 +27,6 @@ CONFIGURE_ENV= PYTHONINTERPRETER=${MODPY_BIN} \
CONFIGURE_ARGS= --sysconfdir=${SYSCONFDIR}
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
USE_GROFF = Yes
MAN_P= jailkit.8 jk_check.8 jk_chrootlaunch.8 jk_chrootsh.8 jk_cp.8 \
jk_init.8 jk_jailuser.8 jk_lsh.8 jk_socketd.8 jk_uchroot.8 \

10
security/jailkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (jailkit-2.14.tar.gz) = BZQ7kkUggx/0Txr0rDHWyQ==
RMD160 (jailkit-2.14.tar.gz) = kSw7fI+AjjRks4YQ6PxSdrm6hTg=
SHA1 (jailkit-2.14.tar.gz) = vD2fWLapg8nciBv4OdeEJRTtkpY=
SHA256 (jailkit-2.14.tar.gz) = rlW1sjaXXxSzYX2I4OJcAI6ze+HKPdD2fWAGbyThETE=
SIZE (jailkit-2.14.tar.gz) = 135978
MD5 (jailkit-2.15.tar.gz) = yQBTbD2nVm/i//AAHhhx5g==
RMD160 (jailkit-2.15.tar.gz) = 1U/GMhRivGaIH8iIf2LG+7S1jfU=
SHA1 (jailkit-2.15.tar.gz) = ZVUvSbw2cGm/XMDaMxIZeZpZ2As=
SHA256 (jailkit-2.15.tar.gz) = +PoaoQo3x5enKD3LyQ/6XnUkVLX4/Qg6XHnl0+JpzPc=
SIZE (jailkit-2.15.tar.gz) = 137372

32
security/jailkit/patches/patch-configure
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/09/20 07:15:30 sebastia Exp $
link against pthread
--- configure.orig Sun Sep 19 09:50:26 2010
+++ configure Sun Sep 19 09:51:20 2010
@@ -4433,13 +4433,13 @@ fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4474,7 +4474,7 @@ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes;
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5

8
security/jailkit/patches/patch-py_jk_lib_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-py_jk_lib_py,v 1.1.1.1 2010/09/20 07:15:30 sebastia Exp $
$OpenBSD: patch-py_jk_lib_py,v 1.2 2012/06/15 13:50:58 gonzalo Exp $
Fix running jk_init trying to create a jail the first time
--- py/jk_lib.py.orig Wed Aug 11 10:45:24 2010
+++ py/jk_lib.py Wed Aug 11 10:47:07 2010
@@ -442,7 +442,10 @@ def create_parent_path(chroot,path,be_verbose=0, copy_
--- py/jk_lib.py.orig Thu Jun 7 18:19:27 2012
+++ py/jk_lib.py Thu Jun 14 11:51:39 2012
@@ -459,7 +459,10 @@ def create_parent_path(chroot,path,be_verbose=0, copy_
if (stat.S_ISDIR(sb.st_mode)):
if (be_verbose):
print 'Create directory '+jailpath