From owner-svn-ports-all@freebsd.org Mon Aug 29 14:53:03 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37712BC7391; Mon, 29 Aug 2016 14:53:03 +0000 (UTC) (envelope-from mat@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 mx1.freebsd.org (Postfix) with ESMTPS id 137996A4; Mon, 29 Aug 2016 14:53:03 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7TEr2kF067781; Mon, 29 Aug 2016 14:53:02 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7TEr1IU067772; Mon, 29 Aug 2016 14:53:01 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608291453.u7TEr1IU067772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 29 Aug 2016 14:53:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421063 - in head/sysutils: . qjail qjail2 qjail4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2016 14:53:03 -0000 Author: mat Date: Mon Aug 29 14:53:01 2016 New Revision: 421063 URL: https://svnweb.freebsd.org/changeset/ports/421063 Log: Update sysutils/qjail to 5.0 to handle FreeBSD 11+. Copy it to sysutils/qjail4 for FreeBSD 10 and sync CONFLICTS with the FreeBSD 8/9 version. PR: 212201, 212202 Submitted by: maintainer Sponsored by: Absolight Added: head/sysutils/qjail4/ - copied from r421062, head/sysutils/qjail/ Modified: head/sysutils/Makefile head/sysutils/qjail/Makefile head/sysutils/qjail/distinfo head/sysutils/qjail/pkg-descr head/sysutils/qjail/pkg-message head/sysutils/qjail/pkg-plist head/sysutils/qjail2/Makefile head/sysutils/qjail4/Makefile head/sysutils/qjail4/pkg-descr Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/Makefile Mon Aug 29 14:53:01 2016 (r421063) @@ -869,6 +869,7 @@ SUBDIR += qchroot SUBDIR += qjail SUBDIR += qjail2 + SUBDIR += qjail4 SUBDIR += qlogtools SUBDIR += qpxtool SUBDIR += qsynergy Modified: head/sysutils/qjail/Makefile ============================================================================== --- head/sysutils/qjail/Makefile Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail/Makefile Mon Aug 29 14:53:01 2016 (r421063) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qjail -PORTVERSION= 4.9 +PORTVERSION= 5.0 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME} @@ -24,10 +24,13 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-2.* qjail-3.* +CONFLICTS_INSTALL= qjail[24]-* + +IGNORE_FreeBSD_9= Only for FreeBSD 11+ +IGNORE_FreeBSD_10= Only for FreeBSD 11+ do-install: -.for i in qjail qjail.vnet.be qjail.vnet.ng +.for i in qjail qjail.vnet.be ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_SCRIPT} ${WRKSRC}/qjail.bootime \ Modified: head/sysutils/qjail/distinfo ============================================================================== --- head/sysutils/qjail/distinfo Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail/distinfo Mon Aug 29 14:53:01 2016 (r421063) @@ -1,2 +1,3 @@ -SHA256 (qjail-4.9.tar.bz2) = 163d8893d431ab0699156db4a15c1c8927a71c4918014adb6006a8b6657cb49b -SIZE (qjail-4.9.tar.bz2) = 66048 +TIMESTAMP = 1472482359 +SHA256 (qjail-5.0.tar.bz2) = 41bc83d214035c7939d50fce091a0f888a7d109aaf93cb52c9c70d0f4357a668 +SIZE (qjail-5.0.tar.bz2) = 63015 Modified: head/sysutils/qjail/pkg-descr ============================================================================== --- head/sysutils/qjail/pkg-descr Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail/pkg-descr Mon Aug 29 14:53:01 2016 (r421063) @@ -1,4 +1,4 @@ -This qjail version is not intended for RELEASES older than RELEASE-10.0. +This qjail version only supports RELEASE-11.0 and newer. Qjail [ q = quick ] is a 4th generation wrapper for the basic chroot jail system that includes security and performance enhancements. Plus a new level Modified: head/sysutils/qjail/pkg-message ============================================================================== --- head/sysutils/qjail/pkg-message Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail/pkg-message Mon Aug 29 14:53:01 2016 (r421063) @@ -10,33 +10,4 @@ For the BIG PICTURE issue "man qjail-how ######################################################################## -For users who have existing qjail environments. Please take note. -There are changes to the internals of the jail(8) command and changes to -parameter names in the periodic files that have occured in FreeBSD -Release 10.2 that effects jail behavior in a very minor way. -IF your running qjail on an 10.2 or newer version of FreeBSD you should -consider doing the following. -This version of qjail has an built in auto convert function that you may select -to choose that fixes those minor behavior problems with your existing jails. -This auto convert function is not documented in the qjail manual. Its only -shown here. So write it down. - - Issue [ qjail update -u ] from the host console. - -This will cause the existing "flavors" default & ssh-default directories to be -renamed and new ones populated. Then in each existing jail the periodic.conf -and newsyslog.conf files will be renamed with .saved suffix and new ones added. -The rc.conf file will be updated in place changing the -syslogd_enable= parameter value from "NO" to "YES". - -The new periodic.conf file has many sendmail reporting options disabled because -sendmail is disabled in the jails rc.conf file by default. This drastically -reduces the daily. weekly, monthly system and security status reports elapse -run times. This has a major effect on operating system performance where there -are a large number of jails. - -The [ qjail install ] command will install all the correct files depending on -what version of FreeBSD your host is running. - -######################################################################## Modified: head/sysutils/qjail/pkg-plist ============================================================================== --- head/sysutils/qjail/pkg-plist Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail/pkg-plist Mon Aug 29 14:53:01 2016 (r421063) @@ -1,24 +1,24 @@ bin/qjail bin/qjail.vnet.be -bin/qjail.vnet.ng @sample etc/qjail.portsnap.conf.sample etc/rc.d/qjail.bootime man/man8/qjail.8.gz man/man8/qjail-intro.8.gz man/man8/qjail-howto.8.gz -%%EXAMPLESDIR%%/vnet/ipfw.rules.host -%%EXAMPLESDIR%%/vnet/ipfw.rules.vnet -%%EXAMPLESDIR%%/vnet/ipf.rules.host -%%EXAMPLESDIR%%/vnet/ipf.rules.vnet -%%EXAMPLESDIR%%/vnet/pf.rules.host -%%EXAMPLESDIR%%/vnet/pf.rules.vnet +%%EXAMPLESDIR%%/vnet/ipfw.host.rules +%%EXAMPLESDIR%%/vnet/ipfw.vnet.rules +%%EXAMPLESDIR%%/vnet/ipf.host.rules +%%EXAMPLESDIR%%/vnet/ipf.vnet.boot.rules +%%EXAMPLESDIR%%/vnet/ipf.vnet.run.rules +%%EXAMPLESDIR%%/vnet/pf.host.rules +%%EXAMPLESDIR%%/vnet/pf.vnet.rules.script +%%EXAMPLESDIR%%/vnet/devfsrules_vjail_pf70 +%%EXAMPLESDIR%%/vnet/devfsrules_vjail_ipf60 %%EXAMPLESDIR%%/default/etc/make.conf %%EXAMPLESDIR%%/default/etc/motd %%EXAMPLESDIR%%/default/etc/periodic.conf -%%EXAMPLESDIR%%/default/etc/periodic102.conf -%%EXAMPLESDIR%%/default/etc/newsyslog102.conf +%%EXAMPLESDIR%%/default/etc/newsyslog.conf %%EXAMPLESDIR%%/default/etc/rc.conf -%%EXAMPLESDIR%%/default/etc/rc102.conf %%EXAMPLESDIR%%/default/root/.cshrc %%EXAMPLESDIR%%/default/usr/local/etc/pkg.conf %%EXAMPLESDIR%%/default/usr/local/etc/sudoers @@ -28,11 +28,9 @@ man/man8/qjail-howto.8.gz %%EXAMPLESDIR%%/ssh-default/etc/motd %%EXAMPLESDIR%%/ssh-default/etc/passwd %%EXAMPLESDIR%%/ssh-default/etc/periodic.conf -%%EXAMPLESDIR%%/ssh-default/etc/periodic102.conf -%%EXAMPLESDIR%%/ssh-default/etc/newsyslog102.conf +%%EXAMPLESDIR%%/ssh-default/etc/newsyslog.conf %%EXAMPLESDIR%%/ssh-default/etc/pwd.db %%EXAMPLESDIR%%/ssh-default/etc/rc.conf -%%EXAMPLESDIR%%/ssh-default/etc/rc102.conf %%EXAMPLESDIR%%/ssh-default/etc/spwd.db %%EXAMPLESDIR%%/ssh-default/etc/ssh/sshd_config %%EXAMPLESDIR%%/ssh-default/root/.cshrc Modified: head/sysutils/qjail2/Makefile ============================================================================== --- head/sysutils/qjail2/Makefile Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail2/Makefile Mon Aug 29 14:53:01 2016 (r421063) @@ -14,7 +14,11 @@ COMMENT= Utility to quickly deploy and m USES= tar:bzip2 NO_BUILD= yes -CONFLICTS_INSTALL= qjail-1.* qjail-3.* +CONFLICTS_INSTALL= qjail-* + +IGNORE_FreeBSD_10= Only for FreeBSD 8 and 9 +IGNORE_FreeBSD_11= Only for FreeBSD 8 and 9 +IGNORE_FreeBSD_12= Only for FreeBSD 8 and 9 do-install: Modified: head/sysutils/qjail4/Makefile ============================================================================== --- head/sysutils/qjail/Makefile Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail4/Makefile Mon Aug 29 14:53:01 2016 (r421063) @@ -5,6 +5,7 @@ PORTNAME= qjail PORTVERSION= 4.9 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME} +PKGNAMESUFFIX= 4 MAINTAINER= qjail1@a1poweruser.com COMMENT= Utility to quickly deploy and manage jails @@ -24,7 +25,11 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-2.* qjail-3.* +CONFLICTS_INSTALL= qjail-* + +IGNORE_FreeBSD_9= Only for FreeBSD 10.x +IGNORE_FreeBSD_11= Only for FreeBSD 10.x +IGNORE_FreeBSD_12= Only for FreeBSD 10.x do-install: .for i in qjail qjail.vnet.be qjail.vnet.ng Modified: head/sysutils/qjail4/pkg-descr ============================================================================== --- head/sysutils/qjail/pkg-descr Mon Aug 29 14:34:17 2016 (r421062) +++ head/sysutils/qjail4/pkg-descr Mon Aug 29 14:53:01 2016 (r421063) @@ -1,4 +1,4 @@ -This qjail version is not intended for RELEASES older than RELEASE-10.0. +This qjail version only supports the RELEASE-10.x series of releases. Qjail [ q = quick ] is a 4th generation wrapper for the basic chroot jail system that includes security and performance enhancements. Plus a new level