diff --git a/devel/skalibs/Makefile b/devel/skalibs/Makefile index 958aed6f2aa3..8f4d478377e7 100644 --- a/devel/skalibs/Makefile +++ b/devel/skalibs/Makefile @@ -1,37 +1,37 @@ # Created by: Sergei Kolobov PORTNAME= skalibs -PORTVERSION= 2.10.0.3 +PORTVERSION= 2.12.0.1 CATEGORIES= devel MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/ MAINTAINER= crest@rlwinm.de COMMENT= General purpose C libraries used by skarnet.org software LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_mips64= fails to build: Checking whether system has auto-close after fd-passing... test crashed, aborting USES= gmake USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-default-path=${PREFIX}/bin:/usr/bin:/bin OPTIONS_DEFINE= DOCS DOCS= AUTHORS README doc/*.html post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskarnet.so.${PORTVERSION} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.for d in libbiguint libdatastruct librandom libstdcrypto libstddjb libunixonacid +.for d in libdatastruct libposixplz librandom libstdcrypto libstddjb libunixonacid @${MKDIR} ${STAGEDIR}${DOCSDIR}/${d} cd ${WRKSRC} && ${INSTALL_DATA} doc/${d}/*.html ${STAGEDIR}${DOCSDIR}/${d} .endfor .include diff --git a/devel/skalibs/distinfo b/devel/skalibs/distinfo index ded942021f6f..d4f44a1881c6 100644 --- a/devel/skalibs/distinfo +++ b/devel/skalibs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618496341 -SHA256 (skalibs-2.10.0.3.tar.gz) = b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d -SIZE (skalibs-2.10.0.3.tar.gz) = 232814 +TIMESTAMP = 1655992292 +SHA256 (skalibs-2.12.0.1.tar.gz) = 3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285 +SIZE (skalibs-2.12.0.1.tar.gz) = 222717 diff --git a/devel/skalibs/pkg-plist b/devel/skalibs/pkg-plist index 5bce56c382aa..5870804c056f 100644 --- a/devel/skalibs/pkg-plist +++ b/devel/skalibs/pkg-plist @@ -1,154 +1,148 @@ include/skalibs/alarm.h include/skalibs/alloc.h include/skalibs/allreadwrite.h include/skalibs/ancil.h include/skalibs/avlnode.h include/skalibs/avltree.h include/skalibs/avltreen.h include/skalibs/bigkv.h -include/skalibs/biguint.h include/skalibs/bitarray.h +include/skalibs/blake2s.h include/skalibs/bsdsnowflake.h include/skalibs/bufalloc.h include/skalibs/buffer.h include/skalibs/bytestr.h include/skalibs/cbuffer.h include/skalibs/cdb.h -include/skalibs/cdb_make.h +include/skalibs/cdbmake.h include/skalibs/config.h include/skalibs/datastruct.h include/skalibs/direntry.h include/skalibs/disize.h include/skalibs/diuint.h include/skalibs/diuint32.h include/skalibs/djbtime.h include/skalibs/djbunix.h include/skalibs/env.h include/skalibs/envalloc.h -include/skalibs/environ.h include/skalibs/error.h include/skalibs/exec.h include/skalibs/fmtscan.h include/skalibs/functypes.h include/skalibs/gccattributes.h include/skalibs/genalloc.h include/skalibs/genqdyn.h include/skalibs/genset.h include/skalibs/gensetdyn.h include/skalibs/genwrite.h -include/skalibs/getpeereid.h -include/skalibs/iobuffer.h include/skalibs/iopause.h include/skalibs/ip46.h include/skalibs/kolbak.h include/skalibs/lolstdio.h -include/skalibs/md5.h include/skalibs/netstring.h include/skalibs/nonposix.h include/skalibs/nsig.h include/skalibs/posixishard.h include/skalibs/posixplz.h include/skalibs/random.h -include/skalibs/rc4.h include/skalibs/segfault.h include/skalibs/selfpipe.h include/skalibs/setgroups.h include/skalibs/sgetopt.h include/skalibs/sha1.h include/skalibs/sha256.h include/skalibs/sha512.h include/skalibs/sig.h include/skalibs/siovec.h include/skalibs/skaclient.h include/skalibs/skalibs.h include/skalibs/skamisc.h include/skalibs/socket.h include/skalibs/stdcrypto.h include/skalibs/stddjb.h include/skalibs/stralloc.h include/skalibs/strerr.h include/skalibs/strerr2.h include/skalibs/surf.h include/skalibs/sysdeps.h include/skalibs/tai.h include/skalibs/textclient.h include/skalibs/textmessage.h include/skalibs/types.h include/skalibs/uint16.h include/skalibs/uint32.h include/skalibs/uint64.h include/skalibs/unix-timed.h include/skalibs/unix-transactional.h include/skalibs/unixconnection.h include/skalibs/unixmessage.h include/skalibs/unixonacid.h lib/libskarnet.so -lib/libskarnet.so.2.10 -lib/libskarnet.so.2.10.0.3 +lib/libskarnet.so.2.12 +lib/libskarnet.so.2.12.0.1 lib/skalibs/libskarnet.a lib/skalibs/sysdeps/socket.lib lib/skalibs/sysdeps/spawn.lib lib/skalibs/sysdeps/sysclock.lib lib/skalibs/sysdeps/sysdeps lib/skalibs/sysdeps/target lib/skalibs/sysdeps/timer.lib lib/skalibs/sysdeps/util.lib %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/crosscompile.html %%PORTDOCS%%%%DOCSDIR%%/djblegacy.html %%PORTDOCS%%%%DOCSDIR%%/flags.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/libbiguint/index.html %%PORTDOCS%%%%DOCSDIR%%/libdatastruct/genqdyn.html %%PORTDOCS%%%%DOCSDIR%%/libdatastruct/index.html +%%PORTDOCS%%%%DOCSDIR%%/libposixplz/index.html %%PORTDOCS%%%%DOCSDIR%%/librandom/index.html %%PORTDOCS%%%%DOCSDIR%%/libskarnet.html %%PORTDOCS%%%%DOCSDIR%%/libstdcrypto/index.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/alarm.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/alloc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/allreadwrite.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/bitarray.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/bufalloc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/buffer.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/bytestr.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/cdb.html -%%PORTDOCS%%%%DOCSDIR%%/libstddjb/cdb_make.html +%%PORTDOCS%%%%DOCSDIR%%/libstddjb/cdbmake.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/direntry.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/djbtime.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/djbunix.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/env.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/envalloc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/exec.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/fmtscan.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/gccattributes.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/genalloc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/genwrite.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/getpeereid.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/index.html -%%PORTDOCS%%%%DOCSDIR%%/libstddjb/iobuffer.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/iopause.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/ip46.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/lolstdio.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/mininetstring.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/netstring.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/safewrappers.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/segfault.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/selfpipe.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/sgetopt.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/sig.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/siovec.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/skamisc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/socket.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/stralloc.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/strerr.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/strerr2.html %%PORTDOCS%%%%DOCSDIR%%/libstddjb/tai.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/index.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/kolbak.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/skaclient.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unix-timed.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unix-transactional.html %%PORTDOCS%%%%DOCSDIR%%/libunixonacid/unixmessage.html %%PORTDOCS%%%%DOCSDIR%%/license.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html diff --git a/lang/execline/Makefile b/lang/execline/Makefile index ebc67431860b..fde77f8b83a4 100644 --- a/lang/execline/Makefile +++ b/lang/execline/Makefile @@ -1,39 +1,39 @@ # Created by: Sergei Kolobov PORTNAME= execline -PORTVERSION= 2.8.0.1 +PORTVERSION= 2.9.0.0 CATEGORIES= lang shells MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/ MAINTAINER= crest@rlwinm.de COMMENT= Lightweight non-interactive sh(1)-like scripting language LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= skalibs>=2.10.0.0:devel/skalibs +BUILD_DEPENDS= skalibs>=2.12.0.0:devel/skalibs LIB_DEPENDS= libskarnet.so:devel/skalibs USES= gmake USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-sysdeps=${LOCALBASE}/lib/skalibs/sysdeps \ --with-lib=${LOCALBASE}/lib/skalibs \ --with-dynlib=${LOCALBASE}/lib \ --with-include=${LOCALBASE}/include \ --enable-shared OPTIONS_DEFINE= DOCS DOCS= AUTHORS README doc/*.html post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libexecline.so.${PORTVERSION} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/lang/execline/distinfo b/lang/execline/distinfo index ba6858498d0f..2f75de263b43 100644 --- a/lang/execline/distinfo +++ b/lang/execline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618496359 -SHA256 (execline-2.8.0.1.tar.gz) = a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed -SIZE (execline-2.8.0.1.tar.gz) = 94886 +TIMESTAMP = 1656004958 +SHA256 (execline-2.9.0.0.tar.gz) = d4906aad8c3671265cfdad1aef265228bda07e09abd7208b4f093ac76f615041 +SIZE (execline-2.9.0.0.tar.gz) = 100225 diff --git a/lang/execline/pkg-plist b/lang/execline/pkg-plist index 4e87f0ce070a..cb27c2141c95 100644 --- a/lang/execline/pkg-plist +++ b/lang/execline/pkg-plist @@ -1,117 +1,119 @@ bin/background bin/backtick +bin/case bin/cd bin/define bin/dollarat bin/elgetopt bin/elgetpositionals bin/elglob bin/emptyenv bin/envfile bin/exec bin/execline-cd bin/execline-umask bin/execlineb bin/exit bin/export bin/fdblock bin/fdclose bin/fdmove bin/fdreserve bin/fdswap bin/forbacktickx bin/foreground bin/forstdin bin/forx bin/getcwd bin/getpid bin/heredoc bin/homeof bin/if bin/ifelse bin/ifte bin/ifthenelse bin/importas bin/loopwhilex bin/multidefine bin/multisubstitute bin/pipeline bin/piperw bin/posix-cd bin/posix-umask bin/redirfd bin/runblock bin/shift bin/trap bin/tryexec bin/umask bin/unexport bin/wait bin/withstdinas include/execline/config.h include/execline/execline.h lib/execline/libexecline.a lib/libexecline.so -lib/libexecline.so.2.8 -lib/libexecline.so.2.8.0.1 +lib/libexecline.so.2.9 +lib/libexecline.so.2.9.0.0 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/background.html %%PORTDOCS%%%%DOCSDIR%%/backtick.html +%%PORTDOCS%%%%DOCSDIR%%/case.html %%PORTDOCS%%%%DOCSDIR%%/define.html %%PORTDOCS%%%%DOCSDIR%%/dieshdiedie.html %%PORTDOCS%%%%DOCSDIR%%/dollarat.html %%PORTDOCS%%%%DOCSDIR%%/el_pushenv.html %%PORTDOCS%%%%DOCSDIR%%/el_semicolon.html %%PORTDOCS%%%%DOCSDIR%%/el_substitute.html %%PORTDOCS%%%%DOCSDIR%%/el_transform.html %%PORTDOCS%%%%DOCSDIR%%/elgetopt.html %%PORTDOCS%%%%DOCSDIR%%/elgetpositionals.html %%PORTDOCS%%%%DOCSDIR%%/elglob.html %%PORTDOCS%%%%DOCSDIR%%/emptyenv.html %%PORTDOCS%%%%DOCSDIR%%/envfile.html %%PORTDOCS%%%%DOCSDIR%%/exec.html %%PORTDOCS%%%%DOCSDIR%%/execline-cd.html %%PORTDOCS%%%%DOCSDIR%%/execline-shell.html %%PORTDOCS%%%%DOCSDIR%%/execline-startup.html %%PORTDOCS%%%%DOCSDIR%%/execline-umask.html %%PORTDOCS%%%%DOCSDIR%%/execlineb.html %%PORTDOCS%%%%DOCSDIR%%/exit.html %%PORTDOCS%%%%DOCSDIR%%/exitcodes.html %%PORTDOCS%%%%DOCSDIR%%/export.html %%PORTDOCS%%%%DOCSDIR%%/fdblock.html %%PORTDOCS%%%%DOCSDIR%%/fdclose.html %%PORTDOCS%%%%DOCSDIR%%/fdmove.html %%PORTDOCS%%%%DOCSDIR%%/fdreserve.html %%PORTDOCS%%%%DOCSDIR%%/fdswap.html %%PORTDOCS%%%%DOCSDIR%%/forbacktickx.html %%PORTDOCS%%%%DOCSDIR%%/foreground.html %%PORTDOCS%%%%DOCSDIR%%/forstdin.html %%PORTDOCS%%%%DOCSDIR%%/forx.html %%PORTDOCS%%%%DOCSDIR%%/getcwd.html %%PORTDOCS%%%%DOCSDIR%%/getpid.html %%PORTDOCS%%%%DOCSDIR%%/grammar.html %%PORTDOCS%%%%DOCSDIR%%/heredoc.html %%PORTDOCS%%%%DOCSDIR%%/homeof.html %%PORTDOCS%%%%DOCSDIR%%/if.html %%PORTDOCS%%%%DOCSDIR%%/ifelse.html %%PORTDOCS%%%%DOCSDIR%%/ifte.html %%PORTDOCS%%%%DOCSDIR%%/ifthenelse.html %%PORTDOCS%%%%DOCSDIR%%/importas.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/loopwhilex.html %%PORTDOCS%%%%DOCSDIR%%/multidefine.html %%PORTDOCS%%%%DOCSDIR%%/multisubstitute.html %%PORTDOCS%%%%DOCSDIR%%/pipeline.html %%PORTDOCS%%%%DOCSDIR%%/piperw.html %%PORTDOCS%%%%DOCSDIR%%/posix-cd.html %%PORTDOCS%%%%DOCSDIR%%/posix-umask.html %%PORTDOCS%%%%DOCSDIR%%/redirfd.html %%PORTDOCS%%%%DOCSDIR%%/runblock.html %%PORTDOCS%%%%DOCSDIR%%/shift.html %%PORTDOCS%%%%DOCSDIR%%/trap.html %%PORTDOCS%%%%DOCSDIR%%/tryexec.html %%PORTDOCS%%%%DOCSDIR%%/unexport.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/wait.html %%PORTDOCS%%%%DOCSDIR%%/withstdinas.html diff --git a/sysutils/s6-rc/Makefile b/sysutils/s6-rc/Makefile index 662e9f1f885a..5ff5a36a799b 100644 --- a/sysutils/s6-rc/Makefile +++ b/sysutils/s6-rc/Makefile @@ -1,49 +1,68 @@ # Created by: Andris Raugulis PORTNAME= s6-rc -PORTVERSION= 0.5.2.2 +PORTVERSION= 0.5.3.2 CATEGORIES= sysutils MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ MAINTAINER= crest@rlwinm.de COMMENT= Skarnet.org service manager LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= execline>=2.7.0.0:lang/execline \ - skalibs>=2.10.0.0:devel/skalibs \ - s6>=2.10.0.0:sysutils/s6 -RUN_DEPENDS= execline>=2.7.0.0:lang/execline \ - skalibs>=2.10.0.0:devel/skalibs \ - s6>=2.10.0.0:sysutils/s6 +BUILD_DEPENDS= execline>=2.9.0.0:lang/execline \ + skalibs>=2.12.0.0:devel/skalibs \ + s6>=2.11.1.0:sysutils/s6 +RUN_DEPENDS= execline>=2.9.0.0:lang/execline \ + skalibs>=2.12.0.0:devel/skalibs \ + s6>=2.11.1.0:sysutils/s6 LIB_DEPENDS= libs6.so:sysutils/s6 \ libskarnet.so:devel/skalibs USES= gmake USE_LDCONFIG= yes HAS_CONFIGURE= yes + +FLAVORS= hier run +FLAVOR?= ${FLAVORS:[1]} +run_PKGNAMESUFFIX= -run + +# The only difference between the hier and the run flavors is the default live directory path +# hard coded into the s6-rc utilities allowing their use without passing -l . +# A FreeBSD port should follow the operating system file system layout, but there is a corner +# case where s6-rc replacing base system init system *has* to deviate from hier(7). +# The problem is that s6-rc requires a writeable file system +# (to track service state, bind unix sockets, create named fifos) +# very early in the boot process before FreeBSD used to mount /var and /var/run. +# One way to satisfy this requirement is to mount a tmpfs directly under /. +# The live directory shouldn't be kept on /tmp because this often a small +# file system that could be exhausted by accident breaking s6-rc. +# Adding a small /run tmpfs dedicated to s6-rc solves this problem. +.if ${FLAVOR} == run # Follow hier(7) +LIVEDIR?= /run/${PORTNAME} +.endif +LIVEDIR?= /var/run/${PORTNAME} + CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-include=${LOCALBASE}/include \ --with-lib=${LOCALBASE}/lib/skalibs \ --with-lib=${LOCALBASE}/lib/execline \ --with-lib=${LOCALBASE}/lib/s6 \ --with-dynlib=${LOCALBASE}/lib \ --livedir=${LIVEDIR} \ --enable-shared -LIVEDIR?= /var/run/${PORTNAME} - DOCS= AUTHORS COPYING INSTALL README doc/*.html OPTIONS_DEFINE= DOCS post-install: .for d in bin libexec ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${d}/* .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6rc.so.${PORTVERSION} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/s6-rc/distinfo b/sysutils/s6-rc/distinfo index 601118bb1391..6e41c7be9bc2 100644 --- a/sysutils/s6-rc/distinfo +++ b/sysutils/s6-rc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618496375 -SHA256 (s6-rc-0.5.2.2.tar.gz) = 2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89 -SIZE (s6-rc-0.5.2.2.tar.gz) = 98158 +TIMESTAMP = 1656027080 +SHA256 (s6-rc-0.5.3.2.tar.gz) = 4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038 +SIZE (s6-rc-0.5.3.2.tar.gz) = 99249 diff --git a/sysutils/s6-rc/pkg-plist b/sysutils/s6-rc/pkg-plist index abe45f02e6d9..b7cf1c91e046 100644 --- a/sysutils/s6-rc/pkg-plist +++ b/sysutils/s6-rc/pkg-plist @@ -1,39 +1,39 @@ bin/s6-rc bin/s6-rc-bundle bin/s6-rc-compile bin/s6-rc-db bin/s6-rc-dryrun bin/s6-rc-format-upgrade bin/s6-rc-init bin/s6-rc-update include/s6-rc/config.h include/s6-rc/s6rc-constants.h include/s6-rc/s6rc-db.h include/s6-rc/s6rc-servicedir.h include/s6-rc/s6rc-utils.h include/s6-rc/s6rc.h lib/libs6rc.so lib/libs6rc.so.0.5 -lib/libs6rc.so.0.5.2.2 +lib/libs6rc.so.0.5.3.2 lib/s6-rc/libs6rc.a libexec/s6-rc-fdholder-filler libexec/s6-rc-oneshot-run %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/overview.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-bundle.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-compile.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-db.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-dryrun.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-fdholder-filler.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-format-upgrade.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-init.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-oneshot-run.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-update.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/why.html diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile index 0c5abc46a0ed..88cf56f66555 100644 --- a/sysutils/s6/Makefile +++ b/sysutils/s6/Makefile @@ -1,58 +1,58 @@ # Created by: Colin Booth PORTNAME= s6 -PORTVERSION= 2.10.0.3 +PORTVERSION= 2.11.1.1 CATEGORIES= sysutils MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/ MAINTAINER= crest@rlwinm.de COMMENT= Skarnet.org supervision suite LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= execline>=2.7.0.0:lang/execline +BUILD_DEPENDS= execline>=2.9.0.0:lang/execline LIB_DEPENDS= libskarnet.so:devel/skalibs RUN_DEPENDS= execlineb:lang/execline USES= gmake USE_LDCONFIG= yes USE_RC_SUBR= s6 SERVICE_DIR?= /var/service SUB_FILES= s6-svscan_finish s6-svscan-log_run s6-svscanboot s6-svscan_env_PATH SUB_LIST= SERVICE_DIR="${SERVICE_DIR}" HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-default-path=${LOCALBASE}/bin:/usr/bin:/bin \ --with-include=${LOCALBASE}/include \ --with-dynlib=${LOCALBASE}/lib \ --with-lib=${LOCALBASE}/lib/skalibs \ --with-lib=${LOCALBASE}/lib/execline \ --enable-shared OPTIONS_DEFINE= DOCS DOCS= AUTHORS README doc/*.html post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan_finish \ ${STAGEDIR}${ETCDIR}/s6-svscan/finish.sample cd ${WRKDIR} && ${INSTALL_DATA} s6-svscan_env_PATH \ ${STAGEDIR}${ETCDIR}/s6-svscan/env/PATH.sample @${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan-log cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan-log_run \ ${STAGEDIR}${ETCDIR}/s6-svscan-log/run.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo index 6bf02d5875c3..8e0f876eed85 100644 --- a/sysutils/s6/distinfo +++ b/sysutils/s6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618496369 -SHA256 (s6-2.10.0.3.tar.gz) = 1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757 -SIZE (s6-2.10.0.3.tar.gz) = 218797 +TIMESTAMP = 1656025725 +SHA256 (s6-2.11.1.1.tar.gz) = 1cef7f7b3a7e01181fbb6fe8300e6ba422d9689007221c78af1f99528acb6c38 +SIZE (s6-2.11.1.1.tar.gz) = 228878 diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist index 109ac17ba4e4..6735415a3a63 100644 --- a/sysutils/s6/pkg-plist +++ b/sysutils/s6/pkg-plist @@ -1,144 +1,150 @@ bin/s6-accessrules-cdb-from-fs bin/s6-accessrules-fs-from-cdb bin/s6-applyuidgid bin/s6-cleanfifodir bin/s6-connlimit bin/s6-envdir bin/s6-envuidgid bin/s6-fdholder-daemon bin/s6-fdholder-delete bin/s6-fdholder-getdump bin/s6-fdholder-list bin/s6-fdholder-retrieve bin/s6-fdholder-setdump bin/s6-fdholder-store bin/s6-fdholder-transferdump bin/s6-fdholderd bin/s6-fghack bin/s6-ftrig-listen bin/s6-ftrig-listen1 bin/s6-ftrig-notify bin/s6-ftrig-wait bin/s6-ftrigrd bin/s6-ioconnect bin/s6-ipcclient bin/s6-ipcserver bin/s6-ipcserver-access bin/s6-ipcserver-socketbinder bin/s6-ipcserverd bin/s6-log bin/s6-mkfifodir bin/s6-notifyoncheck bin/s6-permafailon bin/s6-setlock bin/s6-setsid bin/s6-setuidgid +bin/s6-socklog bin/s6-softlimit bin/s6-sudo bin/s6-sudoc bin/s6-sudod bin/s6-supervise bin/s6-svc bin/s6-svdt bin/s6-svdt-clear +bin/s6-svlink bin/s6-svlisten bin/s6-svlisten1 bin/s6-svok bin/s6-svperms bin/s6-svscan bin/s6-svscanboot bin/s6-svscanctl bin/s6-svstat +bin/s6-svunlink bin/s6-svwait bin/s6-tai64n bin/s6-tai64nlocal bin/s6-usertree-maker bin/s6lockd bin/ucspilogd @sample %%ETCDIR%%/s6-svscan-log/run.sample @sample %%ETCDIR%%/s6-svscan/env/PATH.sample @sample %%ETCDIR%%/s6-svscan/finish.sample include/s6/accessrules.h include/s6/compat.h include/s6/config.h +include/s6/fdholder.h include/s6/ftrigr.h include/s6/ftrigw.h -include/s6/s6-fdholder.h -include/s6/s6-supervise.h +include/s6/lock.h include/s6/s6.h -include/s6/s6lock.h +include/s6/supervise.h lib/libs6.so -lib/libs6.so.2.10 -lib/libs6.so.2.10.0.3 +lib/libs6.so.2.11 +lib/libs6.so.2.11.1.1 lib/s6/libs6.a libexec/s6lockd-helper %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fifodir.html %%PORTDOCS%%%%DOCSDIR%%/ftrig.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/localservice.html %%PORTDOCS%%%%DOCSDIR%%/notifywhenup.html %%PORTDOCS%%%%DOCSDIR%%/overview.html %%PORTDOCS%%%%DOCSDIR%%/s6-accessrules-cdb-from-fs.html %%PORTDOCS%%%%DOCSDIR%%/s6-accessrules-fs-from-cdb.html %%PORTDOCS%%%%DOCSDIR%%/s6-applyuidgid.html %%PORTDOCS%%%%DOCSDIR%%/s6-cleanfifodir.html %%PORTDOCS%%%%DOCSDIR%%/s6-connlimit.html %%PORTDOCS%%%%DOCSDIR%%/s6-envdir.html %%PORTDOCS%%%%DOCSDIR%%/s6-envuidgid.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-daemon.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-delete.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-errorcodes.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-getdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-list.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-retrieve.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-setdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-store.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-transferdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholderd.html %%PORTDOCS%%%%DOCSDIR%%/s6-fghack.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-listen.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-listen1.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-notify.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-wait.html %%PORTDOCS%%%%DOCSDIR%%/s6-ioconnect.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcclient.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver-access.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver-socketbinder.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserverd.html %%PORTDOCS%%%%DOCSDIR%%/s6-log.html %%PORTDOCS%%%%DOCSDIR%%/s6-mkfifodir.html %%PORTDOCS%%%%DOCSDIR%%/s6-notifyoncheck.html %%PORTDOCS%%%%DOCSDIR%%/s6-permafailon.html %%PORTDOCS%%%%DOCSDIR%%/s6-setlock.html %%PORTDOCS%%%%DOCSDIR%%/s6-setsid.html %%PORTDOCS%%%%DOCSDIR%%/s6-setuidgid.html +%%PORTDOCS%%%%DOCSDIR%%/s6-socklog.html %%PORTDOCS%%%%DOCSDIR%%/s6-softlimit.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudo.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudoc.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudod.html %%PORTDOCS%%%%DOCSDIR%%/s6-supervise.html %%PORTDOCS%%%%DOCSDIR%%/s6-svc.html %%PORTDOCS%%%%DOCSDIR%%/s6-svdt-clear.html %%PORTDOCS%%%%DOCSDIR%%/s6-svdt.html +%%PORTDOCS%%%%DOCSDIR%%/s6-svlink.html %%PORTDOCS%%%%DOCSDIR%%/s6-svlisten.html %%PORTDOCS%%%%DOCSDIR%%/s6-svlisten1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svok.html %%PORTDOCS%%%%DOCSDIR%%/s6-svperms.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan-1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan-not-1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscanctl.html %%PORTDOCS%%%%DOCSDIR%%/s6-svstat.html +%%PORTDOCS%%%%DOCSDIR%%/s6-svunlink.html %%PORTDOCS%%%%DOCSDIR%%/s6-svwait.html %%PORTDOCS%%%%DOCSDIR%%/s6-tai64n.html %%PORTDOCS%%%%DOCSDIR%%/s6-tai64nlocal.html %%PORTDOCS%%%%DOCSDIR%%/s6-usertree-maker.html %%PORTDOCS%%%%DOCSDIR%%/scandir.html %%PORTDOCS%%%%DOCSDIR%%/servicedir.html %%PORTDOCS%%%%DOCSDIR%%/socket-activation.html %%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/why.html