subject:"UPDATE\: Jailkit\-2.21"

Re: UPDATE: Jailkit-2.21

2020-06-29 Thread Gonzalo L. Rodriguez

On Mon, 29 Jun 2020 at 09:38:07 +0200, Gonzalo L. Rodriguez wrote:
> Anyone?
> 
> On Wed, 15 Jan 2020 at 17:35:47 +0100, Gonzalo L. Rodriguez wrote:
> > Hallo,
> > 
> > Update for Jailkit to 2.21:
> > 
> > https://olivier.sessink.nl/jailkit/
> > 
> > OK? Comments?
> > 
> > Cheers.-
> > 
> > -- 
> > 
> > - gonzalo
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/jailkit/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 Makefile
> > --- Makefile12 Jul 2019 20:49:03 -  1.15
> > +++ Makefile15 Jan 2020 16:33:38 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   utilities for jailing a user or process
> >  
> > -DISTNAME=  jailkit-2.19
> > +DISTNAME=  jailkit-2.21
> >  CATEGORIES=security sysutils
> >  
> >  HOMEPAGE=  http://olivier.sessink.nl/jailkit/
> > @@ -13,6 +13,8 @@ MASTER_SITES= http://olivier.sessink.nl
> >  PERMIT_PACKAGE=Yes
> >  
> >  MODULES=   lang/python
> > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > +
> >  WANTLIB += c pthread
> >  
> >  NO_TEST=   Yes
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/jailkit/distinfo,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 distinfo
> > --- distinfo20 Dec 2015 15:43:46 -  1.8
> > +++ distinfo15 Jan 2020 16:33:38 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> > -SIZE (jailkit-2.19.tar.gz) = 142280
> > +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> > +SIZE (jailkit-2.21.tar.gz) = 141341
> > Index: patches/patch-Makefile_in
> > ===
> > RCS file: /cvs/ports/security/jailkit/patches/patch-Makefile_in,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 patch-Makefile_in
> > --- patches/patch-Makefile_in   20 Sep 2010 07:15:30 -  1.1.1.1
> > +++ patches/patch-Makefile_in   15 Jan 2020 16:33:38 -
> > @@ -2,24 +2,25 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
> >  
> >  We do not want the packge to manipulate our /etc/shells, use @shell in 
> > PLIST
> >  
> >  Makefile.in.orig   Sat Sep 11 15:45:26 2010
> > -+++ Makefile.inMon Sep 13 08:01:37 2010
> > +Index: Makefile.in
> > +--- Makefile.in.orig
> >  Makefile.in
> >  @@ -69,12 +69,12 @@ install:
> > @cd man/ && $(MAKE) install
> > # test if the jk_chrootsh is already in /etc/shells
> > # this previously had @echo but that fails on FreeBSD
> > --  if test -w /etc/shells; then \
> > --  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 ;\
> > --  fi \
> > --  fi
> > -+  #if test -w /etc/shells; then \
> > -+  #   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 ;\
> > -+  #   fi \
> > -+  #fi
> > +-  #if test -w /etc/shells; then \
> > +-  #   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 ;\
> > +-  #   fi \
> > +-  #fi
> > ++  if test -w /etc/shells; then \
> > ++  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 ;\
> > ++  fi \
> > ++  fi
> >   
> >   
> >   uninstall:
> > Index: patches/patch-ini_jk_init_ini
> > ===
> > RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 patch-ini_jk_init_ini
> > --- patches/patch-ini_jk_init_ini   26 Mar 2014 17:38:27 -  1.3
> > +++ patches/patch-ini_jk_init_ini   15 Jan 2020 16:33:38 -
> > @@ -2,13 +2,14 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.3 20
> >  
> >  fix some default paths in the jail creation configuration file
> >  
> >  ini/jk_init.ini.orig   Mon Dec 23 06:02:42 2013
> > -+++ ini/jk_init.iniWed Dec 25 16:04:26 2013
> > +Index: ini/jk_init.ini
> > +--- ini/jk_init.ini.orig
> >  ini/jk_init.ini
> >  @@ -2,18 +2,18 @@
> >   # this section probably needs adjustment on 64bit systems
> >   # or non-Linux systems
> >   comment = common files for all jails that need user/group information
> > --paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> > /lib64/libnss*.so.2,

Re: UPDATE: Jailkit-2.21

2020-06-29 Thread Stuart Henderson

On 2020/06/29 12:06, Paul Irofti wrote:
> I think you are making this python3 only. If I am correct you need the
> FLAVOR dance, what your diff does is the old way of doing py3-only
> ports. Don't worry, I hit this myself quite recently :)

this is the right way for a standalone port, basically like this:

port is a program which happens to be written in python -> "foo" pkgname
-> MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}

port is a module used by other ports -> "py-foo" / "py3-foo" pkgname
-> FLAVOR=python3/FLAVORS=python3

if it's both a program and a module used by other ports, then we need
the py-/py3- split to avoid conflicts, so it needs to be treated like
a module

we probably need a guide to writing python ports somewhere, they're a
bit complicated and the wall of text in port-modules(5) is unreadable
(and doesn't exactly mention this directly anyway).

Re: UPDATE: Jailkit-2.21

2020-06-29 Thread Paul Irofti

I think you are making this python3 only. If I am correct you need the
FLAVOR dance, what your diff does is the old way of doing py3-only
ports. Don't worry, I hit this myself quite recently :)

  https://marc.info/?l=openbsd-ports=158220698602881=2

On Mon, Jun 29, 2020 at 09:38:07AM +0200, Gonzalo L. Rodriguez wrote:
> Anyone?
> 
> On Wed, 15 Jan 2020 at 17:35:47 +0100, Gonzalo L. Rodriguez wrote:
> > Hallo,
> > 
> > Update for Jailkit to 2.21:
> > 
> > https://olivier.sessink.nl/jailkit/
> > 
> > OK? Comments?
> > 
> > Cheers.-
> > 
> > -- 
> > 
> > - gonzalo
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/jailkit/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 Makefile
> > --- Makefile12 Jul 2019 20:49:03 -  1.15
> > +++ Makefile15 Jan 2020 16:33:38 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   utilities for jailing a user or process
> >  
> > -DISTNAME=  jailkit-2.19
> > +DISTNAME=  jailkit-2.21
> >  CATEGORIES=security sysutils
> >  
> >  HOMEPAGE=  http://olivier.sessink.nl/jailkit/
> > @@ -13,6 +13,8 @@ MASTER_SITES= http://olivier.sessink.nl
> >  PERMIT_PACKAGE=Yes
> >  
> >  MODULES=   lang/python
> > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > +
> >  WANTLIB += c pthread
> >  
> >  NO_TEST=   Yes
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/jailkit/distinfo,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 distinfo
> > --- distinfo20 Dec 2015 15:43:46 -  1.8
> > +++ distinfo15 Jan 2020 16:33:38 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> > -SIZE (jailkit-2.19.tar.gz) = 142280
> > +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> > +SIZE (jailkit-2.21.tar.gz) = 141341
> > Index: patches/patch-Makefile_in
> > ===
> > RCS file: /cvs/ports/security/jailkit/patches/patch-Makefile_in,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 patch-Makefile_in
> > --- patches/patch-Makefile_in   20 Sep 2010 07:15:30 -  1.1.1.1
> > +++ patches/patch-Makefile_in   15 Jan 2020 16:33:38 -
> > @@ -2,24 +2,25 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
> >  
> >  We do not want the packge to manipulate our /etc/shells, use @shell in 
> > PLIST
> >  
> >  Makefile.in.orig   Sat Sep 11 15:45:26 2010
> > -+++ Makefile.inMon Sep 13 08:01:37 2010
> > +Index: Makefile.in
> > +--- Makefile.in.orig
> >  Makefile.in
> >  @@ -69,12 +69,12 @@ install:
> > @cd man/ && $(MAKE) install
> > # test if the jk_chrootsh is already in /etc/shells
> > # this previously had @echo but that fails on FreeBSD
> > --  if test -w /etc/shells; then \
> > --  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 ;\
> > --  fi \
> > --  fi
> > -+  #if test -w /etc/shells; then \
> > -+  #   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 ;\
> > -+  #   fi \
> > -+  #fi
> > +-  #if test -w /etc/shells; then \
> > +-  #   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 ;\
> > +-  #   fi \
> > +-  #fi
> > ++  if test -w /etc/shells; then \
> > ++  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 ;\
> > ++  fi \
> > ++  fi
> >   
> >   
> >   uninstall:
> > Index: patches/patch-ini_jk_init_ini
> > ===
> > RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 patch-ini_jk_init_ini
> > --- patches/patch-ini_jk_init_ini   26 Mar 2014 17:38:27 -  1.3
> > +++ patches/patch-ini_jk_init_ini   15 Jan 2020 16:33:38 -
> > @@ -2,13 +2,14 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.3 20
> >  
> >  fix some default paths in the jail creation configuration file
> >  
> >  ini/jk_init.ini.orig   Mon Dec 23 06:02:42 2013
> > -+++ ini/jk_init.iniWed Dec 25 16:04:26 2013
> > +Index: ini/jk_init.ini
> > +--- ini/jk_init.ini.orig
> >  ini/jk_init.ini
> >  @@ -2,18 +2,18 @@
> >   # this

Re: UPDATE: Jailkit-2.21

2020-06-29 Thread Gonzalo L. Rodriguez

Anyone?

On Wed, 15 Jan 2020 at 17:35:47 +0100, Gonzalo L. Rodriguez wrote:
> Hallo,
> 
> Update for Jailkit to 2.21:
> 
> https://olivier.sessink.nl/jailkit/
> 
> OK? Comments?
> 
> Cheers.-
> 
> -- 
> 
>   - gonzalo

> Index: Makefile
> ===
> RCS file: /cvs/ports/security/jailkit/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  12 Jul 2019 20:49:03 -  1.15
> +++ Makefile  15 Jan 2020 16:33:38 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= utilities for jailing a user or process
>  
> -DISTNAME=jailkit-2.19
> +DISTNAME=jailkit-2.21
>  CATEGORIES=  security sysutils
>  
>  HOMEPAGE=http://olivier.sessink.nl/jailkit/
> @@ -13,6 +13,8 @@ MASTER_SITES=   http://olivier.sessink.nl
>  PERMIT_PACKAGE=  Yes
>  
>  MODULES= lang/python
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +
>  WANTLIB += c pthread
>  
>  NO_TEST= Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/jailkit/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  20 Dec 2015 15:43:46 -  1.8
> +++ distinfo  15 Jan 2020 16:33:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> -SIZE (jailkit-2.19.tar.gz) = 142280
> +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> +SIZE (jailkit-2.21.tar.gz) = 141341
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-Makefile_in
> --- patches/patch-Makefile_in 20 Sep 2010 07:15:30 -  1.1.1.1
> +++ patches/patch-Makefile_in 15 Jan 2020 16:33:38 -
> @@ -2,24 +2,25 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
>  
>  We do not want the packge to manipulate our /etc/shells, use @shell in PLIST
>  
>  Makefile.in.orig Sat Sep 11 15:45:26 2010
> -+++ Makefile.in  Mon Sep 13 08:01:37 2010
> +Index: Makefile.in
> +--- Makefile.in.orig
>  Makefile.in
>  @@ -69,12 +69,12 @@ install:
>   @cd man/ && $(MAKE) install
>   # test if the jk_chrootsh is already in /etc/shells
>   # this previously had @echo but that fails on FreeBSD
> --if test -w /etc/shells; then \
> --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 ;\
> --fi \
> --fi
> -+#if test -w /etc/shells; then \
> -+#   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 ;\
> -+#   fi \
> -+#fi
> +-#if test -w /etc/shells; then \
> +-#   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 ;\
> +-#   fi \
> +-#fi
> ++if test -w /etc/shells; then \
> ++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 ;\
> ++fi \
> ++fi
>   
>   
>   uninstall:
> Index: patches/patch-ini_jk_init_ini
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ini_jk_init_ini
> --- patches/patch-ini_jk_init_ini 26 Mar 2014 17:38:27 -  1.3
> +++ patches/patch-ini_jk_init_ini 15 Jan 2020 16:33:38 -
> @@ -2,13 +2,14 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.3 20
>  
>  fix some default paths in the jail creation configuration file
>  
>  ini/jk_init.ini.orig Mon Dec 23 06:02:42 2013
> -+++ ini/jk_init.ini  Wed Dec 25 16:04:26 2013
> +Index: ini/jk_init.ini
> +--- ini/jk_init.ini.orig
>  ini/jk_init.ini
>  @@ -2,18 +2,18 @@
>   # this section probably needs adjustment on 64bit systems
>   # or non-Linux systems
>   comment = common files for all jails that need user/group information
> --paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
> /lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
> +-paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2,

Re: UPDATE: Jailkit-2.21

2020-01-22 Thread Gonzalo L. Rodriguez

ping

On Wed, 15 Jan 2020 at 17:35:47 +0100, Gonzalo L. Rodriguez wrote:
> Hallo,
> 
> Update for Jailkit to 2.21:
> 
> https://olivier.sessink.nl/jailkit/
> 
> OK? Comments?
> 
> Cheers.-
> 
> -- 
> 
>   - gonzalo

> Index: Makefile
> ===
> RCS file: /cvs/ports/security/jailkit/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  12 Jul 2019 20:49:03 -  1.15
> +++ Makefile  15 Jan 2020 16:33:38 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= utilities for jailing a user or process
>  
> -DISTNAME=jailkit-2.19
> +DISTNAME=jailkit-2.21
>  CATEGORIES=  security sysutils
>  
>  HOMEPAGE=http://olivier.sessink.nl/jailkit/
> @@ -13,6 +13,8 @@ MASTER_SITES=   http://olivier.sessink.nl
>  PERMIT_PACKAGE=  Yes
>  
>  MODULES= lang/python
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +
>  WANTLIB += c pthread
>  
>  NO_TEST= Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/jailkit/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  20 Dec 2015 15:43:46 -  1.8
> +++ distinfo  15 Jan 2020 16:33:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> -SIZE (jailkit-2.19.tar.gz) = 142280
> +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> +SIZE (jailkit-2.21.tar.gz) = 141341
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-Makefile_in
> --- patches/patch-Makefile_in 20 Sep 2010 07:15:30 -  1.1.1.1
> +++ patches/patch-Makefile_in 15 Jan 2020 16:33:38 -
> @@ -2,24 +2,25 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
>  
>  We do not want the packge to manipulate our /etc/shells, use @shell in PLIST
>  
>  Makefile.in.orig Sat Sep 11 15:45:26 2010
> -+++ Makefile.in  Mon Sep 13 08:01:37 2010
> +Index: Makefile.in
> +--- Makefile.in.orig
>  Makefile.in
>  @@ -69,12 +69,12 @@ install:
>   @cd man/ && $(MAKE) install
>   # test if the jk_chrootsh is already in /etc/shells
>   # this previously had @echo but that fails on FreeBSD
> --if test -w /etc/shells; then \
> --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 ;\
> --fi \
> --fi
> -+#if test -w /etc/shells; then \
> -+#   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 ;\
> -+#   fi \
> -+#fi
> +-#if test -w /etc/shells; then \
> +-#   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 ;\
> +-#   fi \
> +-#fi
> ++if test -w /etc/shells; then \
> ++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 ;\
> ++fi \
> ++fi
>   
>   
>   uninstall:
> Index: patches/patch-ini_jk_init_ini
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ini_jk_init_ini
> --- patches/patch-ini_jk_init_ini 26 Mar 2014 17:38:27 -  1.3
> +++ patches/patch-ini_jk_init_ini 15 Jan 2020 16:33:38 -
> @@ -2,13 +2,14 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.3 20
>  
>  fix some default paths in the jail creation configuration file
>  
>  ini/jk_init.ini.orig Mon Dec 23 06:02:42 2013
> -+++ ini/jk_init.ini  Wed Dec 25 16:04:26 2013
> +Index: ini/jk_init.ini
> +--- ini/jk_init.ini.orig
>  ini/jk_init.ini
>  @@ -2,18 +2,18 @@
>   # this section probably needs adjustment on 64bit systems
>   # or non-Linux systems
>   comment = common files for all jails that need user/group information
> --paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
> /lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
> +-paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2,

UPDATE: Jailkit-2.21

2020-01-15 Thread Gonzalo L. Rodriguez

Hallo,

Update for Jailkit to 2.21:

https://olivier.sessink.nl/jailkit/

OK? Comments?

Cheers.-

-- 

- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/security/jailkit/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:03 -  1.15
+++ Makefile15 Jan 2020 16:33:38 -
@@ -2,7 +2,7 @@
 
 COMMENT=   utilities for jailing a user or process
 
-DISTNAME=  jailkit-2.19
+DISTNAME=  jailkit-2.21
 CATEGORIES=security sysutils
 
 HOMEPAGE=  http://olivier.sessink.nl/jailkit/
@@ -13,6 +13,8 @@ MASTER_SITES= http://olivier.sessink.nl
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
 WANTLIB += c pthread
 
 NO_TEST=   Yes
Index: distinfo
===
RCS file: /cvs/ports/security/jailkit/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo20 Dec 2015 15:43:46 -  1.8
+++ distinfo15 Jan 2020 16:33:38 -
@@ -1,2 +1,2 @@
-SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
-SIZE (jailkit-2.19.tar.gz) = 142280
+SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
+SIZE (jailkit-2.21.tar.gz) = 141341
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/security/jailkit/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in   20 Sep 2010 07:15:30 -  1.1.1.1
+++ patches/patch-Makefile_in   15 Jan 2020 16:33:38 -
@@ -2,24 +2,25 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
 
 We do not want the packge to manipulate our /etc/shells, use @shell in PLIST
 
 Makefile.in.orig   Sat Sep 11 15:45:26 2010
-+++ Makefile.inMon Sep 13 08:01:37 2010
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
 @@ -69,12 +69,12 @@ install:
@cd man/ && $(MAKE) install
# test if the jk_chrootsh is already in /etc/shells
# this previously had @echo but that fails on FreeBSD
--  if test -w /etc/shells; then \
--  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 ;\
--  fi \
--  fi
-+  #if test -w /etc/shells; then \
-+  #   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 ;\
-+  #   fi \
-+  #fi
+-  #if test -w /etc/shells; then \
+-  #   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 ;\
+-  #   fi \
+-  #fi
++  if test -w /etc/shells; then \
++  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 ;\
++  fi \
++  fi
  
  
  uninstall:
Index: patches/patch-ini_jk_init_ini
===
RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ini_jk_init_ini
--- patches/patch-ini_jk_init_ini   26 Mar 2014 17:38:27 -  1.3
+++ patches/patch-ini_jk_init_ini   15 Jan 2020 16:33:38 -
@@ -2,13 +2,14 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.3 20
 
 fix some default paths in the jail creation configuration file
 
 ini/jk_init.ini.orig   Mon Dec 23 06:02:42 2013
-+++ ini/jk_init.iniWed Dec 25 16:04:26 2013
+Index: ini/jk_init.ini
+--- ini/jk_init.ini.orig
 ini/jk_init.ini
 @@ -2,18 +2,18 @@
  # this section probably needs adjustment on 64bit systems
  # or non-Linux systems
  comment = common files for all jails that need user/group information
--paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
+-paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, /lib/arm-linux-gnueabihf/libnss*.so.2, 
/lib/arm-linux-gnueabihf/libnsl*.so.1, /etc/nsswitch.conf, /etc/ld.so.conf
 +paths =

Re: UPDATE: Jailkit-2.21

Re: UPDATE: Jailkit-2.21

Re: UPDATE: Jailkit-2.21

Re: UPDATE: Jailkit-2.21

Re: UPDATE: Jailkit-2.21

UPDATE: Jailkit-2.21

6 matches

Site Navigation

Mail list logo

Footer information