diff --git a/libreswan-3.29-updown-syntax.patch b/libreswan-3.29-updown-syntax.patch new file mode 100644 index 0000000..e6eb679 --- /dev/null +++ b/libreswan-3.29-updown-syntax.patch @@ -0,0 +1,13 @@ +diff --git a/programs/_updown.netkey/_updown.netkey.in b/programs/_updown.netkey/_updown.netkey.in +index 9c76998233..21000b1ea4 100644 +--- a/programs/_updown.netkey/_updown.netkey.in ++++ b/programs/_updown.netkey/_updown.netkey.in +@@ -446,7 +446,7 @@ delsource() { + return ${st} + fi + # Remove source ip if it's not used any more. +- if [ -z $(ip -o route list src ${PLUTO_MY_SOURCEIP}) ]; then ++ if [ -z "$(ip -o route list src ${PLUTO_MY_SOURCEIP})" ]; then + if [ -n "${VTI_IFACE}" -a "${VTI_ROUTING}" = yes ]; then + interface="${VTI_IFACE}" + fi diff --git a/libreswan.spec b/libreswan.spec index ab2385b..99b52b0 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -29,7 +29,7 @@ Name: libreswan Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols # version is generated in the release script Version: 3.29 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1 +Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist} License: GPLv2 Url: https://libreswan.org/ Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz @@ -39,6 +39,8 @@ Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2 %endif +Patch1: libreswan-3.29-updown-syntax.patch + Requires(post): bash coreutils systemd Requires(preun): systemd Requires(postun): systemd @@ -107,6 +109,8 @@ sed -i "s:#[ ]*include \(.*\)\(/crypto-policies/back-ends/libreswan.config\)$:in # linking to freebl is no longer needed sed -i "s/-lfreebl //" mk/config.mk +%patch1 -p1 + %build %if 0%{with_efence} %global efence "-lefence" @@ -208,6 +212,9 @@ export NSS_DISABLE_HW_GCM=1 %{_libdir}/fipscheck/pluto.hmac %changelog +* Thu Jan 09 2020 Paul Wouters - 3.29-2 +- _updown.netkey: fix syntax error in checking routes + * Thu Jul 25 2019 Fedora Release Engineering - 3.29-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild