Date: Sat, 27 Sep 2014 14:02:37 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369392 - in head/sysutils/cbsd: . files Message-ID: <201409271402.s8RE2b7D076568@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Sep 27 14:02:36 2014 New Revision: 369392 URL: http://svnweb.freebsd.org/changeset/ports/369392 QAT: https://qat.redports.org/buildarchive/r369392/ Log: update to 10.1.0: - Bsdconfig integration - Bhyve: support for reboot virtual machine - Removed old patches and periodic-tasks - Ipnat support (bugfix) getnics-by-ip: looking only IP prefix inet in the output ifconfig (bugfix) bhyve: do not test the hard drive is empty, if you are booting from CD (bugfix) Fix order of epair number and a/b side PR: 193962 Submitted by: olevole@olevole.ru (maintainer) Modified: head/sysutils/cbsd/Makefile head/sysutils/cbsd/distinfo head/sysutils/cbsd/files/cbsdd.in head/sysutils/cbsd/pkg-deinstall head/sysutils/cbsd/pkg-plist-chunk Modified: head/sysutils/cbsd/Makefile ============================================================================== --- head/sysutils/cbsd/Makefile Sat Sep 27 14:00:51 2014 (r369391) +++ head/sysutils/cbsd/Makefile Sat Sep 27 14:02:36 2014 (r369392) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 10.0.7 +PORTVERSION= 10.1.0 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -17,7 +17,7 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/secu USE_GITHUB= yes GH_ACCOUNT= olevole -GH_COMMIT= 74d433e +GH_COMMIT= 3e08717 USE_RC_SUBR= cbsdd cbsdrsyncd @@ -46,7 +46,7 @@ post-install: ${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ; @${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${CBSD_HOME} -type d | ${SORT} -r | \ - ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig + @${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd .include <bsd.port.post.mk> Modified: head/sysutils/cbsd/distinfo ============================================================================== --- head/sysutils/cbsd/distinfo Sat Sep 27 14:00:51 2014 (r369391) +++ head/sysutils/cbsd/distinfo Sat Sep 27 14:02:36 2014 (r369392) @@ -1,2 +1,2 @@ -SHA256 (cbsd-10.0.7.tar.gz) = b910bf77128764e8fcb5a09c009ff4efc9554faf96c9d5ee5ff1621147709c6d -SIZE (cbsd-10.0.7.tar.gz) = 399325 +SHA256 (cbsd-10.1.0.tar.gz) = 253ba4a4390b89a1ee7320f1308a3af107d4e5c9bfbd693fcfac87fa6ea47eed +SIZE (cbsd-10.1.0.tar.gz) = 395840 Modified: head/sysutils/cbsd/files/cbsdd.in ============================================================================== --- head/sysutils/cbsd/files/cbsdd.in Sat Sep 27 14:00:51 2014 (r369391) +++ head/sysutils/cbsd/files/cbsdd.in Sat Sep 27 14:02:36 2014 (r369392) @@ -54,6 +54,8 @@ fi start_precmd=${name}_prestart stop_precmd=${name}_prestop stop_cmd=${name}_stop +reload_cmd=${name}_reload +extra_commands="reload" command="${toolsdir}/cbsdd" pidfile="/var/run/$name.pid" @@ -61,7 +63,6 @@ command_args="&" cbsdd_prestart() { %%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1 - /usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \; %%PREFIX%%/bin/cbsd sysinv mode=update %%PREFIX%%/bin/cbsd netinv @@ -82,4 +83,11 @@ cbsdd_stop() [ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} ) } +cbsdd_reload() +{ + [ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} ) > /dev/null 2>&1 + run_rc_command "start" + exit 0 +} + run_rc_command "$1" Modified: head/sysutils/cbsd/pkg-deinstall ============================================================================== --- head/sysutils/cbsd/pkg-deinstall Sat Sep 27 14:00:51 2014 (r369391) +++ head/sysutils/cbsd/pkg-deinstall Sat Sep 27 14:02:36 2014 (r369392) @@ -7,18 +7,7 @@ POST-DEINSTALL) 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 "1) Records in /etc/rc.conf" echo echo " cbsdrsyncd_enable=\"YES\"" echo " cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\"" @@ -28,7 +17,7 @@ POST-DEINSTALL) echo " rcshutdown_timeout=\"900\"" echo " sshd_flags=\"-oPort=22222\"" echo - echo "4) Remove /usr/local/etc/sudoers.d/cbsd_sudoers" + echo "2) Remove /usr/local/etc/sudoers.d/cbsd_sudoers" echo ;; esac Modified: head/sysutils/cbsd/pkg-plist-chunk ============================================================================== --- head/sysutils/cbsd/pkg-plist-chunk Sat Sep 27 14:00:51 2014 (r369391) +++ head/sysutils/cbsd/pkg-plist-chunk Sat Sep 27 14:02:36 2014 (r369392) @@ -6,3 +6,4 @@ bin/cbsd @group @mode man/man8/cbsd.8.gz +libexec/bsdconfig/cbsd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409271402.s8RE2b7D076568>