ports/175263: [Maintainer update] sysutils/qjail new stuff added

[Joe Barbish]

>Number:         175263
>Category:       ports
>Synopsis:       [Maintainer update] sysutils/qjail  new stuff added
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 13 14:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Joe Barbish
>Release:        9.1-RELEASE
>Organization:
none
>Environment:
>Description:
Changes are;

Added logic to interrogate the content of flavors for correctness 
before allowing them to be merged into the newjail being created. 
Only paths targeting directories holding configuration files are 
allowed now. The jail create process is terminated and the offending
paths are listed in error messages.

Changed the /root/.cshrc file in both flavors “default and ssh-default” 
to now contain setenv PACKAGESITE “ to point to packages-current”  
so login users of any jail will have the most current package 
version available.

In the qjail install logic added code to create these additional paths
in basejail, /usr/ports/packages, /usr/home and /home link.

Added new man page named qjail-howto.8 to the port.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN qjail-20/Makefile qjail/Makefile
--- qjail-20/Makefile	2013-01-10 13:07:15.000000000 -0500
+++ qjail/Makefile	2013-01-10 13:27:09.000000000 -0500
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/sysutils/qjail/Makefile,v 1.13 2013/01/02 10:42:03 svnexp Exp $
 
 PORTNAME=	qjail
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -14,7 +14,7 @@
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-MAN8=		qjail.8 qjail-intro.8 qjail.conf.8
+MAN8=		qjail.8 qjail-intro.8 qjail.conf.8 qjail-howto.8
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
@@ -26,7 +26,7 @@
 	@${INSTALL_SCRIPT} ${WRKSRC}/qjail2 ${PREFIX}/etc/rc.d
 	@${INSTALL_SCRIPT} ${WRKSRC}/qjail-jail2 ${PREFIX}/etc/rc.d
 	@${INSTALL_DATA}   ${WRKSRC}/qjail.conf.sample ${PREFIX}/etc
-.for i in qjail qjail-intro qjail.conf
+.for i in qjail qjail-intro qjail.conf qjail-howto
 	@${INSTALL_MAN}    ${WRKSRC}/${i}.8 ${MAN8PREFIX}/man/man8
 .endfor
 # note examples are mandatory. qjail will not function without them
diff -ruN qjail-20/distinfo qjail/distinfo
--- qjail-20/distinfo	2013-01-10 13:07:15.000000000 -0500
+++ qjail/distinfo	2013-01-13 09:29:25.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (qjail-2.0.tar.bz2) = d6ef6a034f58be79e3e0eef7ac2f5c94b810a3e57e9abbe578bbd5153238ca2f
-SIZE (qjail-2.0.tar.bz2) = 49135
+SHA256 (qjail-2.1.tar.bz2) = d1cf5b760e73afdab97870275d82a2aa07848fa8272f467f0a1a82961308864a
+SIZE (qjail-2.1.tar.bz2) = 53822
diff -ruN qjail-20/pkg-message qjail/pkg-message
--- qjail-20/pkg-message	2013-01-10 13:07:15.000000000 -0500
+++ qjail/pkg-message	2013-01-10 13:10:36.000000000 -0500
@@ -3,3 +3,4 @@
 First issue "rehash" command to enable the qjail command (if using csh).
 Then issue "man qjail-intro" to read the qjail introduction.
 After reading that do "man qjail" for the usage details.
+For the BIG PICTURE issue "man qjail-howto".
diff -ruN qjail-20/pkg-plist qjail/pkg-plist
--- qjail-20/pkg-plist	2013-01-10 13:07:15.000000000 -0500
+++ qjail/pkg-plist	2013-01-10 13:24:29.000000000 -0500
@@ -8,11 +8,9 @@
 %%EXAMPLESDIR%%/default/etc/rc.conf
 %%EXAMPLESDIR%%/default/root/.cshrc
 %%EXAMPLESDIR%%/default/usr/local/etc/sudoers
-%%EXAMPLESDIR%%/default/usr/share/skel/dot.cshrc
 %%EXAMPLESDIR%%/nullmailer-example/etc/mail/mailer.conf
 %%EXAMPLESDIR%%/nullmailer-example/etc/rc.conf
 %%EXAMPLESDIR%%/nullmailer-example/usr/local/etc/nullmailer/remotes
-%%EXAMPLESDIR%%/ssh-default/etc/csh.cshrc
 %%EXAMPLESDIR%%/ssh-default/etc/group
 %%EXAMPLESDIR%%/ssh-default/etc/make.conf
 %%EXAMPLESDIR%%/ssh-default/etc/master.passwd
@@ -23,8 +21,6 @@
 %%EXAMPLESDIR%%/ssh-default/etc/rc.conf
 %%EXAMPLESDIR%%/ssh-default/etc/spwd.db
 %%EXAMPLESDIR%%/ssh-default/etc/ssh/sshd_config
-%%EXAMPLESDIR%%/ssh-default/home
-%%EXAMPLESDIR%%/ssh-default/readme.txt
 %%EXAMPLESDIR%%/ssh-default/root/.cshrc
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.cshrc
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.login
@@ -35,9 +31,6 @@
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.rhosts
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.shrc
 %%EXAMPLESDIR%%/ssh-default/usr/local/etc/sudoers
-%%EXAMPLESDIR%%/ssh-default/usr/share/skel/dot.cshrc
- at dirrm %%EXAMPLESDIR%%/ssh-default/usr/share/skel
- at dirrm %%EXAMPLESDIR%%/ssh-default/usr/share
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/home/qjail
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/home
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/local/etc
@@ -54,8 +47,6 @@
 @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc/mail
 @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc
 @dirrm %%EXAMPLESDIR%%/nullmailer-example
- at dirrm %%EXAMPLESDIR%%/default/usr/share/skel
- at dirrm %%EXAMPLESDIR%%/default/usr/share
 @dirrm %%EXAMPLESDIR%%/default/usr/local/etc
 @dirrm %%EXAMPLESDIR%%/default/usr/local
 @dirrm %%EXAMPLESDIR%%/default/usr


>Release-Note:
>Audit-Trail:
>Unformatted: