svn commit: r465713 - in head/net/bird: . files
Olivier Cochard
olivier at FreeBSD.org
Tue Mar 27 15:09:23 UTC 2018
Author: olivier
Date: Tue Mar 27 15:09:22 2018
New Revision: 465713
URL: https://svnweb.freebsd.org/changeset/ports/465713
Log:
Update to 1.6.4 and remove the FreeBSD's specific feature FIREWALL option
to ease port maintenance.
PR: 226860
Reported by: Leo Vandewoestijne <freebsd at dns.company>
Added:
head/net/bird/files/patch-tools_gendist (contents, props changed)
Deleted:
head/net/bird/files/firewall_support.patch
head/net/bird/files/patch-filter-filter.c
head/net/bird/files/patch-sysdep-bsd-sysio.h
Modified:
head/net/bird/Makefile
head/net/bird/distinfo
head/net/bird/files/patch-sysdep-bsd-setkey.h
Modified: head/net/bird/Makefile
==============================================================================
--- head/net/bird/Makefile Tue Mar 27 15:03:19 2018 (r465712)
+++ head/net/bird/Makefile Tue Mar 27 15:09:22 2018 (r465713)
@@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= bird
-PORTVERSION= 1.6.3
-PORTREVISION= 4
+PORTVERSION= 1.6.4
CATEGORIES= net
-MASTER_SITES= ftp://bird.network.cz/pub/bird/ \
- http://bird.mpls.in/distfiles/bird/
+MASTER_SITES= ftp://bird.network.cz/pub/bird/
MAINTAINER= olivier at FreeBSD.org
COMMENT?= Dynamic IP routing daemon (${FLAVOR:Uipv4:S/ip/IP/} version)
@@ -16,14 +14,10 @@ LICENSE= GPLv2
FLAVORS= ipv4 ipv6
ipv6_PKGNAMESUFFIX= 6
-USES= bison gmake ncurses readline
+USES= autoreconf bison gmake ncurses readline
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var
-OPTIONS_DEFINE?= FIREWALL
-FIREWALL_DESC= Enable firewall protocol
-NO_OPTIONS_SORT= yes
-
MAKE_JOBS_UNSAFE= yes
USE_RC_SUBR= ${PKGBASE}
@@ -33,21 +27,6 @@ CONFIGURE_ARGS+= --enable-ipv6
PLIST_SUB= VER=6
.else
PLIST_SUB?= VER=""
-.endif
-
-FIREWALL_EXTRA_PATCHES+= ${FILESDIR}/firewall_support.patch
-
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MFIREWALL}
- @${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 firewall"/' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/ proto_build(\&proto_firewall);/;}' ${WRKSRC}/nest/proto.c
- @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPSET/;}' ${WRKSRC}/sysdep/autoconf.h.in
- @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_PF/;}' ${WRKSRC}/sysdep/autoconf.h.in
- @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPFW/;}' ${WRKSRC}/sysdep/autoconf.h.in
- @${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL/;}' ${WRKSRC}/sysdep/autoconf.h.in
- @${REINPLACE_CMD} -e 's/\(proto_bfd\)/\1, proto_firewall/' ${WRKSRC}/nest/protocol.h
.endif
.include <bsd.port.mk>
Modified: head/net/bird/distinfo
==============================================================================
--- head/net/bird/distinfo Tue Mar 27 15:03:19 2018 (r465712)
+++ head/net/bird/distinfo Tue Mar 27 15:09:22 2018 (r465713)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485093974
-SHA256 (bird-1.6.3.tar.gz) = 39c51cf57c3ba8b5978b2a657ffa2f647ec7f3ae643e91cf42ee5cb070cf7e7c
-SIZE (bird-1.6.3.tar.gz) = 1337198
+TIMESTAMP = 1521796106
+SHA256 (bird-1.6.4.tar.gz) = 089db0570dbc171a1330862f84b908c15d869879a806c925621515e207f7296f
+SIZE (bird-1.6.4.tar.gz) = 1360234
Modified: head/net/bird/files/patch-sysdep-bsd-setkey.h
==============================================================================
--- head/net/bird/files/patch-sysdep-bsd-setkey.h Tue Mar 27 15:03:19 2018 (r465712)
+++ head/net/bird/files/patch-sysdep-bsd-setkey.h Tue Mar 27 15:09:22 2018 (r465713)
@@ -1,5 +1,5 @@
---- sysdep/bsd/setkey.h 2017-05-15 14:04:47.215628000 +0300
-+++ sysdep/bsd/setkey.h 2017-05-15 14:05:36.850028000 +0300
+--- sysdep/bsd/setkey.h.orig 2018-03-22 12:32:46 UTC
++++ sysdep/bsd/setkey.h
@@ -158,12 +158,14 @@ sk_set_md5_in_sasp_db(sock *s, ip_addr local, ip_addr
if (len > TCP_KEYLEN_MAX)
ERR_MSG("The password for TCP MD5 Signature is too long");
Added: head/net/bird/files/patch-tools_gendist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/bird/files/patch-tools_gendist Tue Mar 27 15:09:22 2018 (r465713)
@@ -0,0 +1,11 @@
+--- tools/gendist.orig 2018-03-26 21:29:43 UTC
++++ tools/gendist
+@@ -5,7 +5,7 @@
+ #
+
+ set -e
+-AC=`if [ -x /usr/bin/autoconf2.50 ] ; then echo autoconf2.50 ; else echo autoconf ; fi`
++AC=autoreconf
+ $AC
+ ./configure
+ make distclean
More information about the svn-ports-head
mailing list