FreeBSD Bugzilla – Attachment 147704 Details for
Bug 193962
sysutils/cbsd update to 10.1.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
update to cbsd 10.1.0
cbsd.txt (text/plain), 3.65 KB, created by
Oleg Ginzburg
on 2014-09-26 22:13:07 UTC
(
hide
)
Description:
update to cbsd 10.1.0
Filename:
MIME Type:
Creator:
Oleg Ginzburg
Created:
2014-09-26 22:13:07 UTC
Size:
3.65 KB
patch
obsolete
>diff -ruN cbsd.bak/Makefile cbsd/Makefile >--- cbsd.bak/Makefile 2014-09-07 00:59:47.000000000 +0400 >+++ cbsd/Makefile 2014-09-27 02:00:23.000000000 +0400 >@@ -1,7 +1,7 @@ > # $FreeBSD: head/sysutils/cbsd/Makefile 365082 2014-08-16 14:39:58Z vg $ > > PORTNAME= cbsd >-PORTVERSION= 10.0.7 >+PORTVERSION= 10.1.0 > CATEGORIES= sysutils > > MAINTAINER= olevole@olevole.ru >@@ -17,7 +17,7 @@ > > USE_GITHUB= yes > GH_ACCOUNT= olevole >-GH_COMMIT= 74d433e >+GH_COMMIT= d2077f5 > > USE_RC_SUBR= cbsdd cbsdrsyncd > >@@ -48,5 +48,7 @@ > ${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 ${STAGEDIR}${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd > > .include <bsd.port.post.mk> >diff -ruN cbsd.bak/distinfo cbsd/distinfo >--- cbsd.bak/distinfo 2014-09-07 00:59:47.000000000 +0400 >+++ cbsd/distinfo 2014-09-27 01:53:20.000000000 +0400 >@@ -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) = db2e270b53c14f9c35459cd64e9b5d08bd7b299a275be501551a00b48caf4203 >+SIZE (cbsd-10.1.0.tar.gz) = 395600 >diff -ruN cbsd.bak/files/cbsdd.in cbsd/files/cbsdd.in >--- cbsd.bak/files/cbsdd.in 2014-09-07 00:59:47.000000000 +0400 >+++ cbsd/files/cbsdd.in 2014-09-27 01:51:39.000000000 +0400 >@@ -54,6 +54,8 @@ > 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 @@ > > 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 @@ > [ -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" >diff -ruN cbsd.bak/pkg-deinstall cbsd/pkg-deinstall >--- cbsd.bak/pkg-deinstall 2014-09-07 00:59:47.000000000 +0400 >+++ cbsd/pkg-deinstall 2014-09-27 01:50:18.000000000 +0400 >@@ -7,18 +7,7 @@ > 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 @@ > 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 >diff -ruN cbsd.bak/pkg-plist-chunk cbsd/pkg-plist-chunk >--- cbsd.bak/pkg-plist-chunk 2014-09-07 00:59:47.000000000 +0400 >+++ cbsd/pkg-plist-chunk 2014-09-27 02:03:22.000000000 +0400 >@@ -6,3 +6,5 @@ > @group > @mode > man/man8/cbsd.8.gz >+libexec/bsdconfig/cbsd >+@dirrmtry libexec/bsdconfig
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 193962
:
147704
|
147725