diff --git a/security/libreswan/Makefile b/security/libreswan/Makefile index bd101cc16091..aa19ad4e659f 100644 --- a/security/libreswan/Makefile +++ b/security/libreswan/Makefile @@ -1,57 +1,55 @@ PORTNAME= libreswan -DISTVERSION= 4.7 -PORTREVISION= 1 +DISTVERSION= 4.11 CATEGORIES= security MASTER_SITES= https://download.libreswan.org/ MAINTAINER= yuri@FreeBSD.org COMMENT= IPsec and IKE based firewall WWW= https://libreswan.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk \ ${NONEXISTENT}:dns/unbound:patch \ 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 cpe gmake pkgconfig python UNBOUND_WRKSRC= `${MAKE} -C ${PORTSDIR}/dns/unbound -V WRKSRC` 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-patch: @${RM} ${WRKSRC}/include/unbound/unbound-event.h && ${LN} -s ${UNBOUND_WRKSRC}/libunbound/unbound-event.h ${WRKSRC}/include/unbound/unbound-event.h post-configure: @cd ${WRKSRC}/mk/defaults && \ ${RLN} netbsd.mk freebsd.mk post-install: .for f in \ - _import_crl addconn algparse asn1check cavp dncheck ecdsasigkey \ - enumcheck hunkcheck ipcheck jambufcheck keyidcheck pluto readwriteconf \ - routecheck rsasigkey showhostkey timecheck vendoridcheck whack + _import_crl addconn algparse asn1check cavp dncheck ecdsasigkey enumcheck hunkcheck ipcheck \ + jambufcheck keyidcheck pluto readwriteconf rsasigkey showhostkey showroute timecheck vendoridcheck whack @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/ipsec/${f} .endfor .include diff --git a/security/libreswan/distinfo b/security/libreswan/distinfo index ee6f6c4e508f..414ef7d47d8a 100644 --- a/security/libreswan/distinfo +++ b/security/libreswan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653544584 -SHA256 (libreswan-4.7.tar.gz) = ddd6337b3900063d870301c3d9f61f56107c765850fb00a163d360359ff3fc44 -SIZE (libreswan-4.7.tar.gz) = 3684167 +TIMESTAMP = 1691024733 +SHA256 (libreswan-4.11.tar.gz) = 429a917fe4a55260f152cfb3188a587e5b12e94a14e240ac125319ff14b8c83d +SIZE (libreswan-4.11.tar.gz) = 3711304 diff --git a/security/libreswan/files/patch-programs_pluto_kernel__bsdkame.c b/security/libreswan/files/patch-programs_pluto_kernel__bsdkame.c deleted file mode 100644 index 4c962ee0e7fe..000000000000 --- a/security/libreswan/files/patch-programs_pluto_kernel__bsdkame.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/pluto/kernel_bsdkame.c.orig 2021-05-21 21:30:08 UTC -+++ programs/pluto/kernel_bsdkame.c -@@ -24,6 +24,10 @@ - #include - #include - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - #include - #include - #include diff --git a/security/libreswan/pkg-plist b/security/libreswan/pkg-plist index f9b37588ce70..9b3d4b834009 100644 --- a/security/libreswan/pkg-plist +++ b/security/libreswan/pkg-plist @@ -1,81 +1,74 @@ /etc/pam.d/pluto etc/ipsec.conf etc/ipsec.d/policies/block etc/ipsec.d/policies/clear etc/ipsec.d/policies/clear-or-private etc/ipsec.d/policies/portexcludes.conf etc/ipsec.d/policies/private etc/ipsec.d/policies/private-or-clear etc/ipsec.secrets etc/logrotate.d/libreswan etc/rc.d/pluto libexec/ipsec/_import_crl libexec/ipsec/_plutorun libexec/ipsec/_realsetup libexec/ipsec/_secretcensor -libexec/ipsec/_stackmanager libexec/ipsec/_unbound-hook libexec/ipsec/_updown libexec/ipsec/_updown.bsd libexec/ipsec/addconn libexec/ipsec/algparse libexec/ipsec/asn1check libexec/ipsec/auto libexec/ipsec/barf libexec/ipsec/cavp libexec/ipsec/dncheck libexec/ipsec/ecdsasigkey libexec/ipsec/enumcheck libexec/ipsec/hunkcheck libexec/ipsec/ipcheck libexec/ipsec/jambufcheck libexec/ipsec/keyidcheck libexec/ipsec/letsencrypt -libexec/ipsec/look libexec/ipsec/newhostkey libexec/ipsec/pluto libexec/ipsec/readwriteconf -libexec/ipsec/routecheck libexec/ipsec/rsasigkey libexec/ipsec/setup -libexec/ipsec/show libexec/ipsec/showhostkey +libexec/ipsec/showroute libexec/ipsec/timecheck libexec/ipsec/vendoridcheck -libexec/ipsec/verify libexec/ipsec/whack +man/man5/ipsec.conf.5.gz +man/man5/ipsec.secrets.5.gz +man/man8/ipsec.8.gz +man/man8/ipsec__import_crl.8.gz +man/man8/ipsec__plutorun.8.gz +man/man8/ipsec__realsetup.8.gz +man/man8/ipsec__secretcensor.8.gz +man/man8/ipsec__unbound-hook.8.gz +man/man8/ipsec__updown.8.gz +man/man8/ipsec__updown.bsdkame.8.gz +man/man8/ipsec_addconn.8.gz +man/man8/ipsec_auto.8.gz +man/man8/ipsec_barf.8.gz +man/man8/ipsec_checknss.8.gz +man/man8/ipsec_ecdsasigkey.8.gz +man/man8/ipsec_import.8.gz +man/man8/ipsec_initnss.8.gz +man/man8/ipsec_letsencrypt.8.gz +man/man8/ipsec_newhostkey.8.gz +man/man8/ipsec_pluto.8.gz +man/man8/ipsec_readwriteconf.8.gz +man/man8/ipsec_rsasigkey.8.gz +man/man8/ipsec_setup.8.gz +man/man8/ipsec_showhostkey.8.gz +man/man8/ipsec_showroute.8.gz +man/man8/ipsec_vendorid.8.gz +man/man8/ipsec_whack.8.gz +man/man8/pluto.8.gz sbin/ipsec %%PORTDOCS%%%%DOCSDIR%%/ipsec.conf-sample %%PORTDOCS%%%%DOCSDIR%%/ipsec.secrets-sample share/examples/rc.d/pluto -share/man/man5/ipsec.conf.5.gz -share/man/man5/ipsec.secrets.5.gz -share/man/man8/ipsec.8.gz -share/man/man8/ipsec__import_crl.8.gz -share/man/man8/ipsec__plutorun.8.gz -share/man/man8/ipsec__realsetup.8.gz -share/man/man8/ipsec__secretcensor.8.gz -share/man/man8/ipsec__stackmanager.8.gz -share/man/man8/ipsec__unbound-hook.8.gz -share/man/man8/ipsec__updown.8.gz -share/man/man8/ipsec__updown.bsdkame.8.gz -share/man/man8/ipsec_addconn.8.gz -share/man/man8/ipsec_auto.8.gz -share/man/man8/ipsec_barf.8.gz -share/man/man8/ipsec_checknss.8.gz -share/man/man8/ipsec_ecdsasigkey.8.gz -share/man/man8/ipsec_import.8.gz -share/man/man8/ipsec_initnss.8.gz -share/man/man8/ipsec_letsencrypt.8.gz -share/man/man8/ipsec_look.8.gz -share/man/man8/ipsec_newhostkey.8.gz -share/man/man8/ipsec_pluto.8.gz -share/man/man8/ipsec_readwriteconf.8.gz -share/man/man8/ipsec_rsasigkey.8.gz -share/man/man8/ipsec_setup.8.gz -share/man/man8/ipsec_show.8.gz -share/man/man8/ipsec_showhostkey.8.gz -share/man/man8/ipsec_vendorid.8.gz -share/man/man8/ipsec_verify.8.gz -share/man/man8/ipsec_whack.8.gz -share/man/man8/pluto.8.gz