svn commit: r490819 - in branches/2019Q1/net/ndisc6: . files
Tobias Kortkamp
tobik at FreeBSD.org
Mon Jan 21 06:04:09 UTC 2019
Author: tobik
Date: Mon Jan 21 06:04:06 2019
New Revision: 490819
URL: https://svnweb.freebsd.org/changeset/ports/490819
Log:
MFH: r490814
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 at meridiani.jp [1]
Submitted by: tobik
Approved by: m.tsatsenko at gmail.com (maintainer)
Approved by: ports-secteam (miwi)
Added:
branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in
- copied unchanged from r490814, head/net/ndisc6/files/patch-rdnss_merge-hook.in
branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c
- copied unchanged from r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.c
branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h
- copied unchanged from r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.h
Deleted:
branches/2019Q1/net/ndisc6/files/patch-rdnssd__merge-hook.in
branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.c
branches/2019Q1/net/ndisc6/files/patch-rdnssd__rdnssd.h
Modified:
branches/2019Q1/net/ndisc6/Makefile
branches/2019Q1/net/ndisc6/distinfo
branches/2019Q1/net/ndisc6/files/patch-configure
branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c
branches/2019Q1/net/ndisc6/pkg-plist
Directory Properties:
branches/2019Q1/ (props changed)
Modified: branches/2019Q1/net/ndisc6/Makefile
==============================================================================
--- branches/2019Q1/net/ndisc6/Makefile Mon Jan 21 05:12:07 2019 (r490818)
+++ branches/2019Q1/net/ndisc6/Makefile Mon Jan 21 06:04:06 2019 (r490819)
@@ -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"
Modified: branches/2019Q1/net/ndisc6/distinfo
==============================================================================
--- branches/2019Q1/net/ndisc6/distinfo Mon Jan 21 05:12:07 2019 (r490818)
+++ branches/2019Q1/net/ndisc6/distinfo Mon Jan 21 06:04:06 2019 (r490819)
@@ -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
Modified: branches/2019Q1/net/ndisc6/files/patch-configure
==============================================================================
--- branches/2019Q1/net/ndisc6/files/patch-configure Mon Jan 21 05:12:07 2019 (r490818)
+++ branches/2019Q1/net/ndisc6/files/patch-configure Mon Jan 21 06:04:06 2019 (r490819)
@@ -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
Copied: branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in (from r490814, head/net/ndisc6/files/patch-rdnss_merge-hook.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/net/ndisc6/files/patch-rdnss_merge-hook.in Mon Jan 21 06:04:06 2019 (r490819, copy of r490814, head/net/ndisc6/files/patch-rdnss_merge-hook.in)
@@ -0,0 +1,28 @@
+--- rdnss/merge-hook.in.orig 2014-12-14 10:13:57 UTC
++++ rdnss/merge-hook.in
+@@ -19,7 +19,7 @@
+
+ set -e
+
+-PATH=/sbin:/bin
++PATH=/sbin:/bin:/usr/bin
+
+ # Max number of nameserver options taken into account. Should be as
+ # defined in <resolv.h>
+@@ -31,14 +31,14 @@ MAXNS=3
+ # will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
+ RDNSS_LIMIT=$(($MAXNS - 1))
+
+-sysconfdir='@SYSCONFDIR@'
++sysconfdir='/etc'
+ localstatedir='@LOCALSTATEDIR@'
+ resolvconf="$sysconfdir/resolv.conf"
+ myresolvconf="$localstatedir/run/rdnssd/resolv.conf"
+
+ # These should be POSIX-compliant BREs
+ RE_NSV4='^nameserver *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$'
+-RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$'
++RE_NSV4OR6='^nameserver *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$'
+
+ # Count how many IPv6 nameservers we can fit
+
Copied: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c (from r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.c Mon Jan 21 06:04:06 2019 (r490819, copy of r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.c)
@@ -0,0 +1,10 @@
+--- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC
++++ rdnss/rdnssd.c
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ #include <locale.h>
+ #include <signal.h>
++#include <stdint.h>
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
Copied: branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h (from r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/net/ndisc6/files/patch-rdnss_rdnssd.h Mon Jan 21 06:04:06 2019 (r490819, copy of r490814, head/net/ndisc6/files/patch-rdnss_rdnssd.h)
@@ -0,0 +1,27 @@
+--- 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
+
+-struct nd_opt_rdnss
+-{
+- uint8_t nd_opt_rdnss_type;
+- uint8_t nd_opt_rdnss_len;
+- uint16_t nd_opt_rdnss_reserved;
+- uint32_t nd_opt_rdnss_lifetime;
+- /* followed by one or more IPv6 addresses */
+-};
+-
+-struct nd_opt_dnssl
+-{
+- uint8_t nd_opt_dnssl_type;
+- uint8_t nd_opt_dnssl_len;
+- uint16_t nd_opt_dnssl_reserved;
+- uint32_t nd_opt_dnssl_lifetime;
+- /* followed by one or more domain names */
+-};
+-
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
Modified: branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c
==============================================================================
--- branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c Mon Jan 21 05:12:07 2019 (r490818)
+++ branches/2019Q1/net/ndisc6/files/patch-src-ndisc.c Mon Jan 21 06:04:06 2019 (r490819)
@@ -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"),
Modified: branches/2019Q1/net/ndisc6/pkg-plist
==============================================================================
--- branches/2019Q1/net/ndisc6/pkg-plist Mon Jan 21 05:12:07 2019 (r490818)
+++ branches/2019Q1/net/ndisc6/pkg-plist Mon Jan 21 06:04:06 2019 (r490819)
@@ -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
More information about the svn-ports-branches
mailing list