Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Feb 2014 13:21:44 GMT
From:      Oleg Ginzburg <olevole@olevole.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/186864: sysutils/cbsd update to 10.0.3
Message-ID:  <201402181321.s1IDLiu4081236@cgiserv.freebsd.org>
Resent-Message-ID: <201402181330.s1IDU0gh052655@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186864
>Category:       ports
>Synopsis:       sysutils/cbsd update to 10.0.3
>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:   Tue Feb 18 13:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Ginzburg
>Release:        
>Organization:
>Environment:
>Description:
update to 10.0.3
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN cbsd.bak/Makefile cbsd/Makefile
--- cbsd.bak/Makefile	2014-02-04 04:59:53.000000000 +0400
+++ cbsd/Makefile	2014-02-18 17:18:40.000000000 +0400
@@ -1,7 +1,7 @@
 # $FreeBSD: head/sysutils/cbsd/Makefile 342481 2014-02-04 00:52:58Z amdmi3 $
 
 PORTNAME=	cbsd
-PORTVERSION=	10.0.2
+PORTVERSION=	10.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.bsdstore.ru/downloads/ \
 		GH
@@ -19,7 +19,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	olevole
 GH_PROJECT=	cbsd
-GH_COMMIT=	6e05bd1
+GH_COMMIT=	2bb261e
 
 USE_RC_SUBR=	cbsdd cbsdrsyncd
 
diff -ruN cbsd.bak/distinfo cbsd/distinfo
--- cbsd.bak/distinfo	2014-02-04 04:59:53.000000000 +0400
+++ cbsd/distinfo	2014-02-18 17:13:48.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (cbsd-10.0.2.tar.gz) = 3cce46368bcd0e9e5c4f8aec8219059fcc71b0709155d5dfb029d7b9a1ed4547
-SIZE (cbsd-10.0.2.tar.gz) = 325560
+SHA256 (cbsd-10.0.3.tar.gz) = 42c51fcfb2144d6bcebb808024908f2aef9fa5d338bdccbe6e27e83fdd89cb1a
+SIZE (cbsd-10.0.3.tar.gz) = 328334
diff -ruN cbsd.bak/files/cbsdd.in cbsd/files/cbsdd.in
--- cbsd.bak/files/cbsdd.in	2014-02-04 04:59:53.000000000 +0400
+++ cbsd/files/cbsdd.in	2014-02-18 17:13:15.000000000 +0400
@@ -23,16 +23,31 @@
     exit 1
 fi
 
-. ${globalconf}
-. ${inventory}
-. ${mdtools}
-. ${subr}
+if [ ! -f ${inventory} ]; then
+    echo "cbsd: no such ${inventory}";
+    exit 1
+fi
+
+if [ ! -f ${mdtools} ]; then
+    echo "cbsd: no such ${mdtools}";
+    exit 1
+fi
+
+if [ ! -f ${subr} ]; then
+    echo "cbsd: no such ${subr}";
+    exit 1
+fi
 
 if [ ! -f ${localcbsdconf} ]; then
     echo "cbsd: no such ${localcbsdconf}";
     exit 1
 fi
 
+. ${globalconf}
+. ${inventory}
+. ${mdtools}
+. ${subr}
+
 . ${localcbsdconf}
 
 start_precmd=${name}_prestart
diff -ruN cbsd.bak/files/cbsdrsyncd.in cbsd/files/cbsdrsyncd.in
--- cbsd.bak/files/cbsdrsyncd.in	2014-02-04 04:59:53.000000000 +0400
+++ cbsd/files/cbsdrsyncd.in	2014-02-18 17:13:19.000000000 +0400
@@ -10,7 +10,6 @@
 #
 
 . /etc/rc.subr
-. /etc/rc.conf
 
 name="cbsdrsyncd"
 rcvar=cbsdrsyncd_enable


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181321.s1IDLiu4081236>