Attachment #66770 for bug #98582

View | Details | Raw Unified | Return to bug 98582
Collapse All | Expand All





PORTNAME=	cvsd
PORTVERSION=	1.0.12
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://ch.tudelft.nl/~arthur/cvsd/

MAINTAINER=	bu7cher@yandex.ru
COMMENT=	CVS pserver daemon

USE_GPG?=	yes

MAN5=		cvsd.conf.5
MAN8=		cvsd.8 cvsd-buginfo.8 cvsd-buildroot.8 cvsd-passwd.8
PORTDOCS=	README
PLIST_FILES=	etc/cvsd/cvsd.conf.sample sbin/cvsd sbin/cvsd-buginfo \
		sbin/cvsd-buildroot sbin/cvsd-passwd
PLIST_DIRS=	etc/cvsd
USE_RC_SUBR=	cvsd.sh

.include <bsd.port.pre.mk>

.if ${OSVERSION} > 500000
EXTRA_PATCHES+=	${FILESDIR}/extra-cvsd-buildroot.in
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${PREFIX}/sbin/cvsd
.for FILE in cvsd-buginfo cvsd-buildroot cvsd-passwd
	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/sbin
.endfor
	${INSTALL_DATA} ${WRKSRC}/cvsd.init ${PREFIX}/etc/rc.d/cvsd.sh.sample
	@${MKDIR} ${PREFIX}/etc/cvsd
	${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${PREFIX}/etc/cvsd/cvsd.conf.sample
.for FILE in ${MAN5}

.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>




#!/bin/sh
# $FreeBSD:
#
# PROVIDE: cvsd
# REQUIRE: NETWORKING
# KEYWORD: nojail

. %%RC_SUBR%%

name="cvsd"
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/$name"

load_rc_config $name

: ${cvsd_enable="NO"}
: ${cvsd_config="%%PREFIX%%/etc/$name/$name.conf"}

command_args="-f $cvsd_config"

start_precmd="cvsd_prestart"
stop_postcmd="cvsd_poststop"

cvsd_prestart()
{
	if [ $osreldate -gt 500000 ]; then
		mount -t devfs devfs $jail/dev
		devfs -m $jail/dev rule apply hide
		devfs -m $jail/dev rule apply path null unhide
		devfs -m $jail/dev rule apply path zero unhide
	fi
}

cvsd_poststop()
{
	if [ $osreldate -gt 500000 ]; then
		umount -t devfs $jail/dev
	fi
}

jail=`sed -n 's/^ *RootJail *\([^ ]*\) *$/\1/p' < $cvsd_config`
pidfile=`sed -n 's/^ *PidFile *\([^ ]*\) *$/\1/p' < $cvsd_config`
osreldate=`sysctl -n kern.osreldate`
if [ "$jail" = "X$jail" ]; then
	err 1 "RootJail is not specified in $cvsd_config"
fi
if [ "$pidfile" = "X$pidfile" ]; then
	err 1 "PidFile is not specified in $cvsd_config"
fi

run_rc_command "$1"





--- cvsd-buildroot.in.orig	Thu Jun  1 23:57:20 2006
+++ cvsd-buildroot.in	Tue Jun  6 11:38:57 2006
@@ -212,39 +212,6 @@
   fi
 done
 
-# populate /dev (need root privileges for this)
-echo $ECHO_N "creating $ROOT/dev devices... $ECHO_C"
-DEVICES="null zero"
-MISSINGDEVS=""
-for d in $DEVICES
-do
-  if [ -r "$ROOT/dev/$d" ]
-  then
-    :
-  else
-    MISSINGDEVS="$MISSINGDEVS $d"
-  fi
-done
-if [ -n "`echo $MISSINGDEVS`" ]
-then
-  if (cd /dev ; tar chpf - $MISSINGDEVS) | \
-     ( cd "$ROOT/dev" ; tar xpf - > /dev/null 2>&1 )
-  then
-    # check if we can use the devices
-    if ( echo TEST > "$ROOT/dev/null" && \
-         echo TEST > "$ROOT/dev/zero" )  2> /dev/null
-    then
-      echo "done."
-    else
-      echo "FAILED (unable to use devices)"
-    fi
-  else
-    echo "FAILED."
-  fi
-else
-  echo "already there."
-fi
-
 # update /etc/passwd
 echo $ECHO_N "adding users to $ROOT/etc/passwd...$ECHO_C"
 for i in $USERS

Return to bug 98582

Lines 8-17 Link Here

(-)cvsd/Makefile (-5 / +12 lines)
8		8
9	PORTNAME= cvsd	9	PORTNAME= cvsd
10	PORTVERSION= 1.0.12	10	PORTVERSION= 1.0.12
		11	PORTREVISION= 1
11	CATEGORIES= devel	12	CATEGORIES= devel
12	MASTER_SITES= http://ch.tudelft.nl/~arthur/cvsd/	13	MASTER_SITES= http://ch.tudelft.nl/~arthur/cvsd/
13		14
14	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= bu7cher@yandex.ru
15	COMMENT= CVS pserver daemon	16	COMMENT= CVS pserver daemon
16		17
17	USE_GPG?= yes	18	USE_GPG?= yes
Lines 27-42 Link Here
27	MAN5= cvsd.conf.5	28	MAN5= cvsd.conf.5
28	MAN8= cvsd.8 cvsd-buginfo.8 cvsd-buildroot.8 cvsd-passwd.8	29	MAN8= cvsd.8 cvsd-buginfo.8 cvsd-buildroot.8 cvsd-passwd.8
29	PORTDOCS= README	30	PORTDOCS= README
30	PLIST_FILES= etc/cvsd/cvsd.conf.sample etc/rc.d/cvsd.sh.sample \	31	PLIST_FILES= etc/cvsd/cvsd.conf.sample sbin/cvsd sbin/cvsd-buginfo \
31	sbin/cvsd sbin/cvsd-buginfo sbin/cvsd-buildroot sbin/cvsd-passwd	32	sbin/cvsd-buildroot sbin/cvsd-passwd
32	PLIST_DIRS= etc/cvsd	33	PLIST_DIRS= etc/cvsd
		34	USE_RC_SUBR= cvsd.sh
		35
		36	.include <bsd.port.pre.mk>
		37
		38	.if ${OSVERSION} > 500000
		39	EXTRA_PATCHES+= ${FILESDIR}/extra-cvsd-buildroot.in
		40	.endif
33		41
34	do-install:	42	do-install:
35	${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${PREFIX}/sbin/cvsd	43	${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${PREFIX}/sbin/cvsd
36	.for FILE in cvsd-buginfo cvsd-buildroot cvsd-passwd	44	.for FILE in cvsd-buginfo cvsd-buildroot cvsd-passwd
37	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/sbin	45	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/sbin
38	.endfor	46	.endfor
39	${INSTALL_DATA} ${WRKSRC}/cvsd.init ${PREFIX}/etc/rc.d/cvsd.sh.sample
40	@${MKDIR} ${PREFIX}/etc/cvsd	47	@${MKDIR} ${PREFIX}/etc/cvsd
41	${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${PREFIX}/etc/cvsd/cvsd.conf.sample	48	${INSTALL_DATA} ${WRKSRC}/cvsd.conf-dist ${PREFIX}/etc/cvsd/cvsd.conf.sample
42	.for FILE in ${MAN5}	49	.for FILE in ${MAN5}
Lines 51-54 Link Here
51	.endif	58	.endif
52	@${CAT} ${PKGMESSAGE}	59	@${CAT} ${PKGMESSAGE}
53		60
54	.include <bsd.port.mk>	61	.include <bsd.port.post.mk>

Line 0 Link Here

(-)cvsd/files/cvsd.sh.in (+52 lines)
	1	#!/bin/sh
	2	# $FreeBSD:
	3	#
	4	# PROVIDE: cvsd
	5	# REQUIRE: NETWORKING
	6	# KEYWORD: nojail
	7
	8	. %%RC_SUBR%%
	9
	10	name="cvsd"
	11	rcvar=`set_rcvar`
	12	command="%%PREFIX%%/sbin/$name"
	13
	14	load_rc_config $name
	15
	16	: ${cvsd_enable="NO"}
	17	: ${cvsd_config="%%PREFIX%%/etc/$name/$name.conf"}
	18
	19	command_args="-f $cvsd_config"
	20
	21	start_precmd="cvsd_prestart"
	22	stop_postcmd="cvsd_poststop"
	23
	24	cvsd_prestart()
	25	{
	26	if [ $osreldate -gt 500000 ]; then
	27	mount -t devfs devfs $jail/dev
	28	devfs -m $jail/dev rule apply hide
	29	devfs -m $jail/dev rule apply path null unhide
	30	devfs -m $jail/dev rule apply path zero unhide
	31	fi
	32	}
	33
	34	cvsd_poststop()
	35	{
	36	if [ $osreldate -gt 500000 ]; then
	37	umount -t devfs $jail/dev
	38	fi
	39	}
	40
	41	jail=`sed -n 's/^ RootJail \([^ ]\) $/\1/p' < $cvsd_config`
	42	pidfile=`sed -n 's/^ PidFile \([^ ]\) $/\1/p' < $cvsd_config`
	43	osreldate=`sysctl -n kern.osreldate`
	44	if [ "$jail" = "X$jail" ]; then
	45	err 1 "RootJail is not specified in $cvsd_config"
	46	fi
	47	if [ "$pidfile" = "X$pidfile" ]; then
	48	err 1 "PidFile is not specified in $cvsd_config"
	49	fi
	50
	51	run_rc_command "$1"
	52

Line 0 Link Here

(-)cvsd/files/extra-cvsd-buildroot.in (+42 lines)
	1	--- cvsd-buildroot.in.orig Thu Jun 1 23:57:20 2006
	2	+++ cvsd-buildroot.in Tue Jun 6 11:38:57 2006
	3	@@ -212,39 +212,6 @@
	4	fi
	5	done
	6
	7	-# populate /dev (need root privileges for this)
	8	-echo $ECHO_N "creating $ROOT/dev devices... $ECHO_C"
	9	-DEVICES="null zero"
	10	-MISSINGDEVS=""
	11	-for d in $DEVICES
	12	-do
	13	- if [ -r "$ROOT/dev/$d" ]
	14	- then
	15	- :
	16	- else
	17	- MISSINGDEVS="$MISSINGDEVS $d"
	18	- fi
	19	-done
	20	-if [ -n "`echo $MISSINGDEVS`" ]
	21	-then
	22	- if (cd /dev ; tar chpf - $MISSINGDEVS) \| \
	23	- ( cd "$ROOT/dev" ; tar xpf - > /dev/null 2>&1 )
	24	- then
	25	- # check if we can use the devices
	26	- if ( echo TEST > "$ROOT/dev/null" && \
	27	- echo TEST > "$ROOT/dev/zero" ) 2> /dev/null
	28	- then
	29	- echo "done."
	30	- else
	31	- echo "FAILED (unable to use devices)"
	32	- fi
	33	- else
	34	- echo "FAILED."
	35	- fi
	36	-else
	37	- echo "already there."
	38	-fi
	39	-
	40	# update /etc/passwd
	41	echo $ECHO_N "adding users to $ROOT/etc/passwd...$ECHO_C"
	42	for i in $USERS