diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index b264063..3c27dad 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -18773,7 +18773,7 @@ index 95e52e3587..045dce8f5f 100644 bool mf_is_set(const struct mf_field *, const struct flow *); void mf_mask_field(const struct mf_field *, struct flow_wildcards *); diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in -index 64111768b3..668507fd37 100755 +index 64111768b3..41ef886194 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -14,6 +14,7 @@ @@ -18784,6 +18784,42 @@ index 64111768b3..668507fd37 100755 import re import subprocess import sys +@@ -201,18 +202,18 @@ conn prevent_unencrypted_vxlan + """ + + auth_tmpl = {"psk": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + authby=psk"""), + "pki_remote": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + leftid=$local_name + rightid=$remote_name + leftcert=$certificate + rightcert=$remote_cert"""), + "pki_ca": Template("""\ +- left=0.0.0.0 ++ left=%any + right=$remote_ip + leftid=$local_name + rightid=$remote_name +@@ -298,11 +299,11 @@ conn prevent_unencrypted_vxlan + + def config_tunnel(self, tunnel): + if tunnel.conf["psk"]: +- self.secrets_file.write('0.0.0.0 %s : PSK "%s"\n' % ++ self.secrets_file.write('%%any %s : PSK "%s"\n' % + (tunnel.conf["remote_ip"], tunnel.conf["psk"])) + auth_section = self.auth_tmpl["psk"].substitute(tunnel.conf) + else: +- self.secrets_file.write("0.0.0.0 %s : RSA %s\n" % ++ self.secrets_file.write("%%any %s : RSA %s\n" % + (tunnel.conf["remote_ip"], + tunnel.conf["private_key"])) + if tunnel.conf["remote_cert"]: @@ -413,6 +414,11 @@ conn prevent_unencrypted_vxlan leftprotoport=udp/4789 mark={0} diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 21d5c75..4d766c4 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 59%{?dist} +Release: 60%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Fri Jan 21 2022 Open vSwitch CI - 2.15.0-60 +- Merging upstream branch-2.15 [RH git: a70244a272] + Commit list: + e59194b606 ovs-monitor-ipsec: Fix generated strongSwan ipsec.conf for IPv6. + + * Thu Jan 20 2022 Open vSwitch CI - 2.15.0-59 - Merging upstream branch-2.15 [RH git: d17382a24e] Commit list: