diff options
| author | Olivier Cochard <olivier@FreeBSD.org> | 2019-01-08 15:20:10 +0000 |
|---|---|---|
| committer | Olivier Cochard <olivier@FreeBSD.org> | 2019-01-08 15:20:10 +0000 |
| commit | 0f25b46edc9af02de6417a6ed0616fe8584dc0d4 (patch) | |
| tree | aa2fb67c94839d651b5686e43db1fb2ab58bf094 /net/bird | |
| parent | 881b8b93e7bb4133dfedb87361a8686783979b84 (diff) | |
Update to 1.6.5
Notes
Notes:
svn path=/head/; revision=489702
Diffstat (limited to 'net/bird')
| -rw-r--r-- | net/bird/Makefile | 3 | ||||
| -rw-r--r-- | net/bird/distinfo | 6 | ||||
| -rw-r--r-- | net/bird/files/patch-sysdep-bsd-setkey.h | 19 |
3 files changed, 4 insertions, 24 deletions
diff --git a/net/bird/Makefile b/net/bird/Makefile index 7d7cb980cc1d..462a2034fa4d 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bird -PORTVERSION= 1.6.4 -PORTREVISION= 2 +PORTVERSION= 1.6.5 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ diff --git a/net/bird/distinfo b/net/bird/distinfo index f54f9a906458..cf084f98eef9 100644 --- a/net/bird/distinfo +++ b/net/bird/distinfo @@ -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 diff --git a/net/bird/files/patch-sysdep-bsd-setkey.h b/net/bird/files/patch-sysdep-bsd-setkey.h deleted file mode 100644 index 99096b754e53..000000000000 --- a/net/bird/files/patch-sysdep-bsd-setkey.h +++ /dev/null @@ -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; |