From f2573c3d521f189ec16fde21938aa0da39eb9c3c Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Sun, 20 Jan 2019 21:43:57 +0000 Subject: [PATCH] net/ndisc6: Update to 1.0.4 ndisc6 1.0.4 now requires a C11-capable compiler and no longer needs the 'variable length array in structure' GCC extension. As such we can build it with Clang now. This also removes the GCC run dependency which was the initial request in the PR [1]. Changes: http://git.remlab.net/gitweb/?p=ndisc6.git;a=blob_plain;f=NEWS;hb=81bdcb51b576a394ba01f5a8022e5b9354e431a6 PR: 233187 Reported by: hashiz@meridiani.jp [1] Submitted by: tobik Approved by: m.tsatsenko@gmail.com (maintainer) MFH: 2019Q1 (bug fixes and fewer run dependencies) --- net/ndisc6/Makefile | 6 ++---- net/ndisc6/distinfo | 6 +++--- net/ndisc6/files/patch-configure | 10 +++++----- ...rdnssd__merge-hook.in => patch-rdnss_merge-hook.in} | 4 ++-- .../{patch-rdnssd__rdnssd.c => patch-rdnss_rdnssd.c} | 4 ++-- .../{patch-rdnssd__rdnssd.h => patch-rdnss_rdnssd.h} | 6 +++--- net/ndisc6/files/patch-src-ndisc.c | 4 ++-- net/ndisc6/pkg-plist | 1 + 8 files changed, 20 insertions(+), 21 deletions(-) rename net/ndisc6/files/{patch-rdnssd__merge-hook.in => patch-rdnss_merge-hook.in} (90%) rename net/ndisc6/files/{patch-rdnssd__rdnssd.c => patch-rdnss_rdnssd.c} (68%) rename net/ndisc6/files/{patch-rdnssd__rdnssd.h => patch-rdnss_rdnssd.h} (78%) diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index 563cb5c2cdfe..aa9b647e5cea 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ndisc6 -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.remlab.net/files/ndisc6/ \ http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/ @@ -13,8 +12,7 @@ COMMENT= IPv6 network diagnostic tools LICENSE= GPLv2 -USES= tar:bzip2 perl5 -USE_GCC= any +USES= compiler:c11 perl5 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var" diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo index 88b6fb81c1c3..3d27da086875 100644 --- a/net/ndisc6/distinfo +++ b/net/ndisc6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542928199 -SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 -SIZE (ndisc6-1.0.3.tar.bz2) = 260294 +TIMESTAMP = 1547299650 +SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f +SIZE (ndisc6-1.0.4.tar.bz2) = 264071 diff --git a/net/ndisc6/files/patch-configure b/net/ndisc6/files/patch-configure index ea65a254b630..2cf476f1e32a 100644 --- a/net/ndisc6/files/patch-configure +++ b/net/ndisc6/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-12-14 10:09:45 UTC +--- configure.orig 2019-01-06 14:36:38 UTC +++ configure -@@ -5713,7 +5713,7 @@ fi +@@ -5900,7 +5900,7 @@ fi if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in @@ -9,7 +9,7 @@ esac fi fi -@@ -5759,7 +5759,7 @@ fi +@@ -5946,7 +5946,7 @@ fi || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in @@ -18,7 +18,7 @@ esac fi fi -@@ -6597,7 +6597,7 @@ fi +@@ -6784,7 +6784,7 @@ fi if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in @@ -27,7 +27,7 @@ esac fi fi -@@ -6643,7 +6643,7 @@ fi +@@ -6830,7 +6830,7 @@ fi || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in diff --git a/net/ndisc6/files/patch-rdnssd__merge-hook.in b/net/ndisc6/files/patch-rdnss_merge-hook.in similarity index 90% rename from net/ndisc6/files/patch-rdnssd__merge-hook.in rename to net/ndisc6/files/patch-rdnss_merge-hook.in index fb53c52ff6ff..03c296e38be7 100644 --- a/net/ndisc6/files/patch-rdnssd__merge-hook.in +++ b/net/ndisc6/files/patch-rdnss_merge-hook.in @@ -1,5 +1,5 @@ ---- rdnssd/merge-hook.in.orig 2014-12-14 10:13:57 UTC -+++ rdnssd/merge-hook.in +--- rdnss/merge-hook.in.orig 2014-12-14 10:13:57 UTC ++++ rdnss/merge-hook.in @@ -19,7 +19,7 @@ set -e diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.c b/net/ndisc6/files/patch-rdnss_rdnssd.c similarity index 68% rename from net/ndisc6/files/patch-rdnssd__rdnssd.c rename to net/ndisc6/files/patch-rdnss_rdnssd.c index c8cbe857156a..54ed9b80a918 100644 --- a/net/ndisc6/files/patch-rdnssd__rdnssd.c +++ b/net/ndisc6/files/patch-rdnss_rdnssd.c @@ -1,5 +1,5 @@ ---- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC -+++ rdnssd/rdnssd.c +--- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC ++++ rdnss/rdnssd.c @@ -28,6 +28,7 @@ #include #include diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.h b/net/ndisc6/files/patch-rdnss_rdnssd.h similarity index 78% rename from net/ndisc6/files/patch-rdnssd__rdnssd.h rename to net/ndisc6/files/patch-rdnss_rdnssd.h index b942a24307cf..0d5e440659ce 100644 --- a/net/ndisc6/files/patch-rdnssd__rdnssd.h +++ b/net/ndisc6/files/patch-rdnss_rdnssd.h @@ -1,6 +1,6 @@ ---- rdnssd/rdnssd.h.orig 2011-10-17 15:35:11 UTC -+++ rdnssd/rdnssd.h -@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, +--- rdnss/rdnssd.h.orig 2016-12-07 18:11:55 UTC ++++ rdnss/rdnssd.h +@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, rdnss_icmp; #define ND_OPT_RDNSS 25 #define ND_OPT_DNSSL 31 diff --git a/net/ndisc6/files/patch-src-ndisc.c b/net/ndisc6/files/patch-src-ndisc.c index 4e7adddbb490..08d52dc50c91 100644 --- a/net/ndisc6/files/patch-src-ndisc.c +++ b/net/ndisc6/files/patch-src-ndisc.c @@ -1,6 +1,6 @@ ---- src/ndisc.c.orig 2014-12-14 10:39:28 UTC +--- src/ndisc.c.orig 2016-12-07 16:43:04 UTC +++ src/ndisc.c -@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len +@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len, const struct printf (_("Stateful other conf. : %3s\n"), gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No"))); printf (_("Mobile home agent : %3s\n"), diff --git a/net/ndisc6/pkg-plist b/net/ndisc6/pkg-plist index 8da6da23c4ce..3309c61a9546 100644 --- a/net/ndisc6/pkg-plist +++ b/net/ndisc6/pkg-plist @@ -26,5 +26,6 @@ sbin/tracert6 %%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo +%%NLS%%share/locale/sv/LC_MESSAGES/ndisc6.mo @owner nobody @dir var/run/rdnssd