From owner-svn-ports-head@freebsd.org Thu Nov 15 08:56:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9219112DF19; Thu, 15 Nov 2018 08:56:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F9198AC36; Thu, 15 Nov 2018 08:56:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3920442E; Thu, 15 Nov 2018 08:56:15 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAF8uF3b022532; Thu, 15 Nov 2018 08:56:15 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAF8uF61022530; Thu, 15 Nov 2018 08:56:15 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811150856.wAF8uF61022530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 15 Nov 2018 08:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485007 - head/shells/jailkit X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/shells/jailkit X-SVN-Commit-Revision: 485007 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0F9198AC36 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.10)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2018 08:56:17 -0000 Author: tobik Date: Thu Nov 15 08:56:15 2018 New Revision: 485007 URL: https://svnweb.freebsd.org/changeset/ports/485007 Log: shells/jailkit: Avoid accidentally picking up procmail When configure sees procmail in the environment building of jk_procmailwrapper is enabled. Add a new non-default PROCMAIL option to make it explicit. PR: 230132 Submitted by: John Hein Approved by: woodsb02 (maintainer timeout, 3.5 months) Modified: head/shells/jailkit/Makefile head/shells/jailkit/pkg-plist Modified: head/shells/jailkit/Makefile ============================================================================== --- head/shells/jailkit/Makefile Thu Nov 15 08:17:31 2018 (r485006) +++ head/shells/jailkit/Makefile Thu Nov 15 08:56:15 2018 (r485007) @@ -3,7 +3,7 @@ PORTNAME= jailkit PORTVERSION= 2.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= http://olivier.sessink.nl/jailkit/ \ http://www.sfr-fresh.com/unix/privat/ @@ -19,8 +19,15 @@ CONFIGURE_ENV= PYTHONINTERPRETER=${PYTHON_CMD} PORTDOCS= COPYRIGHT README.txt -OPTIONS_DEFINE= DOCS +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} @@ -29,5 +36,8 @@ post-install: ${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 Modified: head/shells/jailkit/pkg-plist ============================================================================== --- head/shells/jailkit/pkg-plist Thu Nov 15 08:17:31 2018 (r485006) +++ head/shells/jailkit/pkg-plist Thu Nov 15 08:56:15 2018 (r485007) @@ -16,6 +16,7 @@ man/man8/jk_init.8.gz man/man8/jk_jailuser.8.gz man/man8/jk_list.8.gz man/man8/jk_lsh.8.gz +%%PROCMAIL%%man/man8/jk_procmailwrapper.8.gz man/man8/jk_socketd.8.gz man/man8/jk_uchroot.8.gz man/man8/jk_update.8.gz @@ -28,6 +29,7 @@ sbin/jk_init sbin/jk_jailuser sbin/jk_list sbin/jk_lsh +%%PROCMAIL%%sbin/jk_procmailwrapper sbin/jk_socketd sbin/jk_update %%DATADIR%%/jk_lib.py