From e5e54135da213d32b629146be5a671336a6eb77c Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sun, 24 Oct 2021 19:54:00 -0700
Subject: opendnssec: blacklist do to ldns being blacklisted

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../packagegroup/packagegroup-core-security.bb     |  1 -
 recipes-security/opendnssec/opendnssec_2.1.10.bb   | 36 ++++++++++++++++++++++
 recipes-security/opendnssec/opendnssec_2.1.9.bb    | 34 --------------------
 3 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 recipes-security/opendnssec/opendnssec_2.1.10.bb
 delete mode 100644 recipes-security/opendnssec/opendnssec_2.1.9.bb

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index 6375e24..e9dad5b 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -39,7 +39,6 @@ RDEPENDS:packagegroup-security-utils = "\
     python3-fail2ban \
     softhsm \
     libest \
-    opendnssec \
     sshguard \
     ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd google-authenticator-libpam", "",d)} \
diff --git a/recipes-security/opendnssec/opendnssec_2.1.10.bb b/recipes-security/opendnssec/opendnssec_2.1.10.bb
new file mode 100644
index 0000000..6b53711
--- /dev/null
+++ b/recipes-security/opendnssec/opendnssec_2.1.10.bb
@@ -0,0 +1,36 @@
+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-2-Clause"
+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] = "c0a8427de241118dccbf7abc508e4dd53fb75b45e9f386addbadae7ecc092756"
+
+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"
+
+PNBLACKLIST[opendnssec] ?= "Needs porting to openssl 3.x"
diff --git a/recipes-security/opendnssec/opendnssec_2.1.9.bb b/recipes-security/opendnssec/opendnssec_2.1.9.bb
deleted file mode 100644
index 6c1bd46..0000000
--- a/recipes-security/opendnssec/opendnssec_2.1.9.bb
+++ /dev/null
@@ -1,34 +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-2-Clause"
-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] = "6d1d466c8d7f507f3e665f4bfe4d16a68d6bff9d7c2ab65f852e2b2a821c28b5"
-
-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