Index: head/shells/jailkit/Makefile =================================================================== --- head/shells/jailkit/Makefile (revision 492124) +++ head/shells/jailkit/Makefile (revision 492125) @@ -1,43 +1,42 @@ # Created by: Sylvio Cesar # $FreeBSD$ PORTNAME= jailkit -PORTVERSION= 2.19 -PORTREVISION= 2 +PORTVERSION= 2.20 CATEGORIES= shells MASTER_SITES= http://olivier.sessink.nl/jailkit/ \ http://www.sfr-fresh.com/unix/privat/ MAINTAINER= woodsb02@FreeBSD.org COMMENT= Utilities to limit user accounts to specific files and/or commands LICENSE= BSD3CLAUSE USES= python:2.7 + GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHONINTERPRETER=${PYTHON_CMD} - PORTDOCS= COPYRIGHT README.txt OPTIONS_DEFINE= DOCS PROCMAIL OPTIONS_SUB= yes PROCMAIL_DESC= Build procmail(1) wrapper PROCMAIL_CONFIGURE_ENV_OFF= ac_cv_path_PROCMAILPATH=no PROCMAIL_BUILD_DEPENDS= procmail:mail/procmail PROCMAIL_RUN_DEPENDS= procmail:mail/procmail post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jk_uchroot \ ${STAGEDIR}${PREFIX}/sbin/jk_socketd \ ${STAGEDIR}${PREFIX}/sbin/jk_chrootlaunch \ ${STAGEDIR}${PREFIX}/sbin/jk_chrootsh \ ${STAGEDIR}${PREFIX}/sbin/jk_lsh post-install-PROCMAIL-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/jk_procmailwrapper .include Index: head/shells/jailkit/distinfo =================================================================== --- head/shells/jailkit/distinfo (revision 492124) +++ head/shells/jailkit/distinfo (revision 492125) @@ -1,2 +1,3 @@ -SHA256 (jailkit-2.19.tar.gz) = fd9612dd57f4a39abfcde647c420616c5ca37f5982b8c07a8fb5cb352494fc88 -SIZE (jailkit-2.19.tar.gz) = 142280 +TIMESTAMP = 1549284658 +SHA256 (jailkit-2.20.tar.gz) = d619c1d4d11c823b7fa2e88a1d948600febd419ae8140381a63508961af1f6b5 +SIZE (jailkit-2.20.tar.gz) = 142815 Index: head/shells/jailkit/files/patch-Makefile.in =================================================================== --- head/shells/jailkit/files/patch-Makefile.in (revision 492124) +++ head/shells/jailkit/files/patch-Makefile.in (revision 492125) @@ -1,65 +1,65 @@ ---- Makefile.in.orig 2009-08-20 20:46:11.000000000 -0300 -+++ Makefile.in 2009-08-20 20:46:51.000000000 -0300 -@@ -38,22 +38,22 @@ +--- Makefile.in.orig 2010-09-11 13:45:26 UTC ++++ Makefile.in +@@ -38,22 +38,22 @@ INIFILES = jk_check.ini jk_init.ini jk_lsh.ini jk_sock jailkit: all all: - @cd src/ && $(MAKE) all - @cd py/ && $(MAKE) all - @cd man/ && $(MAKE) all + $(MAKE) -C src all + $(MAKE) -C py all + $(MAKE) -C man all clean: rm -f core *~ ini/*~ - @cd src/ && $(MAKE) clean - @cd py/ && $(MAKE) clean - @cd man/ && $(MAKE) clean + $(MAKE) -C src clean + $(MAKE) -C py clean + $(MAKE) -C man clean distclean: clean rm -rf autom4te.cache/ rm -f Makefile config.log config.status config.cache - @cd src/ && $(MAKE) distclean - @cd py/ && $(MAKE) distclean - @cd man/ && $(MAKE) distclean + $(MAKE) -C src distclean + $(MAKE) -C py distclean + $(MAKE) -C man distclean install: ${INSTALL} -d -m 755 ${DESTDIR}${iniprefix} -@@ -64,24 +64,13 @@ +@@ -64,24 +64,13 @@ install: ${INSTALL} -m 0644 ini/$${file} ${DESTDIR}${iniprefix} ;\ fi ;\ done - @cd src/ && $(MAKE) install - @cd py/ && $(MAKE) 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 -- + $(MAKE) -C src install + $(MAKE) -C py install + $(MAKE) -C man install +- uninstall: rm -f ${iniprefix}/*.ini - @cd py/ && $(MAKE) uninstall - @cd man/ && $(MAKE) uninstall - @cd src/ && $(MAKE) uninstall + $(MAKE) -C py uninstall + $(MAKE) -C man uninstall + $(MAKE) -C src uninstall -rmdir --ignore-fail-on-non-empty ${DESTDIR}${iniprefix} - @echo "You must manually remove jk_chrootsh from /etc/shells" -# remove jk_chrootsh from /etc/shells