From fa738d94514706e2a0b2e103e9270266519e57e8 Mon Sep 17 00:00:00 2001
From: Ben Woods <woodsb02@FreeBSD.org>
Date: Tue, 10 Dec 2019 14:10:29 +0000
Subject: [PATCH] shells/jailkit: Update to 2.21

This release adds full python 3 compatibility.

Changes this release:
  https://olivier.sessink.nl/jailkit/index.html#news
---
 shells/jailkit/Makefile  |  5 +++--
 shells/jailkit/distinfo  |  6 +++---
 shells/jailkit/pkg-descr | 17 ++++++++++++++---
 shells/jailkit/pkg-plist |  2 --
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index bc3aaff2846c..1ff19062b514 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jailkit
-PORTVERSION=	2.20
+PORTVERSION=	2.21
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
@@ -11,8 +11,9 @@ MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	Utilities to limit user accounts to specific files and/or commands
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=		python:2.7
+USES=		python
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
diff --git a/shells/jailkit/distinfo b/shells/jailkit/distinfo
index ac3e9c63ca94..79e60f3e83d4 100644
--- a/shells/jailkit/distinfo
+++ b/shells/jailkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549284658
-SHA256 (jailkit-2.20.tar.gz) = d619c1d4d11c823b7fa2e88a1d948600febd419ae8140381a63508961af1f6b5
-SIZE (jailkit-2.20.tar.gz) = 142815
+TIMESTAMP = 1575986065
+SHA256 (jailkit-2.21.tar.gz) = 7a020e07adf93860c538f0d98196aea33d461babdba8bb3eddf7081e57a29c14
+SIZE (jailkit-2.21.tar.gz) = 141341
diff --git a/shells/jailkit/pkg-descr b/shells/jailkit/pkg-descr
index c9a8806ab42e..623d8596fb95 100644
--- a/shells/jailkit/pkg-descr
+++ b/shells/jailkit/pkg-descr
@@ -1,6 +1,17 @@
 Jailkit is a set of utilities to limit user accounts to specific files
-using chroot() and or specific commands.  Setting up a chroot shell, a
-shell limited to some specific command, or daemon inside a chroot jail
+using chroot() and or specific commands. Setting up a chroot shell, a
+shell limited to some specific command, or a daemon inside a chroot jail
 is a lot easier and can be automated using these utilities.
 
-WWW: http://olivier.sessink.nl/jailkit/
+Jailkit is a specialized tool that is developed with a focus on security.
+It will abort in a secure way if the configuration, the system setup or the
+environment is not 100% secure, and it will send useful log messages that
+explain what is wrong to syslog.
+
+Jailkit is known to be used in network security appliances from several leading
+IT security firms, internet servers from several large enterprise organizations,
+internet servers from internet service providers, as well as many smaller
+companies and private users that need to secure cvs, sftp, shell or daemon
+processes.
+
+WWW: https://olivier.sessink.nl/jailkit/
diff --git a/shells/jailkit/pkg-plist b/shells/jailkit/pkg-plist
index 106c23c63336..6db4e2536a18 100644
--- a/shells/jailkit/pkg-plist
+++ b/shells/jailkit/pkg-plist
@@ -7,7 +7,6 @@ bin/jk_uchroot
 %%ETCDIR%%/jk_uchroot.ini
 %%ETCDIR%%/jk_update.ini
 man/man8/jailkit.8.gz
-man/man8/jk_addjailuser.8.gz
 man/man8/jk_check.8.gz
 man/man8/jk_chrootlaunch.8.gz
 man/man8/jk_chrootsh.8.gz
@@ -20,7 +19,6 @@ man/man8/jk_lsh.8.gz
 man/man8/jk_socketd.8.gz
 man/man8/jk_uchroot.8.gz
 man/man8/jk_update.8.gz
-sbin/jk_addjailuser
 sbin/jk_check
 sbin/jk_chrootlaunch
 @shell sbin/jk_chrootsh