diff options
Diffstat (limited to 'mail-filter/opendkim')
| -rw-r--r-- | mail-filter/opendkim/Manifest | 4 | ||||
| -rw-r--r-- | mail-filter/opendkim/files/opendkim-2.10.3-c-std.patch | 155 | ||||
| -rw-r--r-- | mail-filter/opendkim/files/opendkim-2.10.3-snprintf-include.patch | 27 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-2.10.3-r30.ebuild | 2 |
4 files changed, 187 insertions, 1 deletions
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest index 7ba09d48fec6..75cd1db29bd9 100644 --- a/mail-filter/opendkim/Manifest +++ b/mail-filter/opendkim/Manifest @@ -1,10 +1,12 @@ +AUX opendkim-2.10.3-c-std.patch 3767 BLAKE2B e9999b0fad6a7cd72c471c7c87e5b191b76e6c5cbb20d5e15a887714897caeaea770f37d7016f30095990ff8c2baf6450d01083eb2004e318a454d3f09086cc4 SHA512 e0bb4afd7f060e6c69328459675616d4fbabbe56bf4e0c1bf16f132c1390992e8f1f0dd2ba06b02acf44e2b0a218946ff8f9f68f5332ed140f3f57da7f8231b6 AUX opendkim-2.10.3-define-P-macro-in-libvbr.patch 1111 BLAKE2B ef21e6609a80eadfc3c493b088df6afe368d0ed833d04e7cde922e643b434a7033c888e1b7158d1085152b128a60d95fae722885f15be08c63bed898e4924127 SHA512 6cf0cb4e54814f661f9869bfdfda0ab44c67f237475ebc69b18c670de9f356bb5375740dc8e0a922f25a3215ad5a884725629c92eac1dbf8251364725d77c105 AUX opendkim-2.10.3-fix-libmilter-search.patch 7465 BLAKE2B 9b6de6dd084437dd9fb2d905ba3addd3d39150b0cc36d7d62f8f10390acb3adb584dd23f8ee5b87c2b322cee34580e16725ce86b5967f14067d7ccae070ce7d4 SHA512 f8c675abed82f2058403b80162f83e6f44f7cc7502e32228f3127d332d17fd664dbb91a27a93717bd45cac875f356d9c6af1807ceec46ffe1d73e1a603615219 AUX opendkim-2.10.3-lua-pkgconfig-pt2.patch 1728 BLAKE2B b80f8a21dc19a0e8b37a02c3262698dd08da79d067fbff4ac04b1dfa39d133ee0a113984d4e35e7fc835c0d801d0485b3eccad76f93e9274106e166850a91cb5 SHA512 47fc79f46ae7e4178fc1062f342182b7b783274ac84d99dcb5155a12adb85b42ae597defb3a0da888a70d01e86b068647eb48d881aa107318a355cedd3a6cc4a AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47 +AUX opendkim-2.10.3-snprintf-include.patch 691 BLAKE2B eb2f0700f767e7b80ff7938634823e192299ec5941ad4e24003a62245fec7eff973b247fc99b0100d2f5a7454a36a096803bd1d82ba64c9bdb28ef56307b797f SHA512 24f67b9240bd360205f9af0510c8ddc62a3d34af7cb17ec98361c738b0a0e61829615eaeade7848b8042cf91ef2a2452d2d4610b9fd5c7ceb355a485470d666e DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 EBUILD opendkim-2.10.3-r29.ebuild 8127 BLAKE2B 36613e1f3a02037fc3017104f4921af98f05b48118d2f77694f1a177fb19c73c59ba37f2d67565ca4d70db41387f00e851f392cba23d52dd858b410380884a93 SHA512 697293ac0d662be72b510a3ce7ccbd95b944fdda132be7b2c423a86025e2f453e6fee415b09afa73ed75cadea59cb18701b814695dd0106d74d464eecbc4c959 -EBUILD opendkim-2.10.3-r30.ebuild 8035 BLAKE2B c162c20624450f7fe3cc316567e72fc49a43f38e4869d8946621d03629ff283744e263c5c22ff8ba5fb44f92807d1a4a5b0ecf9fd8862257272696dab18d6d2f SHA512 f77df34bc96f0f5ed4047f16bfee8d661f949f218d4c699908e9ca47ea0c5769d0ef8ffd560c29c32241f5fac10b6e6c2b6f1fa8bf25092f2dd1ce0e4e4506e0 +EBUILD opendkim-2.10.3-r30.ebuild 8110 BLAKE2B 0d1513e442c415ebe290bf120444b0ab453a2390c4c0f17500f6156c66ee46d590758d5272e759aab7c0b94353bea3d43c73b5e79f04115cd6359f7f946de5d0 SHA512 aa7f12596e682928d3b9d75432f1a06759848860352ea8587b4cf5708fa74a3dd04b401f666b8819936851132d19dee60347eb4eec810af5ae91b8453e3d6153 MISC metadata.xml 2028 BLAKE2B b24a278ffff977aadfbf901d6433c48871b920ddae40d3b70b2c98e3a3563fea6e418895d6f30411eb84de3dba2e5fffc44799b35a3f3b9bef83eb9e6779e9b4 SHA512 6bac9661fe5508566a7cd769d5ad57c70c9717aea902010bf8d7a723b694a14485ad4c43475d2c5afdf2d7b29b3da4ce3a618784a4d8fc9886c95b478ab4cf09 diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-c-std.patch b/mail-filter/opendkim/files/opendkim-2.10.3-c-std.patch new file mode 100644 index 000000000000..08df8eb0b03b --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.10.3-c-std.patch @@ -0,0 +1,155 @@ +From 2d6db0225da9632ddf25aa70839d9d6244af6a42 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Thu, 23 Feb 2023 17:37:33 -0500 +Subject: [PATCH 1/1] configure.ac: update main() signatures to conform to the + standard. + +There are some tests in configure.ac that contain, + + int main() { ... } + +That's not the correct signature for main() according to the C +standard, and newer compilers are going to reject it. More information +about this can be found at, + + https://wiki.gentoo.org/wiki/Modern_C_porting + +In this case, the fix is simply to write + + int main(int argc, char** argv) { ... } + +instead. +--- + configure.ac | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1eaa95d8..d8162303 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -147,7 +147,7 @@ dnscheck=' + #include <netinet/in.h> + #include <arpa/nameser.h> + #include <resolv.h> +-int main() { ++int main(int argc, char** argv) { + res_mkquery (0, 0, 0, 0, 0, 0, 0, 0, 0); + dn_expand (0, 0, 0, 0, 0); + dn_skipname (0, 0); +@@ -549,7 +549,7 @@ gprof_gmon_out="unknown" + if test x"$hasgprof" = x"yes" + then + gprofcheck=' +-int main() { ++int main(int argc, char** argv) { + long x; + + x = random(); +@@ -747,7 +747,7 @@ then + #if GNUTLS_VERSION_NUMBER < 0x020b07 + # error GnuTLS 2.11.7 or later required + #endif +- int main() ++ int main(int argc, char** argv) + { + return 0; + }' +@@ -759,7 +759,7 @@ then + + sha256check=' + #include <gnutls/gnutls.h> +- int main() ++ int main(int argc, char** argv) + { + int x = GNUTLS_DIG_SHA256; + }' +@@ -1191,7 +1191,7 @@ then + #include <libmemcached/memcached.h> + + int +-main() ++main(int argc, char** argv) + { + memcached_return_t x; + +@@ -1649,7 +1649,7 @@ then + #endif + + int +-main() ++main(int argc, char** argv) + { + return 0; + } +@@ -1859,7 +1859,7 @@ then + #endif + + int +-main() ++main(int argc, char** argv) + { + return 0; + } +-- +2.39.2 + +From 1f551737e838723f9ad9be1692bb12a9a3b4cdd9 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Thu, 23 Feb 2023 18:15:50 -0500 +Subject: [PATCH 2/2] libvbr/vbr.c: modernize vbr_strlcpy() signature. + +The vbr_strlcpy() function declares that its arguments should live in +registers: + + vbr_strlcpy(dst, src, size) + register char *dst; + register const char *src; + ssize_t size; + { + ... + +This makes GCC unhappy when -Werror=strict-prototypes is used: + + vbr.c:167:1: error: function declaration isn't a prototype + [-Werror=strict-prototypes] + 167 | vbr_strlcpy(dst, src, size) + +The "register" keyword is largely obsolete on modern systems anyway, +since the compiler is better at determining how to move memory around +than the programmer is. So to appease GCC and simplify the code a bit, +the signature has been changed to, + + vbr_strlcpy(char *dst, const char *src, ssize_t size) { ... } + +changes. Lines starting # with '#' will be ignored, and an empty +message aborts the commit. # # On branch configure.ac-c-standard # +Your branch is up to date with 'origin/configure.ac-c-standard'. # # +Changes to be committed: # modified: libvbr/vbr.c # # Changes not +staged for commit: # modified: configure # # Untracked files: # +0000-cover-letter.patch # +--- + libvbr/vbr.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/libvbr/vbr.c b/libvbr/vbr.c +index cb9124d7..c6a2439f 100644 +--- a/libvbr/vbr.c ++++ b/libvbr/vbr.c +@@ -164,12 +164,9 @@ static void vbr_error __P((VBR *, const char *, ...)); + */ + + size_t +-vbr_strlcpy(dst, src, size) +- register char *dst; +- register const char *src; +- ssize_t size; ++vbr_strlcpy(char *dst, const char *src, ssize_t size) + { +- register ssize_t i; ++ ssize_t i; + + if (size-- <= 0) + return strlen(src); +-- +2.39.2 + diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-snprintf-include.patch b/mail-filter/opendkim/files/opendkim-2.10.3-snprintf-include.patch new file mode 100644 index 000000000000..5cbe24b02cdb --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.10.3-snprintf-include.patch @@ -0,0 +1,27 @@ +From 706554992156dd655e893268f201bbecbe283eb5 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Thu, 23 Feb 2023 17:05:36 -0500 +Subject: [PATCH 1/1] libopendkim/util.c: include stdio.h for snprintf. + +This fixes a build failure on musl, reported at + + https://bugs.gentoo.org/896048 +--- + libopendkim/util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libopendkim/util.c b/libopendkim/util.c +index 6792b169..b1c6a769 100644 +--- a/libopendkim/util.c ++++ b/libopendkim/util.c +@@ -17,6 +17,7 @@ + # include <stdbool.h> + #endif /* HAVE_STDBOOL_H */ + #include <ctype.h> ++#include <stdio.h> + #include <assert.h> + #include <string.h> + #include <errno.h> +-- +2.39.2 + diff --git a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild index 9334c2a8071f..bb6117a78bb2 100644 --- a/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild +++ b/mail-filter/opendkim/opendkim-2.10.3-r30.ebuild @@ -56,6 +56,8 @@ PATCHES=( "${FILESDIR}/${P}-lua-pkgconfig-pt2.patch" "${FILESDIR}/${P}-define-P-macro-in-libvbr.patch" "${FILESDIR}/${P}-fix-libmilter-search.patch" + "${FILESDIR}/${P}-snprintf-include.patch" + "${FILESDIR}/${P}-c-std.patch" ) pkg_setup() { |