diff --git a/security/libreswan/Makefile b/security/libreswan/Makefile index 4fec1be70884..1f1c5279e5e8 100644 --- a/security/libreswan/Makefile +++ b/security/libreswan/Makefile @@ -1,51 +1,46 @@ PORTNAME= libreswan -DISTVERSION= 4.4 -PORTREVISION= 1 +DISTVERSION= 4.5 CATEGORIES= security MASTER_SITES= https://download.libreswan.org/ -PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES= e43bc147e1342df55f51df06ef886749111d2cff.patch:-p1 # fix for https://github.com/libreswan/libreswan/issues/448 -PATCHFILES+= 607237df81c9896743f9b2cb91faab01e4d1c3fc.patch:-p1 # BSD patches: https://github.com/libreswan/libreswan/commit/607237df81c9896743f9b2cb91faab01e4d1c3fc - MAINTAINER= yuri@FreeBSD.org COMMENT= IPsec and IKE based firewall LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk \ xmlto:textproc/xmlto # build requires xmlto, but manpages aren't installed: https://github.com/libreswan/libreswan/issues/479 LIB_DEPENDS= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ libldns.so:dns/ldns \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libunbound.so:dns/unbound USES= bison gmake pkgconfig python CFLAGS+= -I${WRKSRC}/include/unbound MAKE_ARGS= PKG_BASE=${LOCALBASE} \ NSS_CFLAGS="`pkg-config --cflags nss`" NSS_LDFLAGS="`pkg-config --libs nss`" \ NSPR_LDFLAGS="`pkg-config --libs nspr`" \ CRYPT_LDFLAGS=-lcrypt \ USE_PTHREAD_SETSCHEDPRIO=false \ WERROR_CFLAGS="" \ PYTHON_BINARY=${PYTHON_CMD} BINARY_ALIAS= awk=gawk OPTIONS_DEFINE= DOCS post-configure: @cd ${WRKSRC}/mk/defaults && \ ${RLN} netbsd.mk freebsd.mk post-install: .for f in _import_crl addconn algparse cavp dncheck ecdsasigkey enumcheck hunkcheck ipcheck jambufcheck keyidcheck pluto readwriteconf rsasigkey showhostkey timecheck whack @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/ipsec/${f} .endfor .include diff --git a/security/libreswan/distinfo b/security/libreswan/distinfo index 5c9e6f8f0c52..638f64910308 100644 --- a/security/libreswan/distinfo +++ b/security/libreswan/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1621641154 -SHA256 (libreswan-4.4.tar.gz) = 5f3f0a20d7097f20108bc93ba1255a778d8ffb8692d05f86383978c03c394976 -SIZE (libreswan-4.4.tar.gz) = 3503201 -SHA256 (e43bc147e1342df55f51df06ef886749111d2cff.patch) = d3f168c32501ee2de41b51a747921765c3d2bef555656c098041696f29e14806 -SIZE (e43bc147e1342df55f51df06ef886749111d2cff.patch) = 1279 -SHA256 (607237df81c9896743f9b2cb91faab01e4d1c3fc.patch) = 8a5c42b5b0c405a67fc4b178da10a9734e34fc44cb6f6c02ce63d8dd45e11253 -SIZE (607237df81c9896743f9b2cb91faab01e4d1c3fc.patch) = 14059 +TIMESTAMP = 1629563708 +SHA256 (libreswan-4.5.tar.gz) = 0703f51bdc6674d4ba66adb50854df9e0731bfa78a8983ebc2aa3adc55dd90a3 +SIZE (libreswan-4.5.tar.gz) = 3529355 diff --git a/security/libreswan/files/patch-include_fd.h b/security/libreswan/files/patch-include_fd.h deleted file mode 100644 index 020743f2ca84..000000000000 --- a/security/libreswan/files/patch-include_fd.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/fd.h.orig 2021-05-21 21:31:28 UTC -+++ include/fd.h -@@ -26,6 +26,7 @@ - - #include - #include /* for ssize_t */ -+#include - - #include "where.h" - diff --git a/security/libreswan/files/patch-lib_libipsecconf_confread.c b/security/libreswan/files/patch-lib_libipsecconf_confread.c deleted file mode 100644 index 8c5788b1bea6..000000000000 --- a/security/libreswan/files/patch-lib_libipsecconf_confread.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libipsecconf/confread.c.orig 2021-05-21 21:27:40 UTC -+++ lib/libipsecconf/confread.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "lswalloc.h" - #include "ip_address.h" diff --git a/security/libreswan/files/patch-lib_libipsecconf_keywords.c b/security/libreswan/files/patch-lib_libipsecconf_keywords.c deleted file mode 100644 index 7c007941568e..000000000000 --- a/security/libreswan/files/patch-lib_libipsecconf_keywords.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libipsecconf/keywords.c.orig 2021-05-21 21:28:14 UTC -+++ lib/libipsecconf/keywords.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include "constants.h" diff --git a/security/libreswan/files/patch-lib_libswan_addrtypeof.c b/security/libreswan/files/patch-lib_libswan_addrtypeof.c deleted file mode 100644 index 3d8299c7e112..000000000000 --- a/security/libreswan/files/patch-lib_libswan_addrtypeof.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libswan/addrtypeof.c.orig 2021-05-21 18:49:29 UTC -+++ lib/libswan/addrtypeof.c -@@ -14,6 +14,7 @@ - */ - - #include -+#include - - #include "ip_address.h" - #include "ip_info.h" diff --git a/security/libreswan/files/patch-lib_libswan_initaddr.c b/security/libreswan/files/patch-lib_libswan_initaddr.c deleted file mode 100644 index 5bffefeb1748..000000000000 --- a/security/libreswan/files/patch-lib_libswan_initaddr.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libswan/initaddr.c.orig 2021-04-22 15:24:33 UTC -+++ lib/libswan/initaddr.c -@@ -16,6 +16,7 @@ - */ - - #include -+#include - - #include "ip_info.h" - #include "ip_address.h" diff --git a/security/libreswan/files/patch-lib_libswan_ip__address.c b/security/libreswan/files/patch-lib_libswan_ip__address.c deleted file mode 100644 index c04a6c16759b..000000000000 --- a/security/libreswan/files/patch-lib_libswan_ip__address.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libswan/ip_address.c.orig 2021-05-21 18:51:10 UTC -+++ lib/libswan/ip_address.c -@@ -16,6 +16,8 @@ - * License for more details. - */ - -+#include -+ - #include "jambuf.h" - #include "ip_address.h" - #include "lswlog.h" /* for dbg() */ diff --git a/security/libreswan/files/patch-lib_libswan_ip__encap.c b/security/libreswan/files/patch-lib_libswan_ip__encap.c deleted file mode 100644 index ec0c30e2f9ba..000000000000 --- a/security/libreswan/files/patch-lib_libswan_ip__encap.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libswan/ip_encap.c.orig 2021-05-21 18:52:58 UTC -+++ lib/libswan/ip_encap.c -@@ -19,6 +19,7 @@ - #ifdef linux - # include /* for TCP_ENCAP_ESPINTCP and UDP_ENCAP_ESPINUDP */ - #else -+# include - # include /* for UDP_ENCAP_ESPINUDP aka NAT */ - #endif - diff --git a/security/libreswan/files/patch-lib_libswan_ip__endpoint.c b/security/libreswan/files/patch-lib_libswan_ip__endpoint.c deleted file mode 100644 index 905a61816783..000000000000 --- a/security/libreswan/files/patch-lib_libswan_ip__endpoint.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libswan/ip_endpoint.c.orig 2021-05-21 18:53:45 UTC -+++ lib/libswan/ip_endpoint.c -@@ -14,6 +14,8 @@ - * - */ - -+#include -+ - #include "jambuf.h" - #include "ip_endpoint.h" - #include "constants.h" /* for memeq() */ diff --git a/security/libreswan/files/patch-lib_libswan_ip__info.c b/security/libreswan/files/patch-lib_libswan_ip__info.c deleted file mode 100644 index 33d690c85c47..000000000000 --- a/security/libreswan/files/patch-lib_libswan_ip__info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libswan/ip_info.c.orig 2021-05-21 18:51:44 UTC -+++ lib/libswan/ip_info.c -@@ -17,6 +17,8 @@ - * for more details. - */ - -+#include -+ - #include "ietf_constants.h" - #include "ip_info.h" - #include "passert.h" diff --git a/security/libreswan/files/patch-lib_libswan_ttoaddress.c b/security/libreswan/files/patch-lib_libswan_ttoaddress.c deleted file mode 100644 index fb2ec579f6ca..000000000000 --- a/security/libreswan/files/patch-lib_libswan_ttoaddress.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libswan/ttoaddress.c.orig 2021-05-21 18:49:01 UTC -+++ lib/libswan/ttoaddress.c -@@ -18,6 +18,7 @@ - - #include - #include /* for gethostbyname2() */ -+#include - - #include "ip_address.h" - #include "ip_info.h" diff --git a/security/libreswan/files/patch-programs_pluto_packet.c b/security/libreswan/files/patch-programs_pluto_packet.c deleted file mode 100644 index 534cee3f8d43..000000000000 --- a/security/libreswan/files/patch-programs_pluto_packet.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/pluto/packet.c.orig 2021-05-21 23:54:59 UTC -+++ programs/pluto/packet.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "constants.h" - #include "lswalloc.h"