From owner-svn-ports-head@FreeBSD.ORG Wed Jan 2 10:05:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DC2443B; Wed, 2 Jan 2013 10:05:07 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 841C08FC0A; Wed, 2 Jan 2013 10:05:07 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r02A57nu063970; Wed, 2 Jan 2013 10:05:07 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r02A56lO063963; Wed, 2 Jan 2013 10:05:06 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201301021005.r02A56lO063963@svn.freebsd.org> From: Chris Rees Date: Wed, 2 Jan 2013 10:05:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309809 - head/sysutils/qjail X-SVN-Group: ports-head 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.14 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: Wed, 02 Jan 2013 10:05:07 -0000 Author: crees Date: Wed Jan 2 10:05:06 2013 New Revision: 309809 URL: http://svnweb.freebsd.org/changeset/ports/309809 Log: Update to 2.0; Standard maintenance. 1. Added -c option on "qjail create" command that enables ssh access to the jail and creates user account using jailname for id/pw. 2. Added -C option on "qjail create" command that depends on -D option that creates ssh access to jail and creates user account using jailname for id/pw while automatically duplicating jails. 3. Created a customized flavor, ssh-default that enables ssh access to jails. This flavor contains a login account with id/pw of qjail. 4. Removed -c option from "qjail install" because hosts customized /etc caused problems with jail start up. 5. Updated man qjail.8 to reflect the changes. PR: ports/174890 Submitted by: Joe Barbish (maintainer) Modified: head/sysutils/qjail/Makefile head/sysutils/qjail/distinfo head/sysutils/qjail/pkg-plist Modified: head/sysutils/qjail/Makefile ============================================================================== --- head/sysutils/qjail/Makefile Wed Jan 2 09:07:27 2013 (r309808) +++ head/sysutils/qjail/Makefile Wed Jan 2 10:05:06 2013 (r309809) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qjail -PORTVERSION= 1.9 +PORTVERSION= 2.0 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME} Modified: head/sysutils/qjail/distinfo ============================================================================== --- head/sysutils/qjail/distinfo Wed Jan 2 09:07:27 2013 (r309808) +++ head/sysutils/qjail/distinfo Wed Jan 2 10:05:06 2013 (r309809) @@ -1,2 +1,2 @@ -SHA256 (qjail-1.9.tar.bz2) = e1a9990a571b56b83eb71a266312a6373ab4a11094ec4d1c6503e4f48ff01aed -SIZE (qjail-1.9.tar.bz2) = 41275 +SHA256 (qjail-2.0.tar.bz2) = d6ef6a034f58be79e3e0eef7ac2f5c94b810a3e57e9abbe578bbd5153238ca2f +SIZE (qjail-2.0.tar.bz2) = 49135 Modified: head/sysutils/qjail/pkg-plist ============================================================================== --- head/sysutils/qjail/pkg-plist Wed Jan 2 09:07:27 2013 (r309808) +++ head/sysutils/qjail/pkg-plist Wed Jan 2 10:05:06 2013 (r309809) @@ -2,20 +2,51 @@ bin/qjail etc/qjail.conf.sample etc/rc.d/qjail-jail2 etc/rc.d/qjail2 -%%EXAMPLESDIR%%/default/qjail.flavor %%EXAMPLESDIR%%/default/etc/make.conf +%%EXAMPLESDIR%%/default/etc/motd %%EXAMPLESDIR%%/default/etc/periodic.conf %%EXAMPLESDIR%%/default/etc/rc.conf +%%EXAMPLESDIR%%/default/root/.cshrc %%EXAMPLESDIR%%/default/usr/local/etc/sudoers -%%EXAMPLESDIR%%/nullmailer-example/qjail.flavor -%%EXAMPLESDIR%%/nullmailer-example/etc/rc.conf +%%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 -@dirrm %%EXAMPLESDIR%%/default/usr/local/etc -@dirrm %%EXAMPLESDIR%%/default/usr/local -@dirrm %%EXAMPLESDIR%%/default/usr -@dirrm %%EXAMPLESDIR%%/default/etc -@dirrm %%EXAMPLESDIR%%/default +%%EXAMPLESDIR%%/ssh-default/etc/csh.cshrc +%%EXAMPLESDIR%%/ssh-default/etc/group +%%EXAMPLESDIR%%/ssh-default/etc/make.conf +%%EXAMPLESDIR%%/ssh-default/etc/master.passwd +%%EXAMPLESDIR%%/ssh-default/etc/motd +%%EXAMPLESDIR%%/ssh-default/etc/passwd +%%EXAMPLESDIR%%/ssh-default/etc/periodic.conf +%%EXAMPLESDIR%%/ssh-default/etc/pwd.db +%%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 +%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.login_conf +%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.mail_aliases +%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.mailrc +%%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.profile +%%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 +@dirrm %%EXAMPLESDIR%%/ssh-default/usr/share/skel +@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 +@dirrm %%EXAMPLESDIR%%/ssh-default/usr/local +@dirrm %%EXAMPLESDIR%%/ssh-default/usr +@dirrm %%EXAMPLESDIR%%/ssh-default/root +@dirrm %%EXAMPLESDIR%%/ssh-default/etc/ssh +@dirrm %%EXAMPLESDIR%%/ssh-default/etc +@dirrm %%EXAMPLESDIR%%/ssh-default @dirrm %%EXAMPLESDIR%%/nullmailer-example/usr/local/etc/nullmailer @dirrm %%EXAMPLESDIR%%/nullmailer-example/usr/local/etc @dirrm %%EXAMPLESDIR%%/nullmailer-example/usr/local @@ -23,4 +54,12 @@ etc/rc.d/qjail2 @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc/mail @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc @dirrm %%EXAMPLESDIR%%/nullmailer-example +@dirrm %%EXAMPLESDIR%%/default/usr/share/skel +@dirrm %%EXAMPLESDIR%%/default/usr/share +@dirrm %%EXAMPLESDIR%%/default/usr/local/etc +@dirrm %%EXAMPLESDIR%%/default/usr/local +@dirrm %%EXAMPLESDIR%%/default/usr +@dirrm %%EXAMPLESDIR%%/default/root +@dirrm %%EXAMPLESDIR%%/default/etc +@dirrm %%EXAMPLESDIR%%/default @dirrm %%EXAMPLESDIR%%