Attachment 144627 Details for Bug 191844 – fixes for missing items in pkg-plist

[patch] fixes for missing items in pkg-plist

cbsd.txt (text/plain), 3.77 KB, created by Oleg Ginzburg on 2014-07-13 09:13:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Ginzburg

Created: 2014-07-13 09:13:38 UTC

Size: 3.77 KB

patch

obsolete

>diff -ruN cbsd.bak/Makefile cbsd/Makefile
>--- cbsd.bak/Makefile	2014-07-12 20:11:06.000000000 +0400
>+++ cbsd/Makefile	2014-07-12 20:14:06.000000000 +0400
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/sysutils/cbsd/Makefile 361426 2014-07-10 07:39:26Z koobs $
> 
> PORTNAME=	cbsd
>-PORTVERSION=	10.0.5
>-PORTREVISION=	2
>+PORTVERSION=	10.0.6
> CATEGORIES=	sysutils
> 
> MAINTAINER=	olevole@olevole.ru
>@@ -18,7 +17,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	olevole
>-GH_COMMIT=	01f481c
>+GH_COMMIT=	cac57bb
> 
> USE_RC_SUBR=	cbsdd cbsdrsyncd
> 
>@@ -40,7 +39,15 @@
> RUN_DEPENDS+=	sysrc:${PORTSDIR}/sysutils/sysrc
> .endif
> 
>+do-install:
>+	@${ECHO} "Installing in ${CBSD_HOME}"
>+	${MKDIR} ${STAGEDIR}${CBSD_HOME}
>+	${CP} -R ${WRKSRC}/* ${STAGEDIR}${CBSD_HOME}
>+	@${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
>+
> 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 | \
>diff -ruN cbsd.bak/distinfo cbsd/distinfo
>--- cbsd.bak/distinfo	2014-07-12 20:11:06.000000000 +0400
>+++ cbsd/distinfo	2014-07-12 19:55:24.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (cbsd-10.0.5.tar.gz) = d34b61ed9056ce8df6db6f283c6a78185f41ce25bde8d3f7321a12de9a041676
>-SIZE (cbsd-10.0.5.tar.gz) = 358951
>+SHA256 (cbsd-10.0.6.tar.gz) = 378a0f04abb562eb21b985034f4b74d0ff2e57161800b3c9e748e0ff4633736a
>+SIZE (cbsd-10.0.6.tar.gz) = 383249
>diff -ruN cbsd.bak/files/cbsdd.in cbsd/files/cbsdd.in
>--- cbsd.bak/files/cbsdd.in	2014-07-12 20:11:07.000000000 +0400
>+++ cbsd/files/cbsdd.in	2014-07-12 19:28:04.000000000 +0400
>@@ -20,28 +20,28 @@
> globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
> 
> if [ ! -f ${globalconf} ]; then
>-    echo "cbsd: no such ${globalconf}";
>-    exit 1
>+	echo "cbsd: no such ${globalconf}";
>+	exit 1
> fi
> 
> if [ ! -f ${inventory} ]; then
>-    echo "cbsd: no such ${inventory}";
>-    exit 1
>+	echo "cbsd: no such ${inventory}";
>+	exit 1
> fi
> 
> if [ ! -f ${mdtools} ]; then
>-    echo "cbsd: no such ${mdtools}";
>-    exit 1
>+	echo "cbsd: no such ${mdtools}";
>+	exit 1
> fi
> 
> if [ ! -f ${subr} ]; then
>-    echo "cbsd: no such ${subr}";
>-    exit 1
>+	echo "cbsd: no such ${subr}";
>+	exit 1
> fi
> 
> if [ ! -f ${localcbsdconf} ]; then
>-    echo "cbsd: no such ${localcbsdconf}";
>-    exit 1
>+	echo "cbsd: no such ${localcbsdconf}";
>+	exit 1
> fi
> 
> . ${globalconf}
>@@ -53,25 +53,32 @@
> 
> start_precmd=${name}_prestart
> stop_precmd=${name}_prestop
>+stop_cmd=${name}_stop
> 
>-command="${sbindir}/cbsdd"
>+command="${toolsdir}/cbsdd"
> pidfile="/var/run/$name.pid"
>+command_args="&"
> 
> cbsdd_prestart() {
>-    find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
>-    %%PREFIX%%/bin/cbsd sysinv mode=update
>-    %%PREFIX%%/bin/cbsd netinv
>+	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
>+	%%PREFIX%%/bin/cbsd sysinv mode=update
>+	%%PREFIX%%/bin/cbsd netinv
> 
>-    . ${inventory}
>+	. ${inventory}
> 
>-    [ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
>-    /usr/sbin/daemon ${rcddir}/jails-astart start
>+	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
>+	/usr/sbin/daemon ${rcddir}/jails-astart start
> }
> 
> cbsdd_prestop()
> {
>-    ${rcddir}/jails-astart stop
>-    [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
>+	${rcddir}/jails-astart stop
>+	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
>+}
>+
>+cbsdd_stop()
>+{
>+	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} )
> }
> 
> run_rc_command "$1"
>diff -ruN cbsd.bak/pkg-plist-chunk cbsd/pkg-plist-chunk
>--- cbsd.bak/pkg-plist-chunk	1970-01-01 03:00:00.000000000 +0300
>+++ cbsd/pkg-plist-chunk	2014-07-12 22:39:36.000000000 +0400
>@@ -0,0 +1,8 @@
>+@mode 500
>+@group cbsd
>+@owner cbsd
>+bin/cbsd
>+@owner
>+@group
>+@mode
>+man/man8/cbsd.8.gz

Actions: View | Diff

Attachments on bug 191844: 144617 | 144619 | 144627