Attachment 240185 Details for Bug 269592 – Update s6 to 2.11.2.0

[patch] Update s6 to 2.11.2.0

0001-Update-sysutils-s6-port-to-version-2.11.2.0.patch (text/plain), 4.60 KB, created by crest on 2023-02-16 16:57:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: crest

Created: 2023-02-16 16:57:23 UTC

Size: 4.60 KB

patch

obsolete

>From a5fd2a0835f1ee760384537b97aa0e50189bb6b3 Mon Sep 17 00:00:00 2001
>From: Jan Bramkamp <crest@rlwinm.de>
>Date: Thu, 16 Feb 2023 17:43:30 +0100
>Subject: [PATCH] Update sysutils/s6 port to version 2.11.2.0
>
>This update is part of the January 2023 release.
>
>Changes from 2.11.1.1 to 2.11.2.0 as listed in the NEWS file:
>  - Adaptation to skalibs-2.13.0.0.
>  - Bugfixes.
>  - New s6-svc -D and s6-svc -U commands.
>  - The name of the service is now passed as an argument to ./run and
>    as the third argument to ./finish.
>  - The 1-second service restart delay can now only be skipped when
>    the service is ready.
>  - New s6-log directive: p, to set a log line prefix.
>  - Implementation of instances! New programs: s6-instance-maker,
>    s6-instance-create, s6-instance-delete, s6-instance-control,
>    s6-instance-status, s6-instance-list.
>
>Links:
>  * Release e-mail: [announce] skarnet.org January 2023 release
>    https://skarnet.org/lists/skaware/1758.html
>
>  * PR #269592: sysutils/s6: Update s6 to version 2.11.2.0
>    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269592
>---
> sysutils/s6/Makefile  |  5 +++--
> sysutils/s6/distinfo  |  6 +++---
> sysutils/s6/pkg-plist | 21 ++++++++++++++++++++-
> 3 files changed, 26 insertions(+), 6 deletions(-)
>
>diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
>index 04a4d1b19e20..5be0b5ee2b78 100644
>--- a/sysutils/s6/Makefile
>+++ b/sysutils/s6/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	s6
>-PORTVERSION=	2.11.1.1
>+PORTVERSION=	2.11.2.0
> CATEGORIES=	sysutils
> MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
> 
>@@ -10,7 +10,7 @@ WWW=		https://www.skarnet.org/software/s6/
> LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	execline>=2.9.0.0:lang/execline
>+BUILD_DEPENDS=	execline>=2.9.1.0:lang/execline
> LIB_DEPENDS=	libskarnet.so:devel/skalibs
> RUN_DEPENDS=	execlineb:lang/execline
> 
>@@ -38,6 +38,7 @@ DOCS=		AUTHORS README doc/*.html
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper
> 	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \
> 		${STAGEDIR}${PREFIX}/bin
>diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo
>index 8e0f876eed85..5967a860e4ce 100644
>--- a/sysutils/s6/distinfo
>+++ b/sysutils/s6/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1656025725
>-SHA256 (s6-2.11.1.1.tar.gz) = 1cef7f7b3a7e01181fbb6fe8300e6ba422d9689007221c78af1f99528acb6c38
>-SIZE (s6-2.11.1.1.tar.gz) = 228878
>+TIMESTAMP = 1676558034
>+SHA256 (s6-2.11.2.0.tar.gz) = 9fb43690e6018d94733b4dc18cc6926f02454508a4dd86060c9b4b9d20dc8037
>+SIZE (s6-2.11.2.0.tar.gz) = 246294
>diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist
>index 6735415a3a63..b96314d9ef5b 100644
>--- a/sysutils/s6/pkg-plist
>+++ b/sysutils/s6/pkg-plist
>@@ -20,6 +20,12 @@ bin/s6-ftrig-listen1
> bin/s6-ftrig-notify
> bin/s6-ftrig-wait
> bin/s6-ftrigrd
>+bin/s6-instance-control
>+bin/s6-instance-create
>+bin/s6-instance-delete
>+bin/s6-instance-list
>+bin/s6-instance-maker
>+bin/s6-instance-status
> bin/s6-ioconnect
> bin/s6-ipcclient
> bin/s6-ipcserver
>@@ -62,6 +68,7 @@ bin/ucspilogd
> @sample %%ETCDIR%%/s6-svscan/env/PATH.sample
> @sample %%ETCDIR%%/s6-svscan/finish.sample
> include/s6/accessrules.h
>+include/s6/auto.h
> include/s6/compat.h
> include/s6/config.h
> include/s6/fdholder.h
>@@ -69,17 +76,23 @@ include/s6/ftrigr.h
> include/s6/ftrigw.h
> include/s6/lock.h
> include/s6/s6.h
>+include/s6/servicedir.h
> include/s6/supervise.h
> lib/libs6.so
> lib/libs6.so.2.11
>-lib/libs6.so.2.11.1.1
>+lib/libs6.so.2.11.2.0
>+lib/libs6auto.so
>+lib/libs6auto.so.2.11
>+lib/libs6auto.so.2.11.2.0
> lib/s6/libs6.a
>+lib/s6/libs6auto.a
> libexec/s6lockd-helper
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/fifodir.html
> %%PORTDOCS%%%%DOCSDIR%%/ftrig.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/instances.html
> %%PORTDOCS%%%%DOCSDIR%%/localservice.html
> %%PORTDOCS%%%%DOCSDIR%%/notifywhenup.html
> %%PORTDOCS%%%%DOCSDIR%%/overview.html
>@@ -105,6 +118,12 @@ libexec/s6lockd-helper
> %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-listen1.html
> %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-notify.html
> %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-wait.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-control.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-create.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-delete.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-list.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-maker.html
>+%%PORTDOCS%%%%DOCSDIR%%/s6-instance-status.html
> %%PORTDOCS%%%%DOCSDIR%%/s6-ioconnect.html
> %%PORTDOCS%%%%DOCSDIR%%/s6-ipcclient.html
> %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver-access.html
>-- 
>2.39.1
>

Flags:

crest: maintainer-approval+

Actions: View | Diff

Attachments on bug 269592: 240185