mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-05-07 04:58:47 +00:00
Code Issues Projects Releases Wiki Activity

opendnssec: update to 2.1.8

Browse Source 
refresh libdns_conf_fix.patch
Drop fix_fprint.patch includd in update

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-02-28 21:36:32 +00:00
parent dc28e175e3
commit 7d3704b22c
3 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-security/opendnssec/files/fix_fprint.patch
-25
View File
@@ -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 <akuster808@gmail.com>
../../../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;
}
}
recipes-security/opendnssec/files/libdns_conf_fix.patch
+22 -23
View File
@@ -4,14 +4,29 @@ Upstream-Status: OE specific
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
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.8.orig/configure.ac
+++ opendnssec-2.1.6/m4/acx_ldns.m4 +++ opendnssec-2.1.8/configure.ac
@@ -1,128 +1,65 @@ @@ -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_DEFUN([ACX_LDNS],[
- AC_ARG_WITH(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" - LDNS_PATH="$withval"
- AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) - 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_MSG_ERROR([ldns library too old ($1.$2.$3 or later required)])
- ],[]) - ],[])
- AC_LANG_POP([C]) - AC_LANG_POP([C])
+#serial 11 -
- CPPFLAGS=$tmp_CPPFLAGS - CPPFLAGS=$tmp_CPPFLAGS
- -
- AC_SUBST(LDNS_INCLUDES) - AC_SUBST(LDNS_INCLUDES)
@@ -81,7 +95,7 @@ Index: opendnssec-2.1.6/m4/acx_ldns.m4
- -
-AC_DEFUN([ACX_LDNS_NOT],[ -AC_DEFUN([ACX_LDNS_NOT],[
- AC_ARG_WITH(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" - LDNS_PATH="$withval"
- AC_PATH_PROGS(LDNS_CONFIG, ldns-config, ldns-config, $LDNS_PATH/bin) - 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_LIBS])
+ AC_SUBST([LDNS_LDFLAGS]) + 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
recipes-security/opendnssec/opendnssec_2.1.6.bb → recipes-security/opendnssec/opendnssec_2.1.8.bb
+2 -5
View File
@@ -5,18 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b041dbe2da80d4efd951393fbba90937"
DEPENDS = "libxml2 openssl ldns libmicrohttpd jansson libyaml " DEPENDS = "libxml2 openssl ldns libmicrohttpd jansson libyaml "
SRC_URI = "git://github.com/opendnssec/opendnssec;branch=develop \ SRC_URI = "https://dist.opendnssec.org/source/opendnssec-${PV}.tar.gz \
file://libxml2_conf.patch \ file://libxml2_conf.patch \
file://libdns_conf_fix.patch \ file://libdns_conf_fix.patch \
file://fix_fprint.patch \
" "
SRCREV = "5876bccb38428790e2e9afc806ca68b029879874" SRC_URI[sha256sum] = "900a213103ff19a405e446327fbfcea9ec13e405283d87b6ffc24a10d9a268f5"
inherit autotools pkgconfig perlnative inherit autotools pkgconfig perlnative
S = "${WORKDIR}/git"
EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \ EXTRA_OECONF = " --with-libxml2=${STAGING_DIR_HOST}/usr --with-ldns=${STAGING_DIR_HOST}/usr \
--with-ssl=${STAGING_DIR_HOST}/usr " --with-ssl=${STAGING_DIR_HOST}/usr "