Index: head/sysutils/runit-faster/pkg-message =================================================================== --- head/sysutils/runit-faster/pkg-message (revision 465959) +++ head/sysutils/runit-faster/pkg-message (nonexistent) @@ -1,2 +0,0 @@ -Please see https://people.freebsd.org/~tobik/runit-faster.html for -usage instructions. Property changes on: head/sysutils/runit-faster/pkg-message ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/runit-faster/Makefile =================================================================== --- head/sysutils/runit-faster/Makefile (revision 465959) +++ head/sysutils/runit-faster/Makefile (revision 465960) @@ -1,97 +1,99 @@ # Created by: Sergei Kolobov # $FreeBSD$ PORTNAME= runit DISTVERSION= ${RUNITVERSION}-${CONFVERSION} RUNITVERSION= 2.1.2 -CONFVERSION= 0.1.17 +CONFVERSION= 0.1.18 CATEGORIES= sysutils MASTER_SITES= http://smarden.org/runit/ \ http://www.bayofrum.net/dist/runit/ \ LOCAL/tobik:config \ https://pkg.tobik.me/distfiles/:config PKGNAMESUFFIX= -faster DISTFILES= runit-${RUNITVERSION}${EXTRACT_SUFX} \ freebsd-runit-${CONFVERSION}${EXTRACT_SUFX}:config MAINTAINER= tobik@FreeBSD.org COMMENT= Runit based init replacement for ${OPSYS} LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/package/COPYING RUN_DEPENDS= snooze:sysutils/snooze CONFLICTS_INSTALL= runit PLIST_SUB= RUNITDIR=${RUNITDIR} +SUB_FILES= pkg-message +SUB_LIST= RUNITDIR=${RUNITDIR} USE_RC_SUBR= runsvdir WRKSRC= ${WRKDIR}/admin/runit-${RUNITVERSION} OPTIONS_DEFINE= DOCS ROOT +OPTIONS_SUB= yes ROOT_DESC= Install bootstrap files into /etc/runit and /sbin PORTDOCS= * ROOT_VARS= RUNITDIR=/etc/runit SBINDIR=/sbin -ROOT_VARS_OFF= RUNITDIR=${PREFIX}/etc/runit SBINDIR=${PREFIX}/sbin +ROOT_VARS_OFF= RUNITDIR=${ETCDIR} SBINDIR=${PREFIX}/sbin post-patch: @${REINPLACE_CMD} -e 's,/service/,/var/service,' \ -e 's,/etc/runit,${RUNITDIR},' \ -e 's,/sbin/runit,${SBINDIR}/runit,' \ ${WRKSRC}/man/* ${WRKSRC}/doc/*.html \ ${WRKSRC}/src/sv.c \ ${WRKSRC}/src/runsvchdir.c \ ${WRKSRC}/src/runit.c \ ${WRKSRC}/src/runit.h do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc @${ECHO_CMD} "${CC}" > ${WRKSRC}/src/conf-ld do-build: @cd ${WRKSRC} && package/compile do-install: @${MKDIR} ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${SBINDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${SBINDIR} + cd ${WRKSRC}/command && ${INSTALL_PROGRAM} runit runit-init \ + ${STAGEDIR}${SBINDIR} + cd ${WRKSRC}/command && ${INSTALL_PROGRAM} \ + chpst runsv runsvchdir runsvdir sv svlogd utmpset \ + ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${PREFIX}/man/man8 @${DO_MAKE_BUILD} -C ${WRKDIR}/freebsd-runit-${CONFVERSION} \ DESTDIR=${STAGEDIR} \ LOCALBASE=${LOCALBASE} \ PREFIX=${PREFIX} \ RUNITDIR=${RUNITDIR} \ SVDIR=${PREFIX}/etc/sv \ install # Point runit to the run directory (a necessity to let runit work on # read-only root filesystems) and make sure rebooting and powering off # can work correctly. @${LN} -s /var/run/runit/reboot ${STAGEDIR}${RUNITDIR}/reboot @${LN} -s /var/run/runit/stopit ${STAGEDIR}${RUNITDIR}/stopit do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} \ package/CHANGES package/README package/THANKS doc/*.html \ ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/freebsd-runit-${CONFVERSION}/docs/runit-faster.md \ + ${STAGEDIR}${DOCSDIR} post-install: # Micromanaging pkg-plist is no fun here... Generate it on the fly # instead. - @${FIND} -s ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${PREFIX}/etc/sv ${STAGEDIR}${SBINDIR} \ - -not -type d | ${SORT} | ${SED} \ - -e 's,^${STAGEDIR},,' \ - -e 's,^${PREFIX}/,,' \ + @${FIND} -s ${STAGEDIR}${PREFIX}/etc/sv -not -type d | ${SORT} | \ + ${SED} -e 's,^${STAGEDIR},,' -e 's,^${PREFIX}/,,' \ >> ${TMPPLIST} - @${FIND} -s ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${PREFIX}/etc/sv ${STAGEDIR}${SBINDIR} \ - -type d | ${SORT} | ${SED} \ - -e 's,^${STAGEDIR},,' \ - -e 's,^${PREFIX}/,,' \ - -e 's,^,@dir ,' >> ${TMPPLIST} do-test: @cd ${WRKSRC} && package/check .include Index: head/sysutils/runit-faster/distinfo =================================================================== --- head/sysutils/runit-faster/distinfo (revision 465959) +++ head/sysutils/runit-faster/distinfo (revision 465960) @@ -1,5 +1,5 @@ -TIMESTAMP = 1521729148 +TIMESTAMP = 1522395709 SHA256 (runit-2.1.2.tar.gz) = 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 SIZE (runit-2.1.2.tar.gz) = 110916 -SHA256 (freebsd-runit-0.1.17.tar.gz) = 8d560ebb27f5b1f76c74571f18a1341ee05a1a5168dc726e036fa4e962d4fab8 -SIZE (freebsd-runit-0.1.17.tar.gz) = 17399 +SHA256 (freebsd-runit-0.1.18.tar.gz) = 513edafe8ceb5a38ee9a9c2f9c026e8d06ca3b839949ce183351c645a382db07 +SIZE (freebsd-runit-0.1.18.tar.gz) = 22398 Index: head/sysutils/runit-faster/files/pkg-message.in =================================================================== --- head/sysutils/runit-faster/files/pkg-message.in (nonexistent) +++ head/sysutils/runit-faster/files/pkg-message.in (revision 465960) @@ -0,0 +1,2 @@ +Please see https://people.freebsd.org/~tobik/runit-faster.html or +%%DOCSDIR%%/runit-faster.md for usage instructions. Property changes on: head/sysutils/runit-faster/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/runit-faster/files/runsvdir.in =================================================================== --- head/sysutils/runit-faster/files/runsvdir.in (revision 465959) +++ head/sysutils/runit-faster/files/runsvdir.in (revision 465960) @@ -1,38 +1,40 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: runsvdir # BEFORE: SERVERS # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable `runsvdir': # # runsvdir_enable="YES" # runsvdir_path="/var/service" . /etc/rc.subr name=runsvdir desc="starts and monitors a collection of runsv(8) processes" rcvar=runsvdir_enable load_rc_config runsvdir : ${runsvdir_enable:=NO} : ${runsvdir_path=/var/service} command="%%PREFIX%%/sbin/runsvdir" start_cmd=runsvdir_start stop_postcmd="%%PREFIX%%/sbin/sv exit ${runsvdir_path}/*" runsvdir_start() { + /bin/mkdir -p /var/run/runit/runsvdir + /bin/ln -sF %%RUNITDIR%%/runsvdir/current /var/run/runit/runsvdir/current /bin/test -d ${runsvdir_path} || /bin/mkdir -p ${runsvdir_path} /usr/bin/env -i \ PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin:/rescue \ /usr/sbin/daemon -c -f \ ${command} ${runsvdir_path} } run_rc_command $1 Index: head/sysutils/runit-faster/pkg-plist =================================================================== --- head/sysutils/runit-faster/pkg-plist (revision 465959) +++ head/sysutils/runit-faster/pkg-plist (revision 465960) @@ -1,13 +1,57 @@ +bin/svclone +%%ROOT%%@dir %%RUNITDIR%% +%%ROOT%%@dir %%RUNITDIR%%/core-services +%%RUNITDIR%%/1 +%%RUNITDIR%%/2 +%%RUNITDIR%%/3 +%%RUNITDIR%%/core-services/11-kld.sh +%%RUNITDIR%%/core-services/11-set-defaults.sh +%%RUNITDIR%%/core-services/21-swap.sh +%%RUNITDIR%%/core-services/31-enable-dumpdev.sh +%%RUNITDIR%%/core-services/31-fsck.sh +%%RUNITDIR%%/core-services/31-mount.sh +%%RUNITDIR%%/core-services/33-microcode_update.sh +%%RUNITDIR%%/core-services/33-var.sh +%%RUNITDIR%%/core-services/41-entropy.sh +%%RUNITDIR%%/core-services/41-hostid.sh +%%RUNITDIR%%/core-services/41-hostname.sh +%%RUNITDIR%%/core-services/41-ldconfig.sh +%%RUNITDIR%%/core-services/41-loopback.sh +%%RUNITDIR%%/core-services/41-mixer.sh +%%RUNITDIR%%/core-services/41-nextboot.sh +%%RUNITDIR%%/core-services/41-rctl.sh +%%RUNITDIR%%/core-services/43-bhyve-bridge.sh +%%RUNITDIR%%/core-services/51-pf.sh +%%RUNITDIR%%/core-services/99-cleanup.sh +%%RUNITDIR%%/core-services/99-mount-late.sh +%%RUNITDIR%%/core-services/99-qemu_user_static.sh +%%RUNITDIR%%/ctrlaltdel +%%RUNITDIR%%/functions +%%RUNITDIR%%/jail +%%RUNITDIR%%/reboot +@dir %%RUNITDIR%%/runsvdir +@dir %%RUNITDIR%%/runsvdir/default +%%RUNITDIR%%/stopit man/man8/chpst.8.gz man/man8/runit-init.8.gz man/man8/runit.8.gz man/man8/runsv.8.gz man/man8/runsvchdir.8.gz man/man8/runsvdir.8.gz man/man8/sv.8.gz man/man8/svlogd.8.gz man/man8/utmpset.8.gz +sbin/chpst +%%ROOT%%/sbin/runit +%%NO_ROOT%%sbin/runit +%%ROOT%%/sbin/runit-init +%%NO_ROOT%%sbin/runit-init +sbin/runsv +sbin/runsvchdir +sbin/runsvdir +sbin/sv +sbin/svlogd +sbin/utmpset @postexec [ ! -e %%RUNITDIR%%/runsvdir/current ] && cd %%RUNITDIR%%/runsvdir && ln -s default current -@postunexec rm -f %%RUNITDIR%%/runsvdir/current -@postexec ln -sf /var/run/runit/runsvdir/current /var/service -@postunexec rm -f /var/service +@postexec ln -sF /var/run/runit/runsvdir/current /var/service +@rmtry /var/service