Mon Apr 26 15:03:53 2021 UTC ()
Update to 2.10.0.3. From the changelog:

- Libraries and binaries don't have the .note.GNU-stack section stripped
  anymore. Previously, "make strip" would strip that section, which
  would sometimes (depending on the toolchain) cause binaries to be
  incorrectly tagged as needing an executable stack. This is not a
  security issue in itself, but an executable stack makes it easier for
  an attacker to turn bugs into exploits, so it should be avoided
  whenever possible. Thanks to Xavier Stonestreet for reporting and
  finding the cause of the problem.

- Link tests are now performed with a regular file as their
  output, instead of /dev/null, which makes them more portable to
  old/buggy linkers.

Bump default BUILDLINK_API_DEPENDS to match.


(schmonz)
diff -r1.6 -r1.7 pkgsrc/sysutils/s6/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/s6/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/sysutils/s6/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/s6/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/s6/Makefile 2021/02/17 19:31:00 1.6
+++ pkgsrc/sysutils/s6/Makefile 2021/04/26 15:03:53 1.7
@@ -1,41 +1,38 @@ @@ -1,41 +1,38 @@
1# $NetBSD: Makefile,v 1.6 2021/02/17 19:31:00 schmonz Exp $ 1# $NetBSD: Makefile,v 1.7 2021/04/26 15:03:53 schmonz Exp $
2 2
3DISTNAME= s6-2.10.0.2 3DISTNAME= s6-2.10.0.3
4PKGREVISION= 1 
5CATEGORIES= sysutils 4CATEGORIES= sysutils
6MASTER_SITES= ${HOMEPAGE} 5MASTER_SITES= ${HOMEPAGE}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
8 7
9MAINTAINER= cfkoch@edgebsd.org 8MAINTAINER= cfkoch@edgebsd.org
10HOMEPAGE= https://skarnet.org/software/s6/ 9HOMEPAGE= https://skarnet.org/software/s6/
11COMMENT= The s6 supervision suite 10COMMENT= The s6 supervision suite
12LICENSE= isc 11LICENSE= isc
13 12
14MANPAGES= v2.10.0.2.1.tar.gz 13MANPAGES= v2.10.0.3.1.tar.gz
15SITES.${MANPAGES}= https://github.com/flexibeast/s6-man-pages/archive/ 14SITES.${MANPAGES}= ${MASTER_SITE_GITHUB:=flexibeast/s6-man-pages/archive/}
16 15
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
19CONFIGURE_ARGS+= --prefix=${PREFIX} 18CONFIGURE_ARGS+= --prefix=${PREFIX}
20CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps 19CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
21CONFIGURE_ARGS+= --with-lib=${PREFIX}/lib/execline 20CONFIGURE_ARGS+= --with-lib=${PREFIX}/lib/execline
22CONFIGURE_ARGS+= --with-lib=${PREFIX}/lib/skalibs 21CONFIGURE_ARGS+= --with-lib=${PREFIX}/lib/skalibs
23CONFIGURE_ARGS+= --with-include=${PREFIX}/include 22CONFIGURE_ARGS+= --with-include=${PREFIX}/include
24 23
25INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 24INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7
26 25
27.PHONY: do-install-manpages 26.PHONY: do-install-manpages
28post-install: do-install-manpages 27post-install: do-install-manpages
29do-install-manpages: 28do-install-manpages:
30 cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \ 29 cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \
31 for j in *.$$i; do \ 30 for j in *.$$i; do \
32 ${INSTALL_MAN} $$j \ 31 ${INSTALL_MAN} $$j \
33 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \ 32 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \
34 done \ 33 done \
35 done 34 done
36 35
37BUILDLINK_API_DEPENDS.skalibs+= skalibs>=2.10.0.2 
38.include "../../devel/skalibs/buildlink3.mk" 36.include "../../devel/skalibs/buildlink3.mk"
39BUILDLINK_API_DEPENDS.execline+= execline>=2.7.0.1 
40.include "../../lang/execline/buildlink3.mk" 37.include "../../lang/execline/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/s6/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/s6/buildlink3.mk 2020/11/19 20:00:05 1.1
+++ pkgsrc/sysutils/s6/buildlink3.mk 2021/04/26 15:03:53 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.1 2020/11/19 20:00:05 schmonz Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2021/04/26 15:03:53 schmonz Exp $
2 2
3BUILDLINK_TREE+= s6 3BUILDLINK_TREE+= s6
4 4
5.if !defined(S6_BUILDLINK3_MK) 5.if !defined(S6_BUILDLINK3_MK)
6S6_BUILDLINK3_MK:= 6S6_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.s6+= s6>=2.9.2.0 8BUILDLINK_API_DEPENDS.s6+= s6>=2.10.0.3
9BUILDLINK_PKGSRCDIR.s6?= ../../sysutils/s6 9BUILDLINK_PKGSRCDIR.s6?= ../../sysutils/s6
10BUILDLINK_INCDIRS.s6+= include/s6 10BUILDLINK_INCDIRS.s6+= include/s6
11BUILDLINK_LIBDIRS.s6+= lib/s6 11BUILDLINK_LIBDIRS.s6+= lib/s6
12BUILDLINK_DEPMETHOD.s6?= build 12BUILDLINK_DEPMETHOD.s6?= build
13.endif # S6_BUILDLINK3_MK 13.endif # S6_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -s6 15BUILDLINK_TREE+= -s6
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/s6/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/s6/distinfo 2021/02/17 19:31:00 1.5
+++ pkgsrc/sysutils/s6/distinfo 2021/04/26 15:03:53 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2021/02/17 19:31:00 schmonz Exp $ 1$NetBSD: distinfo,v 1.6 2021/04/26 15:03:53 schmonz Exp $
2 2
3SHA1 (s6-2.10.0.2.tar.gz) = 62008ef6d75abacb7ef5183242fb2eb82488f0b6 3SHA1 (s6-2.10.0.3.tar.gz) = d676f72d8bd2772e22b8a2967b6b7dcf6de62968
4RMD160 (s6-2.10.0.2.tar.gz) = 3a5fad80e78c0d4f469592fde637dba38a16e654 4RMD160 (s6-2.10.0.3.tar.gz) = 856a75907c5488e3b7da845249d6c171bc5e92fc
5SHA512 (s6-2.10.0.2.tar.gz) = d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc 5SHA512 (s6-2.10.0.3.tar.gz) = 67261036498dd0f7857e4b05082eb5662997ebbf7642c1477262f486208361b827aa7ac6f36e1e0e78d7922a0018c52ee9992406b52df668a5dfaab76a6fe7c2
6Size (s6-2.10.0.2.tar.gz) = 218590 bytes 6Size (s6-2.10.0.3.tar.gz) = 218797 bytes
7SHA1 (v2.10.0.2.1.tar.gz) = 086559c23a608dba233750934ec9cc82c2aa33c8 7SHA1 (v2.10.0.3.1.tar.gz) = 09d2142c742228c36e5651f250fc62dad70a6cae
8RMD160 (v2.10.0.2.1.tar.gz) = 303bcd7f3ee84f99d25c6fd800feaf4e409235d3 8RMD160 (v2.10.0.3.1.tar.gz) = f4518dd02fa68acde59f71e540124a4848bc04c0
9SHA512 (v2.10.0.2.1.tar.gz) = bbdf5410b8898d4ffb2e1f69ecf8ae359cbddb06ee6cd7901416ab86a949b7c9a7404939d787ee48e719aac464944a3f2c764e54c93018411c088dc65d69390f 9SHA512 (v2.10.0.3.1.tar.gz) = 129dfe619f6e656e13bf4f650fa656e36622b6d29ea9a559f56740301dd69359b8f1f7b96d7199d15292e09b8555b1b3fa8ca9ff457e37806fb69cf7f0f28aa0
10Size (v2.10.0.2.1.tar.gz) = 83557 bytes 10Size (v2.10.0.3.1.tar.gz) = 83576 bytes