From 7d3704b22c6927a09942b9b9a851bbe8ad7bc379 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 28 Feb 2021 21:36:32 +0000 Subject: opendnssec: update to 2.1.8 refresh libdns_conf_fix.patch Drop fix_fprint.patch includd in update Signed-off-by: Armin Kuster --- recipes-security/opendnssec/files/fix_fprint.patch | 25 ------------ .../opendnssec/files/libdns_conf_fix.patch | 45 +++++++++++----------- recipes-security/opendnssec/opendnssec_2.1.6.bb | 37 ------------------ recipes-security/opendnssec/opendnssec_2.1.8.bb | 34 ++++++++++++++++ 4 files changed, 56 insertions(+), 85 deletions(-) delete mode 100644 recipes-security/opendnssec/files/fix_fprint.patch delete mode 100644 recipes-security/opendnssec/opendnssec_2.1.6.bb create mode 100644 recipes-security/opendnssec/opendnssec_2.1.8.bb diff --git a/recipes-security/opendnssec/files/fix_fprint.patch b/recipes-security/opendnssec/files/fix_fprint.patch deleted file mode 100644 index da0bcfe..0000000 --- a/recipes-security/opendnssec/files/fix_fprint.patch +++ /dev/null @@ -1,25 +0,0 @@ -format not a string literal and no format arguments - -missing module_str in call - -Upstream-Status: Pending -Signed-off-by: Armin Kuster - -../../../git/enforcer/src/keystate/keystate_ds.c:192:7: error: format not a string literal and no format arguments [-Werror=format-security] -| 192 | ods_log_error_and_printf(sockfd, "Failed to run %s", cp_ds); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - - -Index: git/enforcer/src/keystate/keystate_ds.c -=================================================================== ---- git.orig/enforcer/src/keystate/keystate_ds.c -+++ git/enforcer/src/keystate/keystate_ds.c -@@ -189,7 +189,7 @@ exec_dnskey_by_id(int sockfd, struct dbw - status = 0; - } - else { -- ods_log_error_and_printf(sockfd, "Failed to run %s", cp_ds); -+ ods_log_error_and_printf(sockfd, module_str, "Failed to run %s", cp_ds); - status = 7; - } - } diff --git a/recipes-security/opendnssec/files/libdns_conf_fix.patch b/recipes-security/opendnssec/files/libdns_conf_fix.patch index 126e197..31d7252 100644 --- a/recipes-security/opendnssec/files/libdns_conf_fix.patch +++ b/recipes-security/opendnssec/files/libdns_conf_fix.patch @@ -4,14 +4,29 @@ Upstream-Status: OE specific Signed-off-by: Armin Kuster -Index: opendnssec-2.1.6/m4/acx_ldns.m4 +Index: opendnssec-2.1.8/configure.ac =================================================================== ---- opendnssec-2.1.6.orig/m4/acx_ldns.m4 -+++ opendnssec-2.1.6/m4/acx_ldns.m4 -@@ -1,128 +1,65 @@ +--- opendnssec-2.1.8.orig/configure.ac ++++ opendnssec-2.1.8/configure.ac +@@ -133,9 +133,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_ + + # common dependencies + ACX_LIBXML2 +-ACX_LDNS(1,6,17) +-ACX_LDNS_NOT(1,6,14, [binary incompatibility, see http://open.nlnetlabs.nl/pipermail/ldns-users/2012-October/000564.html]) +-ACX_LDNS_NOT(1,6,15, [fail to create NSEC3 bitmap for empty non-terminals, see http://www.nlnetlabs.nl/pipermail/ldns-users/2012-November/000565.html]) ++ACX_LDNS(1.6.17) + ACX_PKCS11_MODULES + ACX_RT + ACX_LIBC +Index: opendnssec-2.1.8/m4/acx_ldns.m4 +=================================================================== +--- opendnssec-2.1.8.orig/m4/acx_ldns.m4 ++++ opendnssec-2.1.8/m4/acx_ldns.m4 +@@ -1,128 +1,63 @@ -AC_DEFUN([ACX_LDNS],[ - AC_ARG_WITH(ldns, -- [AC_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], +- [AS_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], - [ - LDNS_PATH="$withval" - AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) @@ -70,8 +85,7 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 - AC_MSG_ERROR([ldns library too old ($1.$2.$3 or later required)]) - ],[]) - AC_LANG_POP([C]) -+#serial 11 - +- - CPPFLAGS=$tmp_CPPFLAGS - - AC_SUBST(LDNS_INCLUDES) @@ -81,7 +95,7 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 - -AC_DEFUN([ACX_LDNS_NOT],[ - AC_ARG_WITH(ldns, -- [AC_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], +- [AS_HELP_STRING([--with-ldns=PATH],[specify prefix of path of ldns library to use])], - [ - LDNS_PATH="$withval" - AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) @@ -200,18 +214,3 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4 + AC_SUBST([LDNS_LIBS]) + AC_SUBST([LDNS_LDFLAGS]) ]) -Index: opendnssec-2.1.6/configure.ac -=================================================================== ---- opendnssec-2.1.6.orig/configure.ac -+++ opendnssec-2.1.6/configure.ac -@@ -138,9 +138,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_ - - # common dependencies - ACX_LIBXML2 --ACX_LDNS(1,6,17) --ACX_LDNS_NOT(1,6,14, [binary incompatibility, see http://open.nlnetlabs.nl/pipermail/ldns-users/2012-October/000564.html]) --ACX_LDNS_NOT(1,6,15, [fail to create NSEC3 bitmap for empty non-terminals, see http://www.nlnetlabs.nl/pipermail/ldns-users/2012-November/000565.html]) -+ACX_LDNS(1.6.17) - ACX_PKCS11_MODULES - ACX_RT - ACX_LIBC diff --git a/recipes-security/opendnssec/opendnssec_2.1.6.bb b/recipes-security/opendnssec/opendnssec_2.1.6.bb deleted file mode 100644 index 5e42ca8..0000000 --- a/recipes-security/opendnssec/opendnssec_2.1.6.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "OpenDNSSEC is a policy-based zone signer that automates the process of keeping track of DNSSEC keys and the signing of zones" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b041dbe2da80d4efd951393fbba90937" - -DEPENDS = "libxml2 openssl ldns libmicrohttpd jansson libyaml " - -SRC_URI = "git://github.com/opendnssec/opendnssec;branch=develop \ - file://libxml2_conf.patch \ - file://libdns_conf_fix.patch \ - file://fix_fprint.patch \ - " - -SRCREV = "5876bccb38428790e2e9afc806ca68b029879874" - -inherit autotools pkgconfig perlnative - -S = "${WORKDIR}/git" - -EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \ - --with-ssl=${STAGING_DIR_HOST}/usr " - -CFLAGS += "-fcommon" - -PACKAGECONFIG ?= "sqlite3" - -PACKAGECONFIG[cunit] = "--with-cunit=${STAGING_DIR_HOST}/usr, --without-cunit," -PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}/usr, ,sqlite3, sqlite3" -PACKAGECONFIG[mysql] = "--with-mysql=yes, , mariadb, mariadb" -PACKAGECONFIG[readline] = "--with-readline, --without-readline, readline" -PACKAGECONFIG[unwind] = "--with-libunwind, --without-libunwind" - -do_install_append () { - rm -rf ${D}${localstatedir}/run -} - -RDEPENDS_${PN} = "softhsm" diff --git a/recipes-security/opendnssec/opendnssec_2.1.8.bb b/recipes-security/opendnssec/opendnssec_2.1.8.bb new file mode 100644 index 0000000..cf6bdbd --- /dev/null +++ b/recipes-security/opendnssec/opendnssec_2.1.8.bb @@ -0,0 +1,34 @@ +SUMMARY = "OpenDNSSEC is a policy-based zone signer that automates the process of keeping track of DNSSEC keys and the signing of zones" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b041dbe2da80d4efd951393fbba90937" + +DEPENDS = "libxml2 openssl ldns libmicrohttpd jansson libyaml " + +SRC_URI = "https://dist.opendnssec.org/source/opendnssec-${PV}.tar.gz \ + file://libxml2_conf.patch \ + file://libdns_conf_fix.patch \ + " + +SRC_URI[sha256sum] = "900a213103ff19a405e446327fbfcea9ec13e405283d87b6ffc24a10d9a268f5" + +inherit autotools pkgconfig perlnative + +EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \ + --with-ssl=${STAGING_DIR_HOST}/usr " + +CFLAGS += "-fcommon" + +PACKAGECONFIG ?= "sqlite3" + +PACKAGECONFIG[cunit] = "--with-cunit=${STAGING_DIR_HOST}/usr, --without-cunit," +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}/usr, ,sqlite3, sqlite3" +PACKAGECONFIG[mysql] = "--with-mysql=yes, , mariadb, mariadb" +PACKAGECONFIG[readline] = "--with-readline, --without-readline, readline" +PACKAGECONFIG[unwind] = "--with-libunwind, --without-libunwind" + +do_install_append () { + rm -rf ${D}${localstatedir}/run +} + +RDEPENDS_${PN} = "softhsm" -- cgit v1.2.3-54-g00ecf