From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 07:39:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91571CC2; Thu, 10 Jul 2014 07:39:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 721CE2BF7; Thu, 10 Jul 2014 07:39:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6A7dR3h021260; Thu, 10 Jul 2014 07:39:27 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6A7dQpK021253; Thu, 10 Jul 2014 07:39:26 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201407100739.s6A7dQpK021253@svn.freebsd.org> From: Kubilay Kocak Date: Thu, 10 Jul 2014 07:39:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361426 - in head/sysutils/cbsd: . files 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.18 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: Thu, 10 Jul 2014 07:39:27 -0000 Author: koobs Date: Thu Jul 10 07:39:26 2014 New Revision: 361426 URL: http://svnweb.freebsd.org/changeset/ports/361426 QAT: https://qat.redports.org/buildarchive/r361426/ Log: sysutils/cbsd: Add libsqlite3.so to LIB_DEPENDS - Add sqlite3 to LIB_DEPENDS - Remove MASTER_SITES, not required when USE_GITHUB=yes - Remove GH_PROJECT, already defaults to ${PORTNAME} - Strip trailing-slash from pkg-descr WWW: URL While I'm here: - Tweak IGNORE message - Tweak pkg-message.in and pkg-deinstall PR: 191772 Submitted by: Oleg Ginzburg (maintainer) Modified: head/sysutils/cbsd/Makefile head/sysutils/cbsd/files/pkg-message.in head/sysutils/cbsd/pkg-deinstall head/sysutils/cbsd/pkg-descr Modified: head/sysutils/cbsd/Makefile ============================================================================== --- head/sysutils/cbsd/Makefile Thu Jul 10 05:30:16 2014 (r361425) +++ head/sysutils/cbsd/Makefile Thu Jul 10 07:39:26 2014 (r361426) @@ -2,10 +2,8 @@ PORTNAME= cbsd PORTVERSION= 10.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= http://www.bsdstore.ru/downloads/ \ - GH MAINTAINER= olevole@olevole.ru COMMENT= Yet another FreeBSD Jail Management Utility @@ -15,11 +13,11 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync \ sudo:${PORTSDIR}/security/sudo \ sqlite3:${PORTSDIR}/databases/sqlite3 -LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 +LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 USE_GITHUB= yes GH_ACCOUNT= olevole -GH_PROJECT= cbsd GH_COMMIT= 01f481c USE_RC_SUBR= cbsdd cbsdrsyncd @@ -35,7 +33,7 @@ USERS= ${PORTNAME} GROUPS= ${PORTNAME} .if ${OSVERSION} < 901000 -IGNORE= does not work on FreeBSD < 9.1 +IGNORE= does not support FreeBSD versions < 9.1 .endif .if ${OSVERSION} < 902001 Modified: head/sysutils/cbsd/files/pkg-message.in ============================================================================== --- head/sysutils/cbsd/files/pkg-message.in Thu Jul 10 05:30:16 2014 (r361425) +++ head/sysutils/cbsd/files/pkg-message.in Thu Jul 10 07:39:26 2014 (r361426) @@ -1,14 +1,15 @@ =============================================================================== -cbsd is now installed, but it requires some additional setup. -For the first time please run: +cbsd is now installed, but requires additional setup steps: - env workdir="/path" %%PREFIX%%/cbsd/sudoexec/initenv +Upon initial installation, run: -where /path is path for cbsd workdir, e.g.: /usr/jails + env workdir="/path" %%PREFIX%%/cbsd/sudoexec/initenv -For upgrade an existing installation: +Where /path is the path to the cbsd workdir, e.g.: /usr/jails - cbsd initenv +For upgrading an existing installation, run: + + cbsd initenv =============================================================================== Modified: head/sysutils/cbsd/pkg-deinstall ============================================================================== --- head/sysutils/cbsd/pkg-deinstall Thu Jul 10 05:30:16 2014 (r361425) +++ head/sysutils/cbsd/pkg-deinstall Thu Jul 10 07:39:26 2014 (r361426) @@ -3,29 +3,32 @@ case $2 in POST-DEINSTALL) echo echo "The cbsd package has been deleted." - echo "If you're *not* upgrading and won't be using it any longer, you may want to" - echo "check some files in the system which could modify by cbsd and remove this" - echo "changes for complete deinstall. Specifically:" - echo - echo "1) follow records in the /var/cron/tabs/root file:" - echo "* * * * * /usr/bin/lockf -s -t0 \$workdir/ftmp/periodic_minutes \\" - echo "/usr/sbin/periodic minutes > /dev/null 2>&1" - echo "0 * * * * /usr/bin/lockf -s -t0 \$workdir/ftmp/periodic_hourly \\" - echo "/usr/sbin/periodic hourly > /dev/null 2>&1" - echo - echo "2) follow record in the /etc/periodic.conf file:" - echo "local_periodic=\"/usr/local/etc/periodic \$workdir/etc/periodic\"" - echo - echo "3) follow records in the /etc/rc.conf file:" - echo "cbsdrsyncd_enable=\"YES\"" - echo "cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\"" - echo "cbsdd_enable=\"YES\"" - echo "devfs_load_rulesets=\"YES\"" - echo "cbsd_workdir=\"\$workdir\"" - echo "rcshutdown_timeout=\"900\"" - echo "sshd_flags=\"-oPort=22222\"" echo - echo "4) /usr/local/etc/sudoers.d/cbsd_sudoers file" + echo "If you are *not* upgrading this package, you may want to" + echo "remove the following to complete the deinstallation process:" + echo + echo "1) Records in /var/cron/tabs/root" + echo + echo " * * * * * /usr/bin/lockf -s -t0 \$workdir/ftmp/periodic_minutes \\" + echo " /usr/sbin/periodic minutes > /dev/null 2>&1" + echo " 0 * * * * /usr/bin/lockf -s -t0 \$workdir/ftmp/periodic_hourly \\" + echo " /usr/sbin/periodic hourly > /dev/null 2>&1" + echo + echo "2) Records in /etc/periodic.conf" + echo + echo " local_periodic=\"/usr/local/etc/periodic \$workdir/etc/periodic\"" + echo + echo "3) Records in /etc/rc.conf" + echo + echo " cbsdrsyncd_enable=\"YES\"" + echo " cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\"" + echo " cbsdd_enable=\"YES\"" + echo " devfs_load_rulesets=\"YES\"" + echo " cbsd_workdir=\"\$workdir\"" + echo " rcshutdown_timeout=\"900\"" + echo " sshd_flags=\"-oPort=22222\"" + echo + echo "4) Remove /usr/local/etc/sudoers.d/cbsd_sudoers" echo ;; esac Modified: head/sysutils/cbsd/pkg-descr ============================================================================== --- head/sysutils/cbsd/pkg-descr Thu Jul 10 05:30:16 2014 (r361425) +++ head/sysutils/cbsd/pkg-descr Thu Jul 10 07:39:26 2014 (r361426) @@ -1,3 +1,3 @@ Yet another FreeBSD jail management tool. -WWW: http://www.bsdstore.ru/ +WWW: http://www.bsdstore.ru