From patchwork Tue Jun 9 02:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1305537 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rockwellcollins.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49gtwd0NCwz9sRK for ; Tue, 9 Jun 2020 12:14:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6F12C875A9; Tue, 9 Jun 2020 02:14:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kfZ8wAAf5hmV; Tue, 9 Jun 2020 02:14:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 74B2687475; Tue, 9 Jun 2020 02:14:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1233E1BF2A0 for ; Tue, 9 Jun 2020 02:14:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0DA2D87475 for ; Tue, 9 Jun 2020 02:14:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vGRwdhPQA44M for ; Tue, 9 Jun 2020 02:14:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs05.rockwellcollins.com (ch3vs05.rockwellcollins.com [205.175.226.130]) by whitealder.osuosl.org (Postfix) with ESMTPS id D49448743E for ; Tue, 9 Jun 2020 02:14:13 +0000 (UTC) IronPort-SDR: FGEHVnJJhwpugAlG3SatbHqKwO53ss/F728r2BwtiDAp5vZ7PjrjMUdfws2RTOoJsO04sBWXWW ZuvnBokEmktrZ0FmeGoxS6p540110qAfG8WHxk5dC8M6/+k0IypXciYifgn3Z0Zv2eKfqqmNvu fmXwWHnBL8l1PlkhjqK1NK1sExcEachjuAgzEeUKNGBXULckEy1piHIflMNbjYaM8HtrmW10Zd KxS97+J1cGrbFhDRwvFMIgRFjmzLy8HbxCM6b8goL8lEyOuZDSK8O7WCZ1naJWKLOVsH38cAWE peY= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs05.rockwellcollins.com with ESMTP; 08 Jun 2020 21:14:12 -0500 X-Received: from biscuits.rockwellcollins.com (biscuits.rockwellcollins.lab [10.148.119.137]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 78ADA20051; Mon, 8 Jun 2020 21:14:12 -0500 (CDT) From: Matt Weber To: buildroot@buildroot.org Date: Mon, 8 Jun 2020 21:14:11 -0500 Message-Id: <20200609021411.3778-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] package/xml-security-c: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Weber , Chris Simons MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Chris Simons Adds support for the Apache Santuario XML Security for C++ that implementations the XML Digital Signature and Encryption specifications. Signed-off-by: Chris Simons Signed-off-by: Matthew Weber --- Changes v1 -> v2 [Thomas P - Added build time dependency on openssl as it is needed (test build lucked out that openssl was already built) - Added autoconf cached value for getcmd test and upstreamed - Made Config.in dependency style updates --- DEVELOPERS | 1 + package/Config.in | 1 + ...ariable-cache-option-for-getcwd-test.patch | 50 +++++++++++++++++++ package/xml-security-c/Config.in | 15 ++++++ package/xml-security-c/xml-security-c.hash | 4 ++ package/xml-security-c/xml-security-c.mk | 19 +++++++ 6 files changed, 90 insertions(+) create mode 100644 package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch create mode 100644 package/xml-security-c/Config.in create mode 100644 package/xml-security-c/xml-security-c.hash create mode 100644 package/xml-security-c/xml-security-c.mk diff --git a/DEVELOPERS b/DEVELOPERS index efb97c739c..bd5a2d9cb4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1723,6 +1723,7 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: package/xml-security-c/ F: support/testing/tests/package/br2-external/openjdk/ F: support/testing/tests/package/test_openjdk.py F: support/testing/tests/package/test_opkg/ diff --git a/package/Config.in b/package/Config.in index 85d7326361..3560bd9149 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1586,6 +1586,7 @@ menu "JSON/XML" source "package/tinyxml2/Config.in" source "package/valijson/Config.in" source "package/xerces/Config.in" + source "package/xml-security-c/Config.in" source "package/yajl/Config.in" source "package/yaml-cpp/Config.in" endmenu diff --git a/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch new file mode 100644 index 0000000000..26b53ba719 --- /dev/null +++ b/package/xml-security-c/0001-autoconf-variable-cache-option-for-getcwd-test.patch @@ -0,0 +1,50 @@ +From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Thu, 4 Jun 2020 20:34:11 -0500 +Subject: [PATCH] autoconf variable cache option for getcwd test + +The cached variable allows cross compiled builds to successfully set the +desired default for this value without invoking a test. + +Fixes: +https://issues.apache.org/jira/browse/SANTUARIO-549 + +Signed-off-by: Matthew Weber +--- + configure.ac | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b43d7a5..c3d4489 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp]) + + # Check whether getcwd can dynamically allocate memory. + AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([#include +- #include ], +-[char *cwd = getcwd(NULL, 0); +-return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], +- [AC_MSG_RESULT(yes) +- AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], +- [Define to 1 if getcwd(NULL, 0) works])], +- [AC_MSG_RESULT(no)]) ++AC_CACHE_VAL([xml_cv_func_getcwd_null], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ++ #include ++ char *cwd = getcwd(NULL, 0); ++ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])], ++ [xml_cv_func_getcwd_null=yes], ++ [xml_cv_func_getcwd_null=no])]) ++AC_MSG_RESULT([$xml_cv_func_getcwd_null]) ++if test $xml_cv_func_getcwd_null = yes; then ++AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1], ++ [Define to 1 if getcwd(NULL, 0) works]) ++fi + + AC_LANG(C++) + +-- +2.17.1 + diff --git a/package/xml-security-c/Config.in b/package/xml-security-c/Config.in new file mode 100644 index 0000000000..0d0385c698 --- /dev/null +++ b/package/xml-security-c/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_XML_SECURITY_C + bool "xml-security-c" + depends on BR2_INSTALL_LIBSTDCPP # xerces + depends on BR2_USE_WCHAR # xerces + select BR2_PACKAGE_XERCES + select BR2_PACKAGE_OPENSSL + help + The xml-security-c library is a C++ implementation of + the XML Digital Signature and Encryption specifications. + + https://santuario.apache.org/cindex.html + +comment "xml-security-c needs a toolchain w/ C++, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_USE_WCHAR diff --git a/package/xml-security-c/xml-security-c.hash b/package/xml-security-c/xml-security-c.hash new file mode 100644 index 0000000000..9a82a55f17 --- /dev/null +++ b/package/xml-security-c/xml-security-c.hash @@ -0,0 +1,4 @@ +# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.2.tar.gz.sha256 +sha256 c303a2b08cb9ca0f5594adcbb83829b1e793175d7114a82f7d78def8bb2e30df xml-security-c-2.0.2.tar.gz + +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/xml-security-c/xml-security-c.mk b/package/xml-security-c/xml-security-c.mk new file mode 100644 index 0000000000..36f69483c2 --- /dev/null +++ b/package/xml-security-c/xml-security-c.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# xml-security-c +# +################################################################################ + +XML_SECURITY_C_VERSION = 2.0.2 +XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library +XML_SECURITY_C_LICENSE = Apache-2.0 +XML_SECURITY_C_LICENSE_FILES = LICENSE.txt +XML_SECURITY_C_DEPENDENCIES = openssl xerces +XML_SECURITY_C_INSTALL_STAGING = YES + +XML_SECURITY_C_CONF_ENV = xml_cv_func_getcwd_null=yes + +# Patched configure.ac +XML_SECURITY_C_AUTORECONF = YES + +$(eval $(autotools-package))