mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 13:20:32 -04:00
f2573c3d52
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)
28 lines
860 B
Text
28 lines
860 B
Text
--- 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
|
|
|