component/open62541: v↑ open62541 (1.3 -> 1.3.7)

component/open62541/buildout.cfg

@@ -11,21 +11,22 @@ extends =
   ../gcc/buildout.cfg
   ../defaults.cfg
 
-[gcc]
-max_version = 11
-
 [open62541]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.zip
-md5sum = c2e9938f082b027110fba538de76684c
+url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.7.zip
+md5sum = f3a2ce606c79ba4125dbad61b1eb932a
 patch-options = -p1
 patches =
+<<<<<<< HEAD
   ${:_profile_base_location_}/ipv6_bugfix.patch#355bec02adee4ea73ff5a56ba6971ad2
 pre-configure =
   # remove old FindPython3 which does not know about python > 3.8 to
   # use FindPython3 bundled with slapos' cmake
   rm tools/cmake/FindPython3.cmake tools/cmake/FindPython/Support.cmake
+=======
+  ${:_profile_base_location_}/ipv6_bugfix.patch#ab04c23f81fc3e2882e44571bba2f525
+>>>>>>> a904509f7 (component/open62541: v↑ open62541 (1.3 -> 1.3.7))
 configure-command =
   ${cmake:location}/bin/cmake
 configure-options =

component/open62541/ipv6_bugfix.patch

-commit ccdde2eddfd2e0937ba0b452063c60c214f5f2f5 (HEAD -> master)
-Author: Thomas Gambier <thomas.gambier@nexedi.com>
-Date:   Sat May 28 19:18:02 2022 +0200
-
-    BUGFIX: UA_PubSubChannelUDPMC_regist supports different interface in IPv6
-
 diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
-index 2c6ea480..f66f5860 100644
+index 860ddd488..00a48bb12 100644
 --- a/plugins/ua_pubsub_udp.c
 +++ b/plugins/ua_pubsub_udp.c
 @@ -319,6 +319,7 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
@@ -24,4 +18,3 @@ index 2c6ea480..f66f5860 100644
  
          if(UA_setsockopt(channel->sockfd,
              connectionConfig->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-