Date: Sat, 1 Sep 2001 16:52:56 +0300 From: Peter Pentchev <roam@ringlet.net> To: Neil Blakey-Milner <nbm@FreeBSD.org> Cc: freebsd-ports@FreeBSD.org Subject: sysutils/daemontools FreeBSD port update to 0.76 Message-ID: <20010901165256.A2365@ringworld.oblivion.bg>
next in thread | raw e-mail | index | archive | help
Hi, The attached patch updates the daemontools port to 0.76. My machine has been running with it for the past few days, and everything seems to be working fine so far. The one drawback I see is that this deviates from DJB's instructions by not using the svscanboot script for svscan startup, and consequently, not running readproctitle for the ability to glance quickly at svscan's error output. svscanboot, however, has a hardcoded path for /service, and is therefore slightly inferior to our own svscan.sh :) Should I try to modify svscan.sh to run readproctitle, or modify svscanboot to honor a variable /service path, or just leave it the way it is (which would incur DJB's wrath when problems are reported back, lacking readproctitle's output..) ? Should any of this be committed before 4.4 hits the streets? :) G'luck, Peter -- If the meanings of 'true' and 'false' were switched, then this sentence wouldn't be false. Index: ports/sysutils/daemontools/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/daemontools/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- ports/sysutils/daemontools/Makefile 2001/05/10 07:10:23 1.9 +++ ports/sysutils/daemontools/Makefile 2001/09/01 13:43:26 @@ -6,14 +6,14 @@ # PORTNAME= daemontools -PORTVERSION= 0.70 -PORTREVISION= 1 +PORTVERSION= 0.76 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ \ ftp://cr.yp.to/daemontools/ MAINTAINER= nbm@FreeBSD.org +WRKSRC= ${WRKDIR}/admin/${DISTNAME}/src NO_PACKAGE= "Unsure of djb\'s license" ALL_TARGET= it @@ -25,11 +25,19 @@ post-patch: @echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @echo "${CC} -s" > ${WRKSRC}/conf-ld - @echo "${PREFIX}" > ${WRKSRC}/conf-home post-build: @${SED} "s!/usr/local/!${PREFIX}/!;s!/var/service!${SERVICEDIR}!g" \ ${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC} + +do-install: + (while read cmd; do \ + if file ${WRKSRC}/$$cmd | grep -q "shell script"; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/$$cmd ${PREFIX}/bin; \ + else \ + ${INSTALL_PROGRAM} ${WRKSRC}/$$cmd ${PREFIX}/bin; \ + fi \ + done) < ${WRKSRC}/../package/commands post-install: @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \ Index: ports/sysutils/daemontools/distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/daemontools/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- ports/sysutils/daemontools/distinfo 2000/04/27 21:43:39 1.2 +++ ports/sysutils/daemontools/distinfo 2001/09/01 13:43:26 @@ -1 +1 @@ -MD5 (daemontools-0.70.tar.gz) = c88e8c5e4453b4df41571f60eaa0baf3 +MD5 (daemontools-0.76.tar.gz) = 1871af2453d6e464034968a0fbcb2bfc Index: ports/sysutils/daemontools/pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/daemontools/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- ports/sysutils/daemontools/pkg-plist 2000/04/27 21:43:43 1.3 +++ ports/sysutils/daemontools/pkg-plist 2001/09/01 13:43:26 @@ -1,9 +1,11 @@ bin/svscan +bin/svscanboot bin/supervise bin/svc bin/svok bin/svstat bin/fghack +bin/pgrphack bin/multilog bin/tai64n bin/tai64nlocal @@ -12,3 +14,4 @@ bin/envuidgid bin/envdir bin/setlock +bin/readproctitle Index: ports/sysutils/daemontools/files/patch-Makefile =================================================================== RCS file: patch-Makefile diff -N patch-Makefile --- ports/sysutils/daemontools/files/patch-Makefile Sat Sep 1 04:25:14 2001 +++ ports/sysutils/daemontools/files/patch-Makefile Sat Sep 1 16:43:26 2001 @@ -0,0 +1,26 @@ +--- Makefile.old Fri Aug 31 15:16:47 2001 ++++ Makefile Fri Aug 31 15:17:04 2001 +@@ -82,10 +82,9 @@ + chkshsgr.o: chkshsgr.c compile + ./compile chkshsgr.c + +-choose: choose.sh home warn-auto.sh ++choose: choose.sh warn-auto.sh + rm -f choose + cat warn-auto.sh choose.sh \ +- | sed s}HOME}"`head -1 home`"}g \ + > choose + chmod 555 choose + +@@ -387,10 +386,9 @@ + pathexec.h str.h strerr.h svscan.c wait.h + ./compile svscan.c + +-svscanboot: home svscanboot.sh warn-auto.sh ++svscanboot: svscanboot.sh warn-auto.sh + rm -f svscanboot + cat warn-auto.sh svscanboot.sh \ +- | sed s}HOME}"`head -1 home`"}g \ + > svscanboot + chmod 555 svscanboot + Index: ports/sysutils/daemontools/files/patch-supervise.c =================================================================== RCS file: patch-supervise.c diff -N patch-supervise.c --- ports/sysutils/daemontools/files/patch-supervise.c Sat Sep 1 16:43:27 2001 +++ ports/sysutils/daemontools/files/patch-supervise.c Sat Sep 1 04:25:14 2001 @@ -1,24 +0,0 @@ -diff -urN supervise.c supervise.c ---- supervise.c Mon Mar 6 07:21:09 2000 -+++ supervise.c Mon Apr 23 11:15:10 2001 -@@ -90,7 +90,12 @@ - void trystart(void) - { - int f; -+ static int firstpassed = 0; - -+ if (firstpassed) -+ sleep(1); -+ else -+ firstpassed = 1; - switch(f = fork()) { - case -1: - strerr_warn4(WARNING,"unable to fork for ",dir,", sleeping 60 seconds: ",&strerr_sys); -@@ -105,7 +110,6 @@ - pid = f; - pidchange(); - announce(); -- sleep(1); - } - - void doit(void) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010901165256.A2365>