aboutsummaryrefslogtreecommitdiff
path: root/net/ndisc6
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2018-12-08 18:08:08 +0000
committerSteve Wills <swills@FreeBSD.org>2018-12-08 18:08:08 +0000
commit43dcdab1bd01865153a6caadd661eeee1b52b1bb (patch)
tree5174be5ec8f3fedc85342178fed5acb3f8005f1a /net/ndisc6
parent85fd2d1ca04ac10bffd832f0d411f45e9155b906 (diff)
downloadports-43dcdab1bd01865153a6caadd661eeee1b52b1bb.tar.gz
ports-43dcdab1bd01865153a6caadd661eeee1b52b1bb.zip
net/ndisc6 update to 1.0.3
PR: 233854 Submitted by: m.tsatsenko@gmail.com (maintainer)
Notes
Notes: svn path=/head/; revision=486970
Diffstat (limited to 'net/ndisc6')
-rw-r--r--net/ndisc6/Makefile18
-rw-r--r--net/ndisc6/distinfo5
-rw-r--r--net/ndisc6/files/patch-configure17
-rw-r--r--net/ndisc6/files/patch-rdnssd__merge-hook.in8
-rw-r--r--net/ndisc6/files/patch-rdnssd__rdnssd.c6
-rw-r--r--net/ndisc6/files/patch-rdnssd__rdnssd.h19
-rw-r--r--net/ndisc6/files/patch-src-ndisc.c6
-rw-r--r--net/ndisc6/files/patch-src_tcpspray.c (renamed from net/ndisc6/files/patch-patch-src__tcpspray.c)6
-rw-r--r--net/ndisc6/pkg-plist1
9 files changed, 45 insertions, 41 deletions
diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile
index 836761a5667c..bf73a88bb586 100644
--- a/net/ndisc6/Makefile
+++ b/net/ndisc6/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ndisc6
-PORTVERSION= 1.0.2
-PORTREVISION= 6
+PORTVERSION= 1.0.3
CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/ndisc6/ \
http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
@@ -15,6 +14,7 @@ LICENSE= GPLv2
USES= tar:bzip2 perl5
USE_GCC= any
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var"
CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl
@@ -24,17 +24,11 @@ LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-LDFLAGS+= -lintl
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext
+NLS_LDFLAGS= -lintl
USE_RC_SUBR= rdnssd
diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo
index 3d96d8af12d9..88b6fb81c1c3 100644
--- a/net/ndisc6/distinfo
+++ b/net/ndisc6/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ndisc6-1.0.2.tar.bz2) = 6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a
-SIZE (ndisc6-1.0.2.tar.bz2) = 239249
+TIMESTAMP = 1542928199
+SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821
+SIZE (ndisc6-1.0.3.tar.bz2) = 260294
diff --git a/net/ndisc6/files/patch-configure b/net/ndisc6/files/patch-configure
index b88e977db173..ea65a254b630 100644
--- a/net/ndisc6/files/patch-configure
+++ b/net/ndisc6/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2011-04-24 02:27:27.000000000 +0400
-+++ configure 2011-04-24 02:29:19.000000000 +0400
-@@ -5483,7 +5483,7 @@
+--- configure.orig 2014-12-14 10:09:45 UTC
++++ configure
+@@ -5713,7 +5713,7 @@ fi
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
@@ -9,8 +9,8 @@
esac
fi
fi
-@@ -5527,7 +5527,7 @@
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+@@ -5759,7 +5759,7 @@ fi
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
if test -n "$GCC"; then
case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -18,7 +18,7 @@
esac
fi
fi
-@@ -6288,7 +6288,7 @@
+@@ -6597,7 +6597,7 @@ fi
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
@@ -27,8 +27,8 @@
esac
fi
fi
-@@ -6332,7 +6332,7 @@
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+@@ -6643,7 +6643,7 @@ fi
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
if test -n "$GCC"; then
case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -36,4 +36,3 @@
esac
fi
fi
-
diff --git a/net/ndisc6/files/patch-rdnssd__merge-hook.in b/net/ndisc6/files/patch-rdnssd__merge-hook.in
index a40c66df2cad..fb53c52ff6ff 100644
--- a/net/ndisc6/files/patch-rdnssd__merge-hook.in
+++ b/net/ndisc6/files/patch-rdnssd__merge-hook.in
@@ -1,6 +1,6 @@
---- rdnssd/merge-hook.in.orig 2011-09-30 17:29:15.000000000 +0200
-+++ rdnssd/merge-hook.in 2011-09-30 17:29:53.000000000 +0200
-@@ -21,7 +21,7 @@
+--- rdnssd/merge-hook.in.orig 2014-12-14 10:13:57 UTC
++++ rdnssd/merge-hook.in
+@@ -19,7 +19,7 @@
set -e
@@ -9,7 +9,7 @@
# Max number of nameserver options taken into account. Should be as
# defined in <resolv.h>
-@@ -33,14 +33,14 @@
+@@ -31,14 +31,14 @@ MAXNS=3
# will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
RDNSS_LIMIT=$(($MAXNS - 1))
diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.c b/net/ndisc6/files/patch-rdnssd__rdnssd.c
index df730bbdd30c..c8cbe857156a 100644
--- a/net/ndisc6/files/patch-rdnssd__rdnssd.c
+++ b/net/ndisc6/files/patch-rdnssd__rdnssd.c
@@ -1,6 +1,6 @@
---- rdnssd/rdnssd.c.orig 2011-09-10 14:20:44.451134584 +0400
-+++ rdnssd/rdnssd.c 2011-09-10 14:21:09.758658207 +0400
-@@ -29,6 +29,7 @@
+--- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC
++++ rdnssd/rdnssd.c
+@@ -28,6 +28,7 @@
#include <stdbool.h>
#include <locale.h>
#include <signal.h>
diff --git a/net/ndisc6/files/patch-rdnssd__rdnssd.h b/net/ndisc6/files/patch-rdnssd__rdnssd.h
index 1aa03c3104b9..b942a24307cf 100644
--- a/net/ndisc6/files/patch-rdnssd__rdnssd.h
+++ b/net/ndisc6/files/patch-rdnssd__rdnssd.h
@@ -1,18 +1,27 @@
---- rdnssd/rdnssd.h.orig 2011-07-23 01:03:38.000000000 +0400
-+++ rdnssd/rdnssd.h 2011-07-23 01:03:56.000000000 +0400
-@@ -32,15 +32,6 @@
- /* Belongs in <netinet/icmp6.h> */
+--- 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,
#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_resserved1;
+- 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
diff --git a/net/ndisc6/files/patch-src-ndisc.c b/net/ndisc6/files/patch-src-ndisc.c
index 0b1fa047e1c9..4e7adddbb490 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 2011-09-10 14:17:49.714181834 +0400
-+++ src/ndisc.c 2011-09-10 14:17:51.893973268 +0400
-@@ -441,7 +441,7 @@
+--- src/ndisc.c.orig 2014-12-14 10:39:28 UTC
++++ src/ndisc.c
+@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len
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/files/patch-patch-src__tcpspray.c b/net/ndisc6/files/patch-src_tcpspray.c
index def72fc23bd7..dd18a150b0d4 100644
--- a/net/ndisc6/files/patch-patch-src__tcpspray.c
+++ b/net/ndisc6/files/patch-src_tcpspray.c
@@ -1,6 +1,6 @@
---- src/tcpspray.c.orig 2010-05-01 01:08:34.000000000 -0700
-+++ src/tcpspray.c 2015-02-15 15:56:55.904785304 -0800
-@@ -34,6 +34,7 @@
+--- src/tcpspray.c.orig 2011-09-22 16:00:30 UTC
++++ src/tcpspray.c
+@@ -33,6 +33,7 @@
# define SIZE_MAX SIZE_T_MAX // FreeBSD 4.x workaround
#endif
#include <stdlib.h>
diff --git a/net/ndisc6/pkg-plist b/net/ndisc6/pkg-plist
index cf573438d63a..8da6da23c4ce 100644
--- a/net/ndisc6/pkg-plist
+++ b/net/ndisc6/pkg-plist
@@ -24,6 +24,7 @@ sbin/tracert6
%%NLS%%share/locale/cs/LC_MESSAGES/ndisc6.mo
%%NLS%%share/locale/de/LC_MESSAGES/ndisc6.mo
%%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
@owner nobody
@dir var/run/rdnssd
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 17:58:37 +0000