diff --git a/libreswan-3.30-s390x.patch b/libreswan-3.30-s390x.patch new file mode 100644 index 0000000..a229d8a --- /dev/null +++ b/libreswan-3.30-s390x.patch @@ -0,0 +1,21 @@ +commit 8b067b47b1e2306c83bed49ecada1bddfb1c1a38 +Author: Paul Wouters +Date: Fri Feb 14 15:22:21 2020 -0500 + + pluto: fixup: 'incl' may be used uninitialized in init_virtual_ip() + + For some reason, only the s390x compiler complains. + +diff --git a/programs/pluto/virtual.c b/programs/pluto/virtual.c +index ce94d5a5ee..74d77a3ab0 100644 +--- a/programs/pluto/virtual.c ++++ b/programs/pluto/virtual.c +@@ -172,7 +172,7 @@ void init_virtual_ip(const char *private_list) + if (next == NULL) + next = str + strlen(str); + +- bool incl; ++ bool incl = FALSE; + if (read_subnet(str, next - str, + &(private_net_incl[i_incl]), + &(private_net_excl[i_excl]), diff --git a/libreswan.spec b/libreswan.spec index e05cdd7..a6455d6 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -44,6 +44,8 @@ Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2 %endif +Patch1: libreswan-3.30-s390x.patch + Requires(post): bash coreutils systemd Requires(preun): systemd Requires(postun): systemd @@ -99,6 +101,7 @@ Libreswan is based on Openswan-2.6.38 which in turn is based on FreeS/WAN-2.04 %prep %setup -q -n libreswan-%{version}%{?prever} +%patch1 -p1 # Fedora should really figure this versioning out itself, not burden upstream sed -i "s:/usr/bin/python:/usr/bin/python3:" testing/cert_verify/usage_test sed -i "s:/usr/bin/python:/usr/bin/python3:" testing/pluto/ikev1-01-fuzzer/cve-2015-3204.py