diff options
| -rw-r--r-- | UPDATING | 9 | ||||
| -rw-r--r-- | sysutils/s6/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/s6/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/s6/files/s6-svscan-log_run.in | 2 | ||||
| -rw-r--r-- | sysutils/s6/files/s6.in | 2 | ||||
| -rw-r--r-- | sysutils/s6/pkg-plist | 5 |
6 files changed, 20 insertions, 11 deletions
@@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150816: + AFFECTS: users of sysutils/s6 + AUTHOR: Colin Booth <colin@heliocat.net> + + s6-notifywhenup is deprecated and will be removed in the next version + of s6. Any run scripts depending on that program should be updated to + use an in-servicedir notification-fd file as described under + "Readyness notification support" in s6-supervise.html. + 20150812: AFFECTS: users of net-mgmt/icinga and net-mgmt/icinga2 AUTHOR: lme@FreeBSD.org diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile index e09e523530e8..8a3cca27a29d 100644 --- a/sysutils/s6/Makefile +++ b/sysutils/s6/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= s6 -PORTVERSION= 2.1.1.1 +PORTVERSION= 2.1.6.0 CATEGORIES= sysutils MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ @@ -11,8 +11,8 @@ COMMENT= skarnet.org supervision suite LICENSE= ISCL -BUILD_DEPENDS= skalibs>=2.3.0.0:${PORTSDIR}/devel/skalibs \ - execline>=2.0.2.1:${PORTSDIR}/lang/execline +BUILD_DEPENDS= skalibs>=2.3.5.1:${PORTSDIR}/devel/skalibs \ + execline>=2.1.2.2:${PORTSDIR}/lang/execline RUN_DEPENDS= execlineb:${PORTSDIR}/lang/execline USES= gmake @@ -21,8 +21,6 @@ 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}" -DOCS= AUTHORS COPYING INSTALL README doc/*.html - USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} \ @@ -32,6 +30,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-lib=${LOCALBASE}/lib/execline \ --enable-shared +DOCS= AUTHORS COPYING INSTALL README doc/*.html OPTIONS_DEFINE= DOCS post-install: diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo index 0ffb4927079d..9c458872058b 100644 --- a/sysutils/s6/distinfo +++ b/sysutils/s6/distinfo @@ -1,2 +1,2 @@ -SHA256 (s6-2.1.1.1.tar.gz) = 857c841cb80935a945347c768981b729f11a6a441140744f58f3e3316b9ef336 -SIZE (s6-2.1.1.1.tar.gz) = 180033 +SHA256 (s6-2.1.6.0.tar.gz) = a4e977253fbe130788b721ae51a70680b71f4dfe3c02ebb1db0472e21548d467 +SIZE (s6-2.1.6.0.tar.gz) = 191362 diff --git a/sysutils/s6/files/s6-svscan-log_run.in b/sysutils/s6/files/s6-svscan-log_run.in index ed75acfd1d4a..0686aa76b175 100644 --- a/sysutils/s6/files/s6-svscan-log_run.in +++ b/sysutils/s6/files/s6-svscan-log_run.in @@ -3,4 +3,4 @@ redirfd -w 2 /dev/console redirfd -rnb 0 fifo s6-setuidgid nobody exec -c -s6-log -bt /tmp/uncaught-logs +s6-log -b t /tmp/uncaught-logs diff --git a/sysutils/s6/files/s6.in b/sysutils/s6/files/s6.in index a62d31d51616..838e89caa36e 100644 --- a/sysutils/s6/files/s6.in +++ b/sysutils/s6/files/s6.in @@ -28,7 +28,7 @@ s6_svc=${s6_path}/.s6-svscan command="%%PREFIX%%/bin/s6-svscanboot" start_cmd=s6_start stop_cmd="%%PREFIX%%/bin/s6-svscanctl -t ${s6_path}" -stop_postcmd="%%PREFIX%%/bin/s6-svc -k ${s6_log}/" +stop_postcmd="%%PREFIX%%/bin/s6-svc -h ${s6_log}/" s6_start() { diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist index 842a5e951493..234de0d45087 100644 --- a/sysutils/s6/pkg-plist +++ b/sysutils/s6/pkg-plist @@ -69,8 +69,8 @@ include/s6/s6lock.h lib/libs6.so lib/libs6.so.2 lib/libs6.so.2.1 -lib/libs6.so.2.1.1 -lib/libs6.so.2.1.1.1 +lib/libs6.so.2.1.6 +lib/libs6.so.2.1.6.0 lib/s6/libs6.a libexec/s6lockd-helper sbin/s6-applyuidgid @@ -84,6 +84,7 @@ sbin/s6-setuidgid %%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 |