mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 04:58:47 +00:00
opendnssec: Upgrade to 2.1.14
Upgrade to 2.1.14 and add some patches from the github PR queue to fix compilation. Signed-off-by: Scott Murray <scott.murray@konsulko.com>
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
From 7060607ef359162d5b0aef62a4b8440fd42c9d28 Mon Sep 17 00:00:00 2001
|
||||
From: Yaakov Selkowitz <yselkowi@redhat.com>
|
||||
Date: Tue, 26 Dec 2023 14:09:12 -0500
|
||||
Subject: [PATCH] Fix implicit function declarations
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
utils/kaspcheck.c:101:33: error: implicit declaration of function ‘exit’
|
||||
utils/kaspcheck.c:136:17: error: implicit declaration of function ‘free’
|
||||
utils/kc_helper.c:47:40: error: implicit declaration of function ‘free’
|
||||
utils/kc_helper.c:519:85: error: implicit declaration of function ‘atoi’
|
||||
utils/kc_helper.c:569:83: error: implicit declaration of function ‘malloc’
|
||||
utils/kc_helper.c:1122:28: error: implicit declaration of function ‘strtol’
|
||||
utils/kc_helper.c:1274:25: error: implicit declaration of function ‘exit’
|
||||
utils/kc_helper.c:1375:21: error: implicit declaration of function ‘calloc’
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/opendnssec/opendnssec/pull/853]
|
||||
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||
---
|
||||
enforcer/src/utils/kaspcheck.c | 1 +
|
||||
enforcer/src/utils/kc_helper.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/enforcer/src/utils/kaspcheck.c b/enforcer/src/utils/kaspcheck.c
|
||||
index 9bac3b796..b3b808598 100644
|
||||
--- a/enforcer/src/utils/kaspcheck.c
|
||||
+++ b/enforcer/src/utils/kaspcheck.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
|
||||
diff --git a/enforcer/src/utils/kc_helper.c b/enforcer/src/utils/kc_helper.c
|
||||
index 89e56c61e..e1704f6f9 100644
|
||||
--- a/enforcer/src/utils/kc_helper.c
|
||||
+++ b/enforcer/src/utils/kc_helper.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <syslog.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 42c01ae83a0c549379b9739a74db8ca3c4924407 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
|
||||
Date: Sun, 31 Dec 2023 22:43:50 +0100
|
||||
Subject: [PATCH 1/2] include utilities.h
|
||||
|
||||
The utilities.h header file is necessary for clamp function, otherwise
|
||||
compilation fails with implicit function declarations error with moder
|
||||
compilers. This is baiscally backport of commit f41dd6020f58 ("Compile
|
||||
warning. clamp implicitely defined.")
|
||||
|
||||
Bug: https://bugs.gentoo.org/871294
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/opendnssec/opendnssec/pull/854]
|
||||
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||
---
|
||||
common/scheduler/task.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/common/scheduler/task.c b/common/scheduler/task.c
|
||||
index 4dcf9e90..0dfa496a 100644
|
||||
--- a/common/scheduler/task.c
|
||||
+++ b/common/scheduler/task.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "duration.h"
|
||||
#include "file.h"
|
||||
#include "log.h"
|
||||
+#include "utilities.h"
|
||||
|
||||
static const char* task_str = "task";
|
||||
static pthread_mutex_t worklock = PTHREAD_MUTEX_INITIALIZER;
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 4e0da6c3716c08a5864fbac3f647427bcc64693e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
|
||||
Date: Sun, 31 Dec 2023 22:51:51 +0100
|
||||
Subject: [PATCH 2/2] reorder header files and include time.h
|
||||
|
||||
The time.h header file is needed for strptime function, otherwise modern
|
||||
compilers fail with implicit function declaration error. Moreover,
|
||||
getopt.h needs to be included after config.h otherwise global
|
||||
configuration will not be respected. This can affect time.h as they both
|
||||
include features.h.
|
||||
|
||||
Bug: https://bugs.gentoo.org/879727
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/opendnssec/opendnssec/pull/854]
|
||||
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||
---
|
||||
enforcer/src/daemon/time_leap_cmd.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/enforcer/src/daemon/time_leap_cmd.c b/enforcer/src/daemon/time_leap_cmd.c
|
||||
index af41c8db..c0acd01d 100644
|
||||
--- a/enforcer/src/daemon/time_leap_cmd.c
|
||||
+++ b/enforcer/src/daemon/time_leap_cmd.c
|
||||
@@ -26,9 +26,11 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include <getopt.h>
|
||||
#include "config.h"
|
||||
|
||||
+#include <getopt.h>
|
||||
+#include <time.h>
|
||||
+
|
||||
#include "file.h"
|
||||
#include "duration.h"
|
||||
#include "log.h"
|
||||
--
|
||||
2.47.3
|
||||
|
||||
+8
-7
@@ -1,18 +1,21 @@
|
||||
SUMMARY = "OpenDNSSEC is a policy-based zone signer that automates the process of keeping track of DNSSEC keys and the signing of zones"
|
||||
|
||||
HOMEPAGE = "https://www.opendnssec.org"
|
||||
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 \
|
||||
SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/opendnssec-${PV}.tar.gz \
|
||||
file://libxml2_conf.patch \
|
||||
file://libdns_conf_fix.patch \
|
||||
"
|
||||
file://0001-include-utilities.h.patch \
|
||||
file://0002-reorder-header-files-and-include-time.h.patch \
|
||||
file://0001-Fix-implicit-function-declarations.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "c0a8427de241118dccbf7abc508e4dd53fb75b45e9f386addbadae7ecc092756"
|
||||
SRC_URI[sha256sum] = "5a68d62ea0ea3a6c61e9f4946f462c7b907fbe6bccc9e8a721b7fe0f906f95d0"
|
||||
|
||||
inherit autotools pkgconfig perlnative
|
||||
inherit autotools pkgconfig perlnative github-releases
|
||||
|
||||
EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \
|
||||
--with-ssl=${STAGING_DIR_HOST}/usr "
|
||||
@@ -32,5 +35,3 @@ do_install:append () {
|
||||
}
|
||||
|
||||
RDEPENDS:${PN} = "softhsm"
|
||||
|
||||
SKIP_RECIPE[opendnssec] ?= "Needs porting to openssl 3.x"
|
||||
Reference in New Issue
Block a user