Index: head/net/bird/Makefile =================================================================== --- head/net/bird/Makefile (revision 489701) +++ head/net/bird/Makefile (revision 489702) @@ -1,35 +1,34 @@ # Created by: Pav Lucistnik # $FreeBSD$ PORTNAME= bird -PORTVERSION= 1.6.4 -PORTREVISION= 2 +PORTVERSION= 1.6.5 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ MAINTAINER= olivier@FreeBSD.org COMMENT?= Dynamic IP routing daemon (${FLAVOR:Uipv4:S/ip/IP/} version) LICENSE= GPLv2 FLAVORS= ipv4 ipv6 ipv6_PKGNAMESUFFIX= 6 USES= autoreconf bison gmake ncurses readline GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= ${PKGBASE} GROUPS= birdvty .if ${FLAVOR:U} == ipv6 CONFIGURE_ARGS+= --enable-ipv6 PLIST_SUB= VER=6 .else PLIST_SUB?= VER="" .endif .include Index: head/net/bird/distinfo =================================================================== --- head/net/bird/distinfo (revision 489701) +++ head/net/bird/distinfo (revision 489702) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522168475 -SHA256 (bird-1.6.4.tar.gz) = c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0 -SIZE (bird-1.6.4.tar.gz) = 1018874 +TIMESTAMP = 1546923490 +SHA256 (bird-1.6.5.tar.gz) = cc40c851afc354cd5348a63fc5f6fe75de590182522102e348b30a995733d21a +SIZE (bird-1.6.5.tar.gz) = 1114984 Index: head/net/bird/files/patch-sysdep-bsd-setkey.h =================================================================== --- head/net/bird/files/patch-sysdep-bsd-setkey.h (revision 489701) +++ head/net/bird/files/patch-sysdep-bsd-setkey.h (nonexistent) @@ -1,19 +0,0 @@ ---- 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"); - -- if (setkey_md5(&src, &dst, passwd, SADB_ADD) < 0) -+ if (setkey_md5(&src, &dst, passwd, SADB_ADD) < 0 || -+ setkey_md5(&dst, &src, passwd, SADB_ADD) < 0) - ERR_MSG("Cannot add TCP-MD5 password into the IPsec SA/SP database"); - } - else - { -- if (setkey_md5(&src, &dst, NULL, SADB_DELETE) < 0) -+ if (setkey_md5(&src, &dst, NULL, SADB_DELETE) < 0 || -+ setkey_md5(&dst, &src, NULL, SADB_DELETE) < 0) - ERR_MSG("Cannot delete TCP-MD5 password from the IPsec SA/SP database"); - } - return 0; Property changes on: head/net/bird/files/patch-sysdep-bsd-setkey.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property