diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -9,7 +9,6 @@ libnss3.so libpam.so.0 libpthread.so.0 -libselinux.so.1 libsmime3.so libsystemd.so.0 libunbound.so.8 diff --git a/files/fix-runtime-breakage-with-nss-3.52.patch b/files/fix-runtime-breakage-with-nss-3.52.patch new file mode 100644 --- /dev/null +++ b/files/fix-runtime-breakage-with-nss-3.52.patch @@ -0,0 +1,17 @@ +diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c +index 93a027089a..571913cc1e 100644 +--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c ++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c +@@ -16,6 +16,12 @@ + #include + #include + ++/* ++ * Special advise from Bob Relyea - needs to go before any nss include ++ * ++ */ ++#define NSS_PKCS11_2_0_COMPAT 1 ++ + #include "lswlog.h" + #include "lswnss.h" + #include "prmem.h" diff --git a/files/pam_d_location.patch b/files/pam_d_location.patch --- a/files/pam_d_location.patch +++ b/files/pam_d_location.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index b706def..3bc1fe1 100644 +index 7487215..1cd36b8 100644 --- a/Makefile +++ b/Makefile -@@ -630,9 +630,9 @@ local-install: +@@ -220,9 +220,9 @@ local-install: echo -e "**********************************************************************\n" ; \ fi \ fi diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : libreswan -version : 3.27 -release : 4 +version : 3.32 +release : 5 source : - - https://github.com/libreswan/libreswan/archive/v3.27.tar.gz : ead07dd701116094b483dc57e54e2a5ee9a06d3982bb142260bcbf3d1faf7b82 + - https://github.com/libreswan/libreswan/archive/v3.32.tar.gz : 236b57fee8f562302c54f2b16d8a839a9039fcb5893668e61b398ec6b179432e license : GPL-2.0-or-later component : network.util summary : An Internet Key Exchange (IKE) implementation for Linux @@ -17,8 +17,11 @@ - pkgconfig(nss) - docbook-xml - xmlto +conflicts : + - strongswan setup : | %patch -p1 < $pkgfiles/pam_d_location.patch + %patch -p1 < $pkgfiles/fix-runtime-breakage-with-nss-3.52.patch build : | %make INC_USRLOCAL=/usr programs install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ libreswan - Joshua Strobl - joshua@streambits.io + Longwu Ou + xulongwu4@gmail.com GPL-2.0-or-later network.util @@ -28,78 +28,64 @@ /etc/ipsec.d/policies/private-or-clear /etc/ipsec.secrets /usr/lib/systemd/system/ipsec.service + /usr/lib/tmpfiles.d/libreswan.conf /usr/libexec/ipsec/_import_crl - /usr/libexec/ipsec/_keycensor /usr/libexec/ipsec/_plutorun /usr/libexec/ipsec/_secretcensor /usr/libexec/ipsec/_stackmanager /usr/libexec/ipsec/_unbound-hook /usr/libexec/ipsec/_updown - /usr/libexec/ipsec/_updown.klips /usr/libexec/ipsec/_updown.netkey /usr/libexec/ipsec/addconn /usr/libexec/ipsec/algparse /usr/libexec/ipsec/auto /usr/libexec/ipsec/barf /usr/libexec/ipsec/cavp + /usr/libexec/ipsec/dncheck /usr/libexec/ipsec/enumcheck - /usr/libexec/ipsec/eroute - /usr/libexec/ipsec/klipsdebug + /usr/libexec/ipsec/ipcheck + /usr/libexec/ipsec/jambufcheck + /usr/libexec/ipsec/letsencrypt /usr/libexec/ipsec/look /usr/libexec/ipsec/newhostkey - /usr/libexec/ipsec/pf_key /usr/libexec/ipsec/pluto /usr/libexec/ipsec/readwriteconf /usr/libexec/ipsec/rsasigkey /usr/libexec/ipsec/setup /usr/libexec/ipsec/show /usr/libexec/ipsec/showhostkey - /usr/libexec/ipsec/spi - /usr/libexec/ipsec/spigrp - /usr/libexec/ipsec/tncfg + /usr/libexec/ipsec/shunkcheck + /usr/libexec/ipsec/timecheck /usr/libexec/ipsec/verify /usr/libexec/ipsec/whack /usr/man/man5/ipsec.conf.5 /usr/man/man5/ipsec.secrets.5 - /usr/man/man5/ipsec_eroute.5 - /usr/man/man5/ipsec_klipsdebug.5 - /usr/man/man5/ipsec_pf_key.5 - /usr/man/man5/ipsec_spi.5 - /usr/man/man5/ipsec_spigrp.5 - /usr/man/man5/ipsec_tncfg.5 /usr/man/man5/ipsec_trap_count.5 /usr/man/man5/ipsec_trap_sendcount.5 /usr/man/man5/ipsec_version.5 /usr/man/man8/ipsec.8 /usr/man/man8/ipsec__import_crl.8 - /usr/man/man8/ipsec__keycensor.8 /usr/man/man8/ipsec__plutorun.8 /usr/man/man8/ipsec__secretcensor.8 /usr/man/man8/ipsec__stackmanager.8 /usr/man/man8/ipsec__unbound-hook.8 /usr/man/man8/ipsec__updown.8 - /usr/man/man8/ipsec__updown.klips.8 /usr/man/man8/ipsec__updown.netkey.8 /usr/man/man8/ipsec_addconn.8 /usr/man/man8/ipsec_auto.8 /usr/man/man8/ipsec_barf.8 /usr/man/man8/ipsec_checknss.8 - /usr/man/man8/ipsec_eroute.8 /usr/man/man8/ipsec_import.8 /usr/man/man8/ipsec_initnss.8 - /usr/man/man8/ipsec_klipsdebug.8 + /usr/man/man8/ipsec_letsencrypt.8 /usr/man/man8/ipsec_look.8 /usr/man/man8/ipsec_newhostkey.8 - /usr/man/man8/ipsec_pf_key.8 /usr/man/man8/ipsec_pluto.8 /usr/man/man8/ipsec_readwriteconf.8 /usr/man/man8/ipsec_rsasigkey.8 /usr/man/man8/ipsec_setup.8 /usr/man/man8/ipsec_show.8 /usr/man/man8/ipsec_showhostkey.8 - /usr/man/man8/ipsec_spi.8 - /usr/man/man8/ipsec_spigrp.8 - /usr/man/man8/ipsec_tncfg.8 /usr/man/man8/ipsec_verify.8 /usr/man/man8/ipsec_whack.8 /usr/man/man8/pluto.8 @@ -108,14 +94,17 @@ /usr/share/doc/libreswan/ipsec.conf-sample /usr/share/doc/libreswan/ipsec.secrets-sample + + strongswan + - - 2020-07-13 - 3.27 + + 2020-07-21 + 3.32 Packaging update - Joshua Strobl - joshua@streambits.io + Longwu Ou + xulongwu4@gmail.com \ No newline at end of file