Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package opendkim for openSUSE:Factory checked in at 2024-11-13 15:29:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opendkim (Old) and /work/SRC/openSUSE:Factory/.opendkim.new.2017 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opendkim" Wed Nov 13 15:29:03 2024 rev:11 rq:1223827 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/opendkim/opendkim.changes 2024-03-05 18:51:39.815225053 +0100 +++ /work/SRC/openSUSE:Factory/.opendkim.new.2017/opendkim.changes 2024-11-13 15:29:35.340539631 +0100 @@ -1,0 +2,9 @@ +Wed Nov 13 03:18:29 UTC 2024 - Ferdinand Thiessen <r...@fthiessen.de> + +- Added rev-ares-deletion.patch +- Added ares-missing-space.patch +- Added ftbfs-gcc-14-1075339.patch from debian + Fixes building with GCC14+ +- Added opendkim-2.10.3-incompatible-pointer-types.patch from gentoo + +------------------------------------------------------------------- New: ---- ares-missing-space.patch ftbfs-gcc-14-1075339.patch opendkim-2.10.3-incompatible-pointer-types.patch rev-ares-deletion.patch BETA DEBUG BEGIN: New:- Added rev-ares-deletion.patch - Added ares-missing-space.patch - Added ftbfs-gcc-14-1075339.patch from debian New:- Added ares-missing-space.patch - Added ftbfs-gcc-14-1075339.patch from debian Fixes building with GCC14+ New: Fixes building with GCC14+ - Added opendkim-2.10.3-incompatible-pointer-types.patch from gentoo New: - Added rev-ares-deletion.patch - Added ares-missing-space.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opendkim.spec ++++++ --- /var/tmp/diff_new_pack.7TMiZS/_old 2024-11-13 15:29:35.900563023 +0100 +++ /var/tmp/diff_new_pack.7TMiZS/_new 2024-11-13 15:29:35.900563023 +0100 @@ -57,12 +57,19 @@ Patch4: harden_opendkim.service.patch # PATCH-FIX-UPSTREAM fix-RSA_sign-call.patch -- Fix RSA sign call on big endian systems ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012506 Patch5: fix-RSA_sign-call.patch +# PATCH-FIX-UPSTREAM rev-ares-deletion.patch.patch -- https://github.com/trusteddomainproject/OpenDKIM/pull/189 +Patch6: rev-ares-deletion.patch +# PATCH-FIX-UPSTREAM ares-missing-space.patch -- https://github.com/trusteddomainproject/OpenDKIM/pull/67 +Patch7: ares-missing-space.patch +# PATCH-FIX-UPSTREAM ftbfs-gcc-14-1075339.patch -- ref: https://bugs.debian.org/1075339 +Patch8: ftbfs-gcc-14-1075339.patch +# PATCH-FIX-UPSTREAM opendkim-2.10.3-incompatible-pointer-types.patch -- ref: https://bugs.gentoo.org/919366 +Patch9: opendkim-2.10.3-incompatible-pointer-types.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel -#BuildRequires: erlang BuildRequires: libbsd-devel BuildRequires: libevent-devel BuildRequires: libtool @@ -223,6 +230,10 @@ %patch -P 3 -p0 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 +%patch -P 7 -p1 +%patch -P 8 -p1 +%patch -P 9 -p1 %build autoreconf -iv ++++++ ares-missing-space.patch ++++++ Description: Add missing space in Authentication-Results header Author: David Bürgin <dbuer...@gluet.ch> Bug: https://github.com/trusteddomainproject/OpenDKIM/pull/67 --- a/opendkim/opendkim.c +++ b/opendkim/opendkim.c @@ -13511,7 +13511,8 @@ /* NOTREACHED */ } - snprintf(header, sizeof header, "%s; dkim=%s (%s)", + snprintf((char *) header, sizeof header, "%s%s; dkim=%s (%s)", + cc->cctx_noleadspc ? " " : "", authservid, ar, dkimf_lookup_inttostr(dfc->mctx_status, dkimf_statusstrings)); ++++++ ftbfs-gcc-14-1075339.patch ++++++ Description: Fix FTBFS with gcc-14 Author: Tim Woodall <debianb...@woodall.me.uk> Bug-Debian: https://bugs.debian.org/1075339 Forwarded: no Last-Update: 2024-08-25 --- opendkim-2.11.0~beta2.orig/librbl/rbl.c +++ opendkim-2.11.0~beta2/librbl/rbl.c @@ -329,7 +329,7 @@ void rbl_res_close(void *srv) { #ifdef HAVE_RES_NINIT - struct state *res; + struct __res_state *res; res = srv; ++++++ opendkim-2.10.3-incompatible-pointer-types.patch ++++++ >From 514ed1085d7399f7fe3bb53e6ae4693168dd0ab9 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky <mich...@orlitzky.com> Date: Mon, 22 Apr 2024 07:37:40 -0400 Subject: [PATCH] opendkim/opendkim.c: add two missing dkimf_dstring_get() calls This fixes the build with CFLAGS="-Werror=incompatible-pointer-types", which some newer compilers are planning to make default. Gentoo-Bug: https://bugs.gentoo.org/919366 --- opendkim/opendkim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c index d4229e8f..93d05a1e 100644 --- a/opendkim/opendkim.c +++ b/opendkim/opendkim.c @@ -11656,8 +11656,8 @@ mlfi_eoh(SMFICTX *ctx) (status != 0 || user == NULL || domain == NULL || user[0] == '\0' || domain[0] == '\0')) { - strlcpy(addr, conf->conf_defsender, sizeof addr); - status = dkim_mail_parse(addr, &user, &domain); + strlcpy(dkimf_dstring_get(addr), conf->conf_defsender, sizeof addr); + status = dkim_mail_parse(dkimf_dstring_get(addr), &user, &domain); } #endif /* _FFR_DEFAULT_SENDER */ -- 2.43.2 ++++++ rev-ares-deletion.patch ++++++ Description: Delete Authentication-Results headers in reverse (CVE-2022-48521) Author: David Bürgin <dbuer...@gluet.ch> Bug: https://github.com/trusteddomainproject/OpenDKIM/pull/189 --- a/opendkim/opendkim.c +++ b/opendkim/opendkim.c @@ -13651,9 +13651,16 @@ return SMFIS_TEMPFAIL; } - c = 0; + c = 1; + for (hdr = dfc->mctx_hqhead; hdr != NULL; hdr = hdr->hdr_next) { + if (strcasecmp(hdr->hdr_hdr, AUTHRESULTSHDR) == 0) + c++; + } + + for (hdr = dfc->mctx_hqtail; hdr != NULL; hdr = hdr->hdr_prev) + { memset(ares, '\0', sizeof(struct authres)); if (strcasecmp(hdr->hdr_hdr, AUTHRESULTSHDR) == 0) @@ -13664,7 +13671,7 @@ char *slash; /* remember index */ - c++; + c--; /* parse the header */ arstat = ares_parse((u_char *) hdr->hdr_val,
