From owner-svn-ports-head@freebsd.org Thu Oct 29 19:03:54 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8174145B39B; Thu, 29 Oct 2020 19:03:54 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CMZbs5Rfcz4DR6; Thu, 29 Oct 2020 19:03:53 +0000 (UTC) (envelope-from lwhsu@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 2ED39A719; Thu, 29 Oct 2020 19:03:53 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09TJ3rcE059332; Thu, 29 Oct 2020 19:03:53 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09TJ3qNj059329; Thu, 29 Oct 2020 19:03:52 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202010291903.09TJ3qNj059329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 29 Oct 2020 19:03:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553634 - head/sysutils/qjail X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/sysutils/qjail X-SVN-Commit-Revision: 553634 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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, 29 Oct 2020 19:03:54 -0000 Author: lwhsu Date: Thu Oct 29 19:03:52 2020 New Revision: 553634 URL: https://svnweb.freebsd.org/changeset/ports/553634 Log: sysutils/qjail: Updaet to 5.5 1. Change default ftp site to ftp from ftp12. 2. Remove config -w and -W [Set vnet.interface NIC] 3. Add -f flag to unmount command when releasing memory disc. 4. Change so this version of qjail only runs on 12.0 and newer because pf is vimage aware now. 5. If local install [-f] jump around stable, current check logic. 6. Change/add logic & code to implement bridge/epair method for vnet jails. 7. Change qjail.8 about vimage no longer having to be compiled into kernel 12.0 8. Change "config -v logic to setup vnet jail with pf, ipf, ipf firewall. 9. Add start vnet code to qjail script to check for host/vnet jail firewall mis-match. 10. Add start vnet code to boottime script to check for host/vnet jail firewall mis-match. 11. Update all the manuals to reflect the about changes. 12. Add check to "config" so no ipv4 change for vnet jails. 12. Block config ip address changes for vnet jail because of class c ip allocations. 14. Change verify_ip subroutine to include check for private ip address and 127.x.x.x addresses and put on lo0 interface to make that jail local only. 14. Change verify_ip subroutine to include check for vnet class c address range. 15. Create non-vnet jail using 127.x.x.x ip4 address to make that jail local access only. When config -v to change jail to vnet jail it becomes local access only also. 16. Change "config" -4 & -6 to remove the ip address when the word "none" is used as in -4 none. 17. Change install to check for amd64 & i386 platform architecture and use path with amd62/amd64 and a single architecture path for all other platforms. 18. On "qjail install -f /usr/base.txz" option fixed so it works. 19. Diff options changed between 12.1 and 12.2, Removed the -u. PR: 250696 Submitted by: Joe Barbish (maintainer) MFH: 2020Q4 Modified: head/sysutils/qjail/Makefile head/sysutils/qjail/distinfo head/sysutils/qjail/pkg-message head/sysutils/qjail/pkg-plist Modified: head/sysutils/qjail/Makefile ============================================================================== --- head/sysutils/qjail/Makefile Thu Oct 29 19:00:18 2020 (r553633) +++ head/sysutils/qjail/Makefile Thu Oct 29 19:03:52 2020 (r553634) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qjail -PORTVERSION= 5.4 +PORTVERSION= 5.5 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME} @@ -31,7 +31,7 @@ do-install: ${STAGEDIR}${PREFIX}/etc/rc.d ${INSTALL_DATA} ${WRKSRC}/qjail.portsnap.conf \ ${STAGEDIR}${PREFIX}/etc/qjail.portsnap.conf.sample -.for i in qjail qjail-intro qjail-howto qjail-vnet-howto \ +.for i in qjail qjail-intro qjail-drive-traffic qjail-vnet-howto \ qjail-ipv6-testing ${INSTALL_MAN} ${WRKSRC}/${i}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .endfor Modified: head/sysutils/qjail/distinfo ============================================================================== --- head/sysutils/qjail/distinfo Thu Oct 29 19:00:18 2020 (r553633) +++ head/sysutils/qjail/distinfo Thu Oct 29 19:03:52 2020 (r553634) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503771345 -SHA256 (qjail-5.4.tar.bz2) = 91da2c2685ee298b2f39a4643ee6c545ca5317404c61153f5089b05e9f08dcb3 -SIZE (qjail-5.4.tar.bz2) = 65689 +TIMESTAMP = 1603736786 +SHA256 (qjail-5.5.tar.bz2) = 1151baa3faa4bd09dc489135227884f34335232cf3fdbd7a2bf09ec2da5bcf20 +SIZE (qjail-5.5.tar.bz2) = 68064 Modified: head/sysutils/qjail/pkg-message ============================================================================== --- head/sysutils/qjail/pkg-message Thu Oct 29 19:00:18 2020 (r553633) +++ head/sysutils/qjail/pkg-message Thu Oct 29 19:03:52 2020 (r553634) @@ -7,7 +7,7 @@ First issue "rehash" command to enable the qjail comma Then issue "man qjail-intro" To read the qjail introduction. "man qjail" For qjail usage details. -"man qjail-howto" For example of driving public traffic to non-vnet jails. +"man qjail-drive-traffic For example of driving public traffic to jails. "man qjail-vnet-howto" For example of creating vnet jails. "man qjail-ipv6-testing" For example of testing jails with ipv6 addresses. EOM Modified: head/sysutils/qjail/pkg-plist ============================================================================== --- head/sysutils/qjail/pkg-plist Thu Oct 29 19:00:18 2020 (r553633) +++ head/sysutils/qjail/pkg-plist Thu Oct 29 19:03:52 2020 (r553634) @@ -3,20 +3,38 @@ bin/qjail etc/rc.d/qjail.bootime man/man8/qjail.8.gz man/man8/qjail-intro.8.gz -man/man8/qjail-howto.8.gz +man/man8/qjail-drive-traffic.8.gz man/man8/qjail-vnet-howto.8.gz man/man8/qjail-ipv6-testing.8.gz -%%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%%/vnet/devfsrules_vjail_ipfw50 %%EXAMPLESDIR%%/vnet/devfsrules_qjail_bpf50 %%EXAMPLESDIR%%/vnet/dot.cshrc +%%EXAMPLESDIR%%/vnet/ipf.editrules +%%EXAMPLESDIR%%/vnet/ipf.loadrules +%%EXAMPLESDIR%%/vnet/ipf.listrules +%%EXAMPLESDIR%%/vnet/ipf.editnatrules +%%EXAMPLESDIR%%/vnet/ipf.loadnatrules +%%EXAMPLESDIR%%/vnet/ipf.log +%%EXAMPLESDIR%%/vnet/ipf.nat.rules.default +%%EXAMPLESDIR%%/vnet/ipf.rc.conf +%%EXAMPLESDIR%%/vnet/ipf.refreshlog +%%EXAMPLESDIR%%/vnet/ipf.rules.default +%%EXAMPLESDIR%%/vnet/ipfw.editrules +%%EXAMPLESDIR%%/vnet/ipfw.listrules +%%EXAMPLESDIR%%/vnet/ipfw.loadrules +%%EXAMPLESDIR%%/vnet/ipfw.log +%%EXAMPLESDIR%%/vnet/ipfw.rc.conf +%%EXAMPLESDIR%%/vnet/ipfw.rules.default +%%EXAMPLESDIR%%/vnet/pf.editrules +%%EXAMPLESDIR%%/vnet/pf.loadrules +%%EXAMPLESDIR%%/vnet/pf.listrules +%%EXAMPLESDIR%%/vnet/pf.log +%%EXAMPLESDIR%%/vnet/pf.rc.conf +%%EXAMPLESDIR%%/vnet/pf.refreshlog +%%EXAMPLESDIR%%/vnet/pf.rules.default +%%EXAMPLESDIR%%/vnet/rc.conf %%EXAMPLESDIR%%/default/etc/make.conf %%EXAMPLESDIR%%/default/etc/motd %%EXAMPLESDIR%%/default/etc/periodic.conf