Attachment 174132 Details for Bug 212202 – port_diff

[patch] port_diff

qjail-5.0_port_diff (text/plain), 5.84 KB, created by Joe Barbish on 2016-08-27 16:58:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Barbish

Created: 2016-08-27 16:58:29 UTC

Size: 5.84 KB

patch

obsolete

>diff -ruN qjail-4.9/Makefile qjail/Makefile
>--- qjail-4.9/Makefile	2016-08-27 11:38:48.885413000 -0400
>+++ qjail/Makefile	2016-08-27 07:13:24.000000000 -0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/sysutils/qjail/Makefile 418800 2016-07-19 14:42:44Z amdmi3 $
> 
> PORTNAME=	qjail
>-PORTVERSION=	4.9
>+PORTVERSION=	5.0
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}
> 
>@@ -24,16 +24,18 @@
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>-CONFLICTS_INSTALL=	qjail-2.* qjail-3.*
>-
> 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              \
> 		${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
> 	${INSTALL_MAN}   ${WRKSRC}/${i}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> .endfor
>@@ -43,4 +45,10 @@
> 	(cd ${WRKSRC}/examples/ \
> 	    && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSREL} < 11.0
>+IGNORE= well not install because this version is unsupported on ${OSREL} systems
>+.endif
>+
> .include <bsd.port.mk>
>diff -ruN qjail-4.9/distinfo qjail/distinfo
>--- qjail-4.9/distinfo	2016-08-27 11:38:48.886688000 -0400
>+++ qjail/distinfo	2016-08-27 05:51:38.000000000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (qjail-4.9.tar.bz2) = 163d8893d431ab0699156db4a15c1c8927a71c4918014adb6006a8b6657cb49b
>-SIZE (qjail-4.9.tar.bz2) = 66048
>+SHA256 (qjail-5.0.tar.bz2) = 41bc83d214035c7939d50fce091a0f888a7d109aaf93cb52c9c70d0f4357a668
>+SIZE (qjail-5.0.tar.bz2) = 63015
>diff -ruN qjail-4.9/pkg-descr qjail/pkg-descr
>--- qjail-4.9/pkg-descr	2016-08-27 11:38:48.887589000 -0400
>+++ qjail/pkg-descr	2016-08-27 03:53:32.000000000 -0400
>@@ -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
>diff -ruN qjail-4.9/pkg-message qjail/pkg-message
>--- qjail-4.9/pkg-message	2016-08-27 11:38:48.888501000 -0400
>+++ qjail/pkg-message	2016-08-27 03:55:20.000000000 -0400
>@@ -10,33 +10,4 @@
> 
> ########################################################################
> 
>-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.     
>- 
>-########################################################################
>diff -ruN qjail-4.9/pkg-plist qjail/pkg-plist
>--- qjail-4.9/pkg-plist	2016-08-27 11:38:48.889398000 -0400
>+++ qjail/pkg-plist	2016-08-27 05:53:52.000000000 -0400
>@@ -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 @@
> %%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

Flags:

qjail1: maintainer-approval+

Actions: View | Diff

Attachments on bug 212202: 174132