Index: head/astro/setiathome/Makefile
===================================================================
--- head/astro/setiathome/Makefile	(revision 78800)
+++ head/astro/setiathome/Makefile	(revision 78801)
@@ -1,203 +1,203 @@
 # Ports collection makefile for:    setiathome
 # Date created:         22 Apr 1999
 # Whom:                 stb@freebsd.org
 #
 # $FreeBSD$
 
 PORTNAME=	setiathome
 PORTVERSION?=	3.03
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES?=	astro
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/setiathome/ \
 		ftp://alien.ssl.berkeley.edu/pub/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.${PORT_HOST}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER?=	cyrille.lefevre@laposte.net
 COMMENT?=	Donate idle cycles to the search for space aliens
 
 .if ${PORTVERSION} == "3.03"
 FORBIDDEN=	'Exploitable buffer overflow. http://spoor12.edup.tudelft.nl/'
 .endif
 
 .include <bsd.port.pre.mk>
 
 # Global variables
 #
 
 .if !defined(BATCH)
 IS_INTERACTIVE=	yes
 .endif
 
 ONLY_FOR_ARCHS?= alpha i386
 
 NO_BUILD=	binary distribution
 NO_CDROM=	interactive install
 
 .if ${OSVERSION} <= 226000
 BROKEN=		"currently supports only FreeBSD 2.2.6 and above"
 .endif
 
 EXTRACT_CMD=	${CAT}
 EXTRACT_BEFORE_ARGS=
 
 STRIP=		# aout is already stripped
 SCRIPTS_ENV+=	PKG_PREFIX=${PREFIX}
 PLIST_SUB=	X11PORTS=${X11PORTS} \
 		PREFX="${PKGNAMEPREFIX}" SUFX="${PKGNAMESUFFIX}"
 
 MAN1=		${PORTNAME}.1
 
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${PKGINSTALL}
 
 # Port specific variables
 #
 
 PORT_CPU?=	${ARCH}
 .if ${ARCH} == alpha
 PORT_VENDOR=	compaq
 PORT_OSNAME=	T64U
 PORT_OSREL=	v4.0d
 .else
 PORT_VENDOR?=	unknown
 PORT_OSNAME?=	freebsd
 PORT_OSREL?=	2.2.8
 .endif
 PORT_OS=	${PORT_OSNAME}${PORT_OSREL}
 PORT_HOST=	${PORT_CPU}-${PORT_VENDOR}-${PORT_OS}
 
 # Arch/OS specific variables
 #
 
 .if ${ARCH} != i386
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .elif ${PORT_OSNAME} != freebsd
 PKGNAMEPREFIX=	${PORT_OSNAME}-
 PKGNAMESUFFIX=	-${PORT_CPU}
 MD5_FILE=	${.CURDIR}/distinfo
 DESCR=		${.CURDIR}/pkg-descr
 .if ${PORT_OSNAME} == linux
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXaw.so.7)
 NO_XBIN=	libXaw.so.7 is missing from linux_base-6
 .endif
 NO_XBIN?=	xsetiathome is broken
 .endif
 .elif ${OSVERSION} >= 300000
 NO_XBIN=	xsetiathome is broken
 .endif
 
 # Local variables
 #
 
 SBIN_DIR=	${PREFIX}/sbin
 CONF_DIR=	${PREFIX}/etc
 RC_DIR=		${PREFIX}/etc/rc.d
 
 SAMP_SUFX=	.sample
 
 BIN_FILE=	setiathome
 RC_FILES=	setiathome
 
 # i386 NOTES:
 # xsetiathome is currently broken at 4.2. should work at 2.x,
 # don't know between 3.0 and 4.2 ? so, be conservative...
 # diagnostic messages are :
 #	Warning: Cannot convert string "doneB" to type Widget
 #	Floating point exception (core dumped)
 # Linux NOTES:
 # xsetiathome requires libXawk.so.7 which is missing from linux_base-6.
 # using linux_base-7, diagnostic messages are :
 #	Warning: Cannot convert string "doneB" to type Widget
 #	Shared memory segment doesn't exist. errno=2
 #	Couldn't attach to the science process!
 
 .if !defined(NO_XBIN)
 MAN1+=		x${PORTNAME}.1
 XBIN_DIR=	${PREFIX}/bin
 XBIN_FILE=	xsetiathome
 X11PORTS=
 .else
 X11PORTS=	"@comment "
 .endif
 
 # Post-patch
 #
 
 post-patch: patch-pkgmessage
 
 patch-pkgmessage:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g; \
 		 s|%%PREFX%%|${PKGNAMEPREFIX}|g; \
 		 s|%%SUFX%%|${PKGNAMESUFFIX}|g' \
 		${MSG_FILE} > ${PKGMESSAGE}
 
 # Install
 #
 
 do-install: install-daemon install-program install-man
 
 install-daemon:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${BIN_FILE} \
 		${SBIN_DIR}/${PKGNAMEPREFIX}${BIN_FILE}${PKGNAMESUFFIX}
 
 install-program:
 .if defined(XBIN_FILE)
 	@${INSTALL_PROGRAM} ${WRKSRC}/${XBIN_FILE} \
 		${XBIN_DIR}/${PKGNAMEPREFIX}${XBIN_FILE}${PKGNAMESUFFIX}
 .endif
 
 install-man:
 .for mansect in 1
 .for man in ${MAN${mansect}}
 	@${INSTALL_MAN} ${FILESDIR}/${man} \
 		${MAN${mansect}PREFIX}/man/man${mansect}
 .endfor
 .endfor
 
 # Post-install
 #
 
 post-install: install-startup-files configure-package display-message
 
 install-startup-files:
 .for file in ${RC_FILES}
 .if exists(${FILESDIR}/rc.${file}.conf)
 	@${INSTALL_DATA} ${FILESDIR}/rc.${file}.conf \
 		${CONF_DIR}/rc.${PKGNAMEPREFIX}${file}${PKGNAMESUFFIX}.conf${SAMP_SUFX}
 .if !exists(${CONF_DIR}/rc.${PKGNAMEPREFIX}${file}${PKGNAMESUFFIX}.conf)
 	@${INSTALL_DATA} ${FILESDIR}/rc.${file}.conf \
 		${CONF_DIR}/rc.${PKGNAMEPREFIX}${file}${PKGNAMESUFFIX}.conf
 .endif
 .endif
 .if defined(PKGNAMEPREFIX) && !empty(PKGNAMEPREFIX)
 	-@${CHMOD} -x ${RC_DIR}/*${file}*.sh 2> /dev/null
 .endif
 .if exists(${FILESDIR}/${file}.sh)
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file}.sh \
 		${RC_DIR}/${PKGNAMEPREFIX}${file}${PKGNAMESUFFIX}.sh
 .endif
 .endfor
 
 configure-package:
 .if !defined(BATCH)
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
 display-message:
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
 # Maintainer use only
 #
 
 maintainer-makesum:
 .for arch in ${ONLY_FOR_ARCHS}
 	${MAKE} ARCH=${arch} makesum
 .endfor
 
 .include <bsd.port.post.mk>

Property changes on: head/astro/setiathome/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/astro/setiathome/files/setiathome.sh
===================================================================
--- head/astro/setiathome/files/setiathome.sh	(revision 78800)
+++ head/astro/setiathome/files/setiathome.sh	(revision 78801)
@@ -1,191 +1,193 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # Start or stop SETI@home, or set up working directory and register.
 #
 
 case $0 in
 /*) rc_dir=${0%/*} ;;
  *) rc_dir=${PWD:-$(pwd)} ;;
 esac
 rc_file=${0##*/}
 rc_path=${rc_dir}/${rc_file}
 rc_arg=$1
 
 # override these variables in ${PREFIX}/etc/rc.setiathome.conf
 seti_wrkdir=/var/db/${rc_file%.sh}	# primary working directory
 seti_std_args=-email			# command arguments for standard mode
 seti_reg_args=-login			# command arguments for register mode
 seti_proxy_args=			# proxy arguments
 seti_user=setiathome			# user id to run as
 seti_group=${seti_user}			# group id to run as
 seti_nice=15				# nice level to run at
 seti_maxprocs=$(sysctl -n hw.ncpu)	# max. number of processes to start
 seti_sleep=21600			# time to sleep between restarts
 
 if ! PREFIX=$(expr ${rc_path} : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then
 	echo "${rc_file}: Cannot determine PREFIX." >&2
 	echo "Please use the complete pathname." >&2
 	exit 64
 fi
 
 rcconf_dir=${PREFIX}/etc
 rcconf_file=rc.${rc_file%.sh}.conf
 rcconf_path=${rcconf_dir}/${rcconf_file}
 
 if [ -f ${rcconf_path} ]; then
 	. ${rcconf_path}
 fi
 
 program_dir=${PREFIX}/sbin
 program_file=${rc_file%.sh}
 program_path=${program_dir}/${program_file}
 
 syslog_facility=daemon.err
 
 i=${seti_maxprocs}
 seti_wrksuff="."
 while [ ${i} -gt 1 ]; do
 	seti_wrksuff="${seti_wrksuff} ${i}"
 	i=$((${i} - 1))
 done
 
 case "$rc_arg" in
 start)
 	if [ ! -x ${program_path} ]; then
 		logger -sp ${syslog_facility} -t ${program_file} \
 			"unable to start: ${program_path} is missing."
 		exit 72
 	fi
 	for i in ${seti_wrksuff}; do
 		if [ ! -d ${seti_wrkdir}/${i} ]; then
 			logger -sp ${syslog_facility} -t ${program_file} \
 			"unable to start: ${seti_wrkdir}/${i} is missing."
 			exit 72
 		fi
 		if [ ! -f ${seti_wrkdir}/${i}/user_info.sah ]; then
 			logger -sp ${syslog_facility} -t ${program_file} \
 			"unable to start: please log in to SETI@home first" \
 			"(${seti_wrkdir}/${i}/user_info.sah is missing)."
 			logger -sp ${syslog_facility} -t ${program_file} \
 				"run \"$0 register\" to accomplish this."
 			exit 72
 		fi
 	done
 	for i in ${seti_wrksuff}; do
-		su -fm ${seti_user} -c "\
-			cd ${seti_wrkdir}/${i} || exit; \
-			echo \$\$ > shpid.sah; \
-			trap 'kill \$pid;exit' 15; \
-			while :; do \
+		su -fm ${seti_user} -c "exec /bin/sh -T" << EOF > /dev/null &
+			cd ${seti_wrkdir}/${i} || exit
+			echo \$\$ > shpid.sah
+			trap 'kill \$pid;exit' 15
+			while :; do
 				${program_path} \
 					${seti_std_args} ${seti_proxy_args} \
-					${seti_nice:+-nice} ${seti_nice} & \
-				pid=\$!; wait \$pid; \
-				sleep ${seti_sleep}; \
-			done > /dev/null" &
+					${seti_nice:+-nice} ${seti_nice} &
+				pid=\$!; wait \$pid
+				sleep ${seti_sleep} &
+				pid=\$!; wait \$pid
+			done
+EOF
 	done
 	echo -n " SETI@home"
 	;;
 
 stop)
 	for i in ${seti_wrksuff}; do
 		for pid_path in ${seti_wrkdir}/${i}/pid.sah \
 				${seti_wrkdir}/${i}/shpid.sah; do
 			if [ -f ${pid_path} ]; then
 				kill $(cat ${pid_path}) 2> /dev/null
 			fi
 		done
 	done
 	if [ ! -f ${seti_wrkdir}/pid.sah ]; then
 		killall ${program_file} 2> /dev/null
 	fi
 	;;
 
 restart)
 	$0 stop
 	$0 start
 	;;
 
 status)
 	ps auxww | egrep ${program_file} | egrep -v "($0|egrep)"
 	;;
 
 register)
 	if [ ! -x ${program_path} ]; then
 		echo "${program_file}:" \
 			"unable to register: ${program_path} is missing." >&2
 		exit 72
 	fi
 	if pw group show "${seti_group}" 2>/dev/null; then
 		echo "You already have a group \"${seti_group}\"," \
 		     "so I will use it."
 	elif pw groupadd ${seti_group} -h -; then
 		echo "Added group \"${seti_group}\"."
 	else
 		echo "Adding group \"${seti_group}\" failed..."
 		echo "Please create it, and try again."
 		exit 1
 	fi
 	if pw user show "${seti_user}" 2>/dev/null; then
 		echo "You already have a user \"${seti_user}\"," \
 		     "so I will use it."
 		if pw usermod ${seti_user} -d ${seti_wrkdir}; then
 			echo "Changed home directory of \"${seti_user}\"" \
 			     "to \"${seti_wrkdir}\""
 		else
 			echo "Changing home directory of \"${seti_user}\"" \
 			     "to \"${setu_wrkdir}\" failed..."
 			exit 1
 		fi
 	elif pw useradd ${seti_user} -g ${seti_group} -h - \
 		-d ${seti_wrkdir} -s /sbin/nologin -c "SETI at home Daemon"; then
 		echo "Added user \"${seti_user}\"."
 	else
 		echo "Adding user \"${seti_user}\" failed..."
 		echo "Please create it, and try again."
 		exit 1
 	fi
 	# Create or update primary working directory (in case the uid changed)
 	mkdir -p ${seti_wrkdir} || exit
 	chown -Rh ${seti_user}:${seti_group} ${seti_wrkdir} || exit
 	chmod u=Xrw,g=Xr,o=Xr ${seti_wrkdir} || exit
 	seti_dontlogin=no
 	if [ -f ${seti_wrkdir}/user_info.sah ]; then
 		echo    "      It seems you have already registered with" \
 			"SETI@home.  Would you"
 		echo -n "      like to repeat the procedure? [Y/n] "
 		read a
 		if [ "X${a}" = "Xn" -o "X${a}" = "XN" ]; then
 			seti_dontlogin=yes
 		fi
 	fi
 	# No need to register if we've already done so
 	if [ "X${seti_dontlogin}" != "Xyes" ]; then
 		su -fm ${seti_user} -c "\
 			cd ${seti_wrkdir} && \
 			exec ${program_path} \
 			${seti_reg_args} ${seti_proxy_args}"
 	fi
 	if [ ${seti_maxprocs} -gt 1 ]; then
 		echo "      Updating additional working directories."
 		i=${seti_maxprocs}
 		while [ ${i} -gt 1 ]; do
 			mkdir -p ${seti_wrkdir}/${i}
 			chown ${seti_user} ${seti_wrkdir}/${i}
 			chmod 755 ${seti_wrkdir}/${i}
 			# Assume the user want's all processes to run
 			# with the same registration
 			rm -f ${seti_wrkdir}/${i}/user_info.sah
 			ln -sf ../user_info.sah ${seti_wrkdir}/${i}
 			i=$((${i} - 1))
 		done
 	fi
 	;;		
 
 *)
 	echo "usage: ${rc_file} {start|stop|restart|status|register}" >&2
 	exit 64
 	;;
 esac

Property changes on: head/astro/setiathome/files/setiathome.sh
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property