Attachment 250331 Details for Bug 278698 – patch

[patch] patch

0001-devel-open62541-Update-to-version-1.4.0.patch (text/plain), 8.11 KB, created by Nico Sonack on 2024-05-02 15:55:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nico Sonack

Created: 2024-05-02 15:55:45 UTC

Size: 8.11 KB

patch

obsolete

>From 96aacad483235a8fc328d2dca9f7d0c4b2cda0e5 Mon Sep 17 00:00:00 2001
>From: Nico Sonack <nsonack@herrhotzenplotz.de>
>Date: Thu, 2 May 2024 17:28:45 +0200
>Subject: [PATCH] devel/open62541: Update to version 1.4.0
>
>The added patches have already been upstreamed at:
>https://github.com/open62541/open62541/commit/4d0b97ecbdc8b46930c368f8a5b45272982724cd
>
>Signed-off-by: Nico Sonack <nsonack@herrhotzenplotz.de>
>---
> devel/open62541/Makefile                      | 16 ++---
> devel/open62541/distinfo                      |  6 +-
> .../files/patch-arch_posix_ua__architecture.h | 10 +++
> .../files/patch-include_open62541_config.h.in | 11 ++++
> devel/open62541/pkg-plist                     | 63 +++----------------
> 5 files changed, 39 insertions(+), 67 deletions(-)
> create mode 100644 devel/open62541/files/patch-arch_posix_ua__architecture.h
> create mode 100644 devel/open62541/files/patch-include_open62541_config.h.in
>
>diff --git a/devel/open62541/Makefile b/devel/open62541/Makefile
>index 1a9ca5e2eeb8..5c45d153cf87 100644
>--- a/devel/open62541/Makefile
>+++ b/devel/open62541/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	open62541
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.3.9
>+DISTVERSION=	1.4.0
> CATEGORIES=	devel
> 
> MAINTAINER=	nsonack@outlook.com
>@@ -16,21 +16,15 @@ USE_LDCONFIG=	yes
> 
> SHEBANG_GLOB=	*.py
> 
>-CMAKE_ON=	BUILD_SHARED_LIBS \
>-		CMAKE_DISABLE_FIND_PACKAGE_Git
>+CMAKE_ON=	BUILD_SHARED_LIBS CMAKE_DISABLE_FIND_PACKAGE_Git
> CMAKE_OFF=	UA_FORCE_WERROR
> PLIST_SUB=	DISTVERSION=${DISTVERSION}
> 
> OPTIONS_DEFINE=		OSSL
> OPTIONS_DEFAULT=	OSSL
> 
>-OSSL_DESC=		Enable encryption using OpenSSL
>-OSSL_USES=		ssl
>-OSSL_CMAKE_ON=		-DUA_ENABLE_ENCRYPTION=OPENSSL
>-OSSL_PLIST_FILES=	include/open62541/plugin/create_certificate.h
>-
>-post-install:
>-	${RMDIR} ${STAGEDIR}${DATADIR}/tools/ua-nodeset
>-	${RMDIR} ${STAGEDIR}${DATADIR}/tools/nodeset_compiler/__pycache__
>+OSSL_DESC=	Enable encryption using OpenSSL
>+OSSL_USES=	ssl
>+OSSL_CMAKE_ON=	-DUA_ENABLE_ENCRYPTION=OPENSSL
> 
> .include <bsd.port.mk>
>diff --git a/devel/open62541/distinfo b/devel/open62541/distinfo
>index 41869815811f..4d0fd4cd0f69 100644
>--- a/devel/open62541/distinfo
>+++ b/devel/open62541/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1702055182
>-SHA256 (open62541-open62541-v1.3.9_GH0.tar.gz) = 71764d4a060cfa07eae7aaabd176da38b155ef01c63103513339699fd8026e2f
>-SIZE (open62541-open62541-v1.3.9_GH0.tar.gz) = 3874701
>+TIMESTAMP = 1713260308
>+SHA256 (open62541-open62541-v1.4.0_GH0.tar.gz) = 22a7a1f821b26f541feb96cc5879e0c76cb3b968e508209b5bf98f2869b11a89
>+SIZE (open62541-open62541-v1.4.0_GH0.tar.gz) = 4193601
>diff --git a/devel/open62541/files/patch-arch_posix_ua__architecture.h b/devel/open62541/files/patch-arch_posix_ua__architecture.h
>new file mode 100644
>index 000000000000..ba88a1be2911
>--- /dev/null
>+++ b/devel/open62541/files/patch-arch_posix_ua__architecture.h
>@@ -0,0 +1,10 @@
>+--- arch/posix/ua_architecture.h.orig	2024-04-16 09:46:18 UTC
>++++ arch/posix/ua_architecture.h
>+@@ -14,6 +14,7 @@
>+ 
>+ #include <errno.h>
>+ #include <arpa/inet.h>
>++#include <netinet/in.h>
>+ #include <netinet/tcp.h>
>+ #include <netdb.h>
>+ #include <sys/ioctl.h>
>diff --git a/devel/open62541/files/patch-include_open62541_config.h.in b/devel/open62541/files/patch-include_open62541_config.h.in
>new file mode 100644
>index 000000000000..28b01054dffd
>--- /dev/null
>+++ b/devel/open62541/files/patch-include_open62541_config.h.in
>@@ -0,0 +1,11 @@
>+--- include/open62541/config.h.in.orig	2024-04-16 09:39:29 UTC
>++++ include/open62541/config.h.in
>+@@ -130,7 +130,7 @@
>+  * header. */
>+ #ifdef UA_ARCHITECTURE_POSIX
>+ # if !defined(_XOPEN_SOURCE)
>+-#  define _XOPEN_SOURCE 600
>++/*#  define _XOPEN_SOURCE 600 */
>+ # endif
>+ # ifndef _DEFAULT_SOURCE
>+ #  define _DEFAULT_SOURCE
>diff --git a/devel/open62541/pkg-plist b/devel/open62541/pkg-plist
>index bde1e79461cf..8ea5f1c5122b 100644
>--- a/devel/open62541/pkg-plist
>+++ b/devel/open62541/pkg-plist
>@@ -1,7 +1,3 @@
>-include/aa_tree.h
>-include/ms_stdint.h
>-include/open62541/architecture_definitions.h
>-include/open62541/architecture_functions.h
> include/open62541/client.h
> include/open62541/client_config_default.h
> include/open62541/client_highlevel.h
>@@ -9,78 +5,39 @@ include/open62541/client_highlevel_async.h
> include/open62541/client_subscriptions.h
> include/open62541/common.h
> include/open62541/config.h
>-include/open62541/network_tcp.h
> include/open62541/nodeids.h
> include/open62541/plugin/accesscontrol.h
> include/open62541/plugin/accesscontrol_default.h
>+include/open62541/plugin/create_certificate.h
>+include/open62541/plugin/eventloop.h
>+include/open62541/plugin/historydata/history_data_backend.h
>+include/open62541/plugin/historydata/history_data_backend_memory.h
>+include/open62541/plugin/historydata/history_data_gathering.h
>+include/open62541/plugin/historydata/history_data_gathering_default.h
>+include/open62541/plugin/historydata/history_database_default.h
>+include/open62541/plugin/historydatabase.h
> include/open62541/plugin/log.h
> include/open62541/plugin/log_stdout.h
> include/open62541/plugin/log_syslog.h
>-include/open62541/plugin/network.h
> include/open62541/plugin/nodestore.h
> include/open62541/plugin/nodestore_default.h
> include/open62541/plugin/pki.h
> include/open62541/plugin/pki_default.h
>-include/open62541/plugin/pubsub.h
> include/open62541/plugin/securitypolicy.h
> include/open62541/plugin/securitypolicy_default.h
>-include/open62541/posix/ua_architecture.h
> include/open62541/server.h
> include/open62541/server_config_default.h
>+include/open62541/server_config_file_based.h
> include/open62541/server_pubsub.h
> include/open62541/statuscodes.h
> include/open62541/types.h
> include/open62541/types_generated.h
> include/open62541/types_generated_handling.h
> include/open62541/util.h
>-include/ziptree.h
> lib/cmake/open62541/open62541Config.cmake
> lib/cmake/open62541/open62541ConfigVersion.cmake
>-lib/cmake/open62541/open62541Macros.cmake
>-lib/cmake/open62541/open62541Targets-release.cmake
>+lib/cmake/open62541/open62541Targets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/open62541/open62541Targets.cmake
> lib/libopen62541.so
> lib/libopen62541.so.1
> lib/libopen62541.so.%%DISTVERSION%%
>-%%DATADIR%%/tools/certs/create_self-signed.py
>-%%DATADIR%%/tools/certs/localhost.cnf
>-%%DATADIR%%/tools/generate_datatypes.py
>-%%DATADIR%%/tools/generate_nodeid_header.py
>-%%DATADIR%%/tools/generate_statuscode_descriptions.py
>-%%DATADIR%%/tools/nodeset_compiler/NodeID_NS0_Base.txt
>-%%DATADIR%%/tools/nodeset_compiler/README.md
>-%%DATADIR%%/tools/nodeset_compiler/__init__.py
>-%%DATADIR%%/tools/nodeset_compiler/backend_graphviz.py
>-%%DATADIR%%/tools/nodeset_compiler/backend_open62541.py
>-%%DATADIR%%/tools/nodeset_compiler/backend_open62541_datatypes.py
>-%%DATADIR%%/tools/nodeset_compiler/backend_open62541_nodes.py
>-%%DATADIR%%/tools/nodeset_compiler/backend_open62541_typedefinitions.py
>-%%DATADIR%%/tools/nodeset_compiler/datatypes.py
>-%%DATADIR%%/tools/nodeset_compiler/nodes.py
>-%%DATADIR%%/tools/nodeset_compiler/nodeset.py
>-%%DATADIR%%/tools/nodeset_compiler/nodeset_compiler.py
>-%%DATADIR%%/tools/nodeset_compiler/nodeset_testing.py
>-%%DATADIR%%/tools/nodeset_compiler/opaque_type_mapping.py
>-%%DATADIR%%/tools/nodeset_compiler/type_parser.py
>-%%DATADIR%%/tools/schema/Custom.Opc.Ua.Transport.bsd
>-%%DATADIR%%/tools/schema/NodeIds.csv
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.DiagnosticsMinimal.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.HistorizingMinimal.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.Part8_Subset.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.NodeSet2.Reduced.xml
>-%%DATADIR%%/tools/schema/Opc.Ua.Types.bsd
>-%%DATADIR%%/tools/schema/StatusCode.csv
>-%%DATADIR%%/tools/schema/datatypes_dataaccess.txt
>-%%DATADIR%%/tools/schema/datatypes_diagnostics.txt
>-%%DATADIR%%/tools/schema/datatypes_discovery.txt
>-%%DATADIR%%/tools/schema/datatypes_events.txt
>-%%DATADIR%%/tools/schema/datatypes_historizing.txt
>-%%DATADIR%%/tools/schema/datatypes_method.txt
>-%%DATADIR%%/tools/schema/datatypes_minimal.txt
>-%%DATADIR%%/tools/schema/datatypes_pubsub.txt
>-%%DATADIR%%/tools/schema/datatypes_query.txt
>-%%DATADIR%%/tools/schema/datatypes_subscriptions.txt
>-%%DATADIR%%/tools/schema/datatypes_transport.txt
>-%%DATADIR%%/tools/schema/datatypes_typedescription.txt
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 278698: 250331 | 250361