Skip to content

Commit

Permalink
Update to 2.4.1.1. From the changelog:
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
schmonz committed Apr 26, 2021
1 parent 6a1b126 commit bbb4a8e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
11 changes: 4 additions & 7 deletions net/s6-networking/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2021/02/16 14:07:52 schmonz Exp $
# $NetBSD: Makefile,v 1.9 2021/04/26 15:05:30 schmonz Exp $

DISTNAME= s6-networking-2.4.1.0
DISTNAME= s6-networking-2.4.1.1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
Expand All @@ -10,8 +10,8 @@ HOMEPAGE= https://skarnet.org/software/s6-networking/
COMMENT= Suite of small networking utilities
LICENSE= isc

MANPAGES= v2.4.0.0.2.tar.gz
SITES.${MANPAGES}= https://github.com/flexibeast/s6-networking-man-pages/archive/
MANPAGES= v2.4.1.1.1.tar.gz
SITES.${MANPAGES}= ${MASTER_SITE_GITHUB:=flexibeast/s6-networking-man-pages/archive/}

USE_TOOLS+= gmake
HAS_CONFIGURE= yes
Expand All @@ -33,10 +33,7 @@ do-install-manpages:
done \
done

BUILDLINK_API_DEPENDS.skalibs+= skalibs>=2.10.0.2
.include "../../devel/skalibs/buildlink3.mk"
BUILDLINK_API_DEPENDS.s6-dns+= s6-dns>=2.3.5.0
.include "../../net/s6-dns/buildlink3.mk"
BUILDLINK_API_DEPENDS.s6+= s6>=2.10.0.2
.include "../../sysutils/s6/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
4 changes: 2 additions & 2 deletions net/s6-networking/buildlink3.mk
@@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.1 2020/11/19 20:12:54 schmonz Exp $
# $NetBSD: buildlink3.mk,v 1.2 2021/04/26 15:05:30 schmonz Exp $

BUILDLINK_TREE+= s6-networking

.if !defined(S6_NETWORKING_BUILDLINK3_MK)
S6_NETWORKING_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.3.2.0
BUILDLINK_API_DEPENDS.s6-networking+= s6-networking>=2.4.1.1
BUILDLINK_PKGSRCDIR.s6-networking?= ../../net/s6-networking
BUILDLINK_INCDIRS.s6-networking+= include/s6-networking
BUILDLINK_LIBDIRS.s6-networking+= lib/s6-networking
Expand Down
18 changes: 9 additions & 9 deletions net/s6-networking/distinfo
@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.5 2021/02/16 14:07:52 schmonz Exp $
$NetBSD: distinfo,v 1.6 2021/04/26 15:05:30 schmonz Exp $

SHA1 (s6-networking-2.4.1.0.tar.gz) = 72f1c499e625f292e9986be925452667a66839cc
RMD160 (s6-networking-2.4.1.0.tar.gz) = 085c0fafd60247d404e0aeeae7cad8c160e5371e
SHA512 (s6-networking-2.4.1.0.tar.gz) = 4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22
Size (s6-networking-2.4.1.0.tar.gz) = 103240 bytes
SHA1 (v2.4.0.0.2.tar.gz) = 11d775919b654b22f2826e8225fe29df1b9880f2
RMD160 (v2.4.0.0.2.tar.gz) = ebd7d2a54f5fff0fb48ee7e3851437264f2e51c8
SHA512 (v2.4.0.0.2.tar.gz) = ad8621ff6a7b40d2ad4bd193004be9e340a790be2880203521e4f6eacddfa60a29fc4a336ed717a76ff4291b65525e5c24dfdf6486eaae01bace99e3d89319e3
Size (v2.4.0.0.2.tar.gz) = 23617 bytes
SHA1 (s6-networking-2.4.1.1.tar.gz) = 355e84a7de0c555b989198a1f667a1bbfdafa2fa
RMD160 (s6-networking-2.4.1.1.tar.gz) = 3cb00fcd2e8ea795edf32fef3310e2c66a81842f
SHA512 (s6-networking-2.4.1.1.tar.gz) = c3e8eb040b5819874ebfec5c04c1399aebbc363b91b7057b77d91cc4dfb6cb6d07a487dfab6250bf94cddc6f2fef657a0a9e9b457450d584d3852ac87d8b9fbc
Size (s6-networking-2.4.1.1.tar.gz) = 103392 bytes
SHA1 (v2.4.1.1.1.tar.gz) = 70bf211d17ec9eaafb4f228455a4515b8d46e99f
RMD160 (v2.4.1.1.1.tar.gz) = d8b5daddac410d7f12fac742783d4d56f8596a37
SHA512 (v2.4.1.1.1.tar.gz) = fcd72231e91a2862daac9457ab62259cd900b8d9ef795e99dc5661dc35d7ca1b56e8caf7463593523ce164df09a88259027f575ef9a5cf3f9da14cd7abc52013
Size (v2.4.1.1.1.tar.gz) = 23705 bytes
SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6
3 changes: 1 addition & 2 deletions net/s6-networking/options.mk
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.6 2021/02/16 14:07:52 schmonz Exp $
# $NetBSD: options.mk,v 1.7 2021/04/26 15:05:30 schmonz Exp $

PKG_OPTIONS_VAR= PKG_OPTIONS.s6-networking
PKG_SUPPORTED_OPTIONS+= execline tls
Expand All @@ -7,7 +7,6 @@ PKG_SUGGESTED_OPTIONS+= tls
.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mexecline)
BUILDLINK_API_DEPENDS.execline+= execline>=2.7.0.1
. include "../../lang/execline/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-execline
Expand Down

0 comments on commit bbb4a8e

Please sign in to comment.