git: f7b021321076 - main - sysutils/s6-rc: update to 0.5.3.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Jun 2022 12:27:16 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f7b02132107602cb413f5c07a50abe3bc9524798
commit f7b02132107602cb413f5c07a50abe3bc9524798
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2022-06-26 12:26:31 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2022-06-26 12:27:08 +0000
sysutils/s6-rc: update to 0.5.3.2
sysutils/s6-rc: update to 0.5.3.2
sysutils/s6: update to 2.11.1.1
lang/execline: update to 2.9.0.0
devel/skalibs: update to 2.12.0.1
PR: 234939
---
devel/skalibs/Makefile | 4 ++--
devel/skalibs/distinfo | 6 +++---
devel/skalibs/pkg-plist | 18 ++++++------------
lang/execline/Makefile | 4 ++--
lang/execline/distinfo | 6 +++---
lang/execline/pkg-plist | 6 ++++--
sysutils/s6-rc/Makefile | 37 ++++++++++++++++++++++++++++---------
sysutils/s6-rc/distinfo | 6 +++---
sysutils/s6-rc/pkg-plist | 2 +-
sysutils/s6/Makefile | 4 ++--
sysutils/s6/distinfo | 6 +++---
sysutils/s6/pkg-plist | 16 +++++++++++-----
12 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/devel/skalibs/Makefile b/devel/skalibs/Makefile
index 958aed6f2aa3..8f4d478377e7 100644
--- a/devel/skalibs/Makefile
+++ b/devel/skalibs/Makefile
@@ -1,7 +1,7 @@
# Created by: Sergei Kolobov <sergei@kolobov.com>
PORTNAME= skalibs
-PORTVERSION= 2.10.0.3
+PORTVERSION= 2.12.0.1
CATEGORIES= devel
MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/
@@ -29,7 +29,7 @@ post-install:
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
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
@@ -6,15 +6,15 @@ 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
@@ -25,7 +25,6 @@ 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
@@ -36,20 +35,16 @@ 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
@@ -83,8 +78,8 @@ 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
@@ -99,9 +94,9 @@ lib/skalibs/sysdeps/util.lib
%%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
@@ -113,7 +108,7 @@ lib/skalibs/sysdeps/util.lib
%%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
@@ -126,7 +121,6 @@ lib/skalibs/sysdeps/util.lib
%%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
diff --git a/lang/execline/Makefile b/lang/execline/Makefile
index ebc67431860b..fde77f8b83a4 100644
--- a/lang/execline/Makefile
+++ b/lang/execline/Makefile
@@ -1,7 +1,7 @@
# Created by: Sergei Kolobov <sergei@kolobov.com>
PORTNAME= execline
-PORTVERSION= 2.8.0.1
+PORTVERSION= 2.9.0.0
CATEGORIES= lang shells
MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/
@@ -11,7 +11,7 @@ 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
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,5 +1,6 @@
bin/background
bin/backtick
+bin/case
bin/cd
bin/define
bin/dollarat
@@ -52,12 +53,13 @@ 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
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,7 +1,7 @@
# Created by: Andris Raugulis <moo@arthepsy.eu>
PORTNAME= s6-rc
-PORTVERSION= 0.5.2.2
+PORTVERSION= 0.5.3.2
CATEGORIES= sysutils
MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/
@@ -11,12 +11,12 @@ 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
@@ -24,6 +24,27 @@ 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 <live_dir>.
+# 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 \
@@ -33,8 +54,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
--livedir=${LIVEDIR} \
--enable-shared
-LIVEDIR?= /var/run/${PORTNAME}
-
DOCS= AUTHORS COPYING INSTALL README doc/*.html
OPTIONS_DEFINE= DOCS
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
@@ -14,7 +14,7 @@ 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
diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
index 0c5abc46a0ed..88cf56f66555 100644
--- a/sysutils/s6/Makefile
+++ b/sysutils/s6/Makefile
@@ -1,7 +1,7 @@
# Created by: Colin Booth <colin@heliocat.net>
PORTNAME= s6
-PORTVERSION= 2.10.0.3
+PORTVERSION= 2.11.1.1
CATEGORIES= sysutils
MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/
@@ -11,7 +11,7 @@ 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
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
@@ -33,6 +33,7 @@ bin/s6-permafailon
bin/s6-setlock
bin/s6-setsid
bin/s6-setuidgid
+bin/s6-socklog
bin/s6-softlimit
bin/s6-sudo
bin/s6-sudoc
@@ -41,6 +42,7 @@ 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
@@ -49,6 +51,7 @@ bin/s6-svscan
bin/s6-svscanboot
bin/s6-svscanctl
bin/s6-svstat
+bin/s6-svunlink
bin/s6-svwait
bin/s6-tai64n
bin/s6-tai64nlocal
@@ -61,15 +64,15 @@ bin/ucspilogd
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
@@ -115,6 +118,7 @@ libexec/s6lockd-helper
%%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
@@ -123,6 +127,7 @@ libexec/s6lockd-helper
%%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
@@ -132,6 +137,7 @@ libexec/s6lockd-helper
%%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