gentoo auto-resync : 17:09:2022 - 23:18:12

8 files changed, 202 insertions, 2 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 95ca9170b45b..9e52c5bfabae 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 41f123eec047..83f3007ea9ac 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,6 +1,7 @@
+AUX 2.7.6-prototypes.patch 873 BLAKE2B 35bd3316dd455eac29909fa940542bb4f0aebbb08ceea3f52681f8bc0546c565d84aa4a18f670c1771fc68a246e45ea47467acfc1bd8f4031b28db9d03b0461d SHA512 e474d2e6852cd2b24ce88d8e550de54b036d91635ed7d60892985d7825ce18b457d767c90a664c63eab7aa587c61c9f2ac0f1cbd0f8765b2bd71cc04910096ed
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
 DIST imapfilter-2.7.6.tar.gz 58644 BLAKE2B 6fd5b8400527c3749cdb8a1df0ca0cbab7b77e8fa29e0bc1bd0eee95832aa16c9b3a586b4e4dc9f9632319febdc619ebe6b05e60c46fd8ccf430f6714900588d SHA512 c76a0986d338e2b74ccf38106e05d4c0a25789a6d80f0cb79ed4a165447a4c96cbcffb57e856fdfd465283feebca6445efba52e65289442a7f313d343c519083
 EBUILD imapfilter-2.7.5-r1.ebuild 979 BLAKE2B 372852b1f8937b324e948d26df05d0d05b2328c93ff5206fac20f4c26f453b3d434134b44e7e0e682399197e6897300d577a9193d08162f87334cc154bc3c643 SHA512 2fcab5d73524d8f29cbf9252b830d74f14c1a966729db36fbeadf5a127d8dce298043edad48a8a01929af09ba3829fb8a2bdadd2ff264394369787c0e2077bf4
 EBUILD imapfilter-2.7.5.ebuild 968 BLAKE2B cc04dd3b71945338e0a645787a0556cee83bc598fd8df5c4ceefbba4add9c93e57efd23fa7d728a2d4d2d2c3dae40cc71455ffe59b5c41314604365013443c89 SHA512 a2f08bb5f773fdfbb8cb70a4643c3f105e7533ebb9edf0c1dcbac36635c6928c01f1bcac6496a8f577b29e2639d80c899a2561f4fc8ccaa2bcb587ec8b901078
-EBUILD imapfilter-2.7.6.ebuild 978 BLAKE2B 99752a9a7eae584afbb3654deeed445a1077bfa9e1944df42d81da2d4b4caa76cb8781a4ae98369589710cf3dd3a77bd050dc49951961e6a57b09a83a2b5e8ef SHA512 96ce150ad29891f89c8569279f9fa01dcc537e44df5a3a465c78b838d3eac4d31babb7d22be6640e8637a9edf7db13776516b86b52e23b99a8f5f8885e531f6e
+EBUILD imapfilter-2.7.6.ebuild 1029 BLAKE2B 6509759d9c9946cf704f916efa3446035aff8c79c3a603b324f8f4d9a01ad709817b8d8a575c8e3af70f34bb55816eafe1480a13537c4dfe8cf86d8cd4e368eb SHA512 e5952cb723f67f962a3bf3a036c83578156c7dfacb824818aa14a44a3931fbc6b0f19871f326babbfb4b927d2ac114effed561852d22ffd3cba471c50b368ba2
 MISC metadata.xml 493 BLAKE2B 26e3c22d49d62547bfe45fb39f153589cf3f2b7e7ea07a170b91e880bf3d337de8ae7be36bf684d3cbb72416a1442e896014cbf6ddba14cef95b680f2a5ea7e3 SHA512 9300b493b8728a141e05af8c343b776a93ee52a01a69694050b9ffb392770b81ddef37832c6b884fe51dc9ba3ecc41bb8ea4f9559f84dce1a71382bfe3d0e67b
diff --git a/mail-filter/imapfilter/files/2.7.6-prototypes.patch b/mail-filter/imapfilter/files/2.7.6-prototypes.patch
new file mode 100644
index 000000000000..33448834fa2f
--- /dev/null
+++ b/mail-filter/imapfilter/files/2.7.6-prototypes.patch
@@ -0,0 +1,30 @@
+
+Patch from: https://github.com/lefcha/imapfilter/pull/257
+Bug: https://bugs.gentoo.org/870682
+
+From 9580bfca0d8a1cf92a79a24b9f1b83fd3b778375 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Sat, 17 Sep 2022 13:42:30 +0200
+Subject: [PATCH] Fix compilation failure with -Werror=strict-prototypes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ src/lua.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lua.c b/src/lua.c
+index 868ddb7..02514bb 100644
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -26,7 +26,7 @@ void interactive_mode(void);
+  * Lua interface functions, load and execute imapfilter's configuration file.
+  */
+ void
+-start_lua()
++start_lua(void)
+ {
+ 
+ 	lua = luaL_newstate();
diff --git a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
index 8c65a881ad44..d129899e7bff 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS NEWS README samples/*"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-prototypes.patch"
+)
+
 src_prepare() {
 	default
 	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 8a3edd5bffde..2f9419f9659a 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,8 +1,10 @@
 AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d61c6f859ea66b9300fcb1f889d687d773f368750b87fdaa3e097bc1c66110cbc198534a720f57fc55f47d0b34d600b7bf SHA512 f947dfc76c7bc1213492d1b17574cb6bab56b5210a184c9a8137189402c607d0145ef85041f65d07dd83729913144d7729b11f8ff9d0939159cb419ca0a70aff
+AUX 0.8.9-bashisms.patch 728 BLAKE2B 002b0ee7bf8f583af127c7ce55bf503f8c534ea5f48ce2f941db367eb2135bc59b38d7fb6e025b2b02099561788b686a41a044cbd2a0090b22b634560829f100 SHA512 ffb68881f05bc8d3b48d486c4138011342ffd3d0263039dc740e07dc299aeb7f6b2232e345e2b59ccb93df88f022c06839bd34e69c4591bd4463c661643c9be5
+AUX 0.8.9-prototypes.patch 4339 BLAKE2B efaabe8dc291d113bb969292ed33e0ffebbaddba398f3946dde8901f4d37e27af78bbc266f86e291b8bfe2db4e434fe553a561d16233088369d9bda2ecc173d3 SHA512 9f25812f9223354548cfcf53a589c536849c94408eba550cc37d1e63da1a799e32e27a797a563f75ba89067be5a3f5403a8efb8f28598b09aab6e015d07697ca
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
 DIST mailfilter-0.8.9.tar.gz 573811 BLAKE2B 7648496c1fbde31da776c7d55517b5824cdc33f91e4543784460838edac7bd6435a09ccece54f4e8f21142330458bf28773934bf8b6bcc40289086ab82142c70 SHA512 8c18d2edf92816cec38359af5e2daf5730fac497a46f89225d938df750144d2bad6fa6dc5e99257423afdf626edf6caeccdf884c90e0b9e70b9c5d03f746ba5f
 EBUILD mailfilter-0.8.4.ebuild 618 BLAKE2B 1896f566c2aa6974619f74025c49885aa926d54747fd1bc28ad9b62a3a3704748d929361e987f65bc92c7ac725e2e21dffd7b701e44f6826d0c474b750d15031 SHA512 e80a77a065f8f47cb974b41a2cb54adb803bf5dc2d8a32a2f8652604aeee44bd5fd18ced166a2e6e0e29a3683b84bee84c4eac0c8ae08b5fed65064a5f07c131
-EBUILD mailfilter-0.8.9.ebuild 599 BLAKE2B 8e15f9b0b3870952532c3b88106aa0128e1075f459844a566e5ceb5e1c1ae0e904b515c0c1ff9a8bdfb32164faef8cf0235d415c96c8746cccb4c7c25ddd55be SHA512 4b86561454c13c24001e8ff03f4f3b5a358711b03494ee86c303cd85e61adcbb1d30224d78b0c2ed13153399b083312197c1b59adae94361011e8aca2afbb3e6
+EBUILD mailfilter-0.8.9.ebuild 686 BLAKE2B 2712449ba6b9692281a080f6bcd19ad413831ffbbbff9afa84ac65ce91b68ccf2199961f9cb410483c35f8af90203e609a92b9e4fc9c911933cd765289cb2d02 SHA512 4a91f181d217af3ccf9799ffcc386bf061da4dad6339120f5e3cd2a77764fe465dd5adb306d594561364b8d81fa7c5ffc9ccc2d9ab6e818ad6069ab07b93175a
 MISC metadata.xml 491 BLAKE2B 2ddb0bd6bcc64a84a5113bbafb7971152db86037de70af5c109ac953547f36a5131dd0e38251fd3226a5e0a90e2addfe156c3022621bf0379a165bcf39c05a73 SHA512 7c1676023fa91c90a7b8d5b2cff2b0685fce9f4305da5a103a4f4088713383c1593b297fb710d7f267e3a2decdf2840bb5405b9bff5c8c8de40d63017a19b66f
diff --git a/mail-filter/mailfilter/files/0.8.9-bashisms.patch b/mail-filter/mailfilter/files/0.8.9-bashisms.patch
new file mode 100644
index 000000000000..d3fcecb7b5f0
--- /dev/null
+++ b/mail-filter/mailfilter/files/0.8.9-bashisms.patch
@@ -0,0 +1,26 @@
+
+Fix configure bashisms with dash as /bin/sh as reported in
+https://github.com/gentoo/gentoo/pull/27134
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- mailfilter-0.8.9/configure	2022-09-04 12:23:29.000000000 +0200
++++ mailfilter-0.8.9-dash/configure	2022-09-17 19:12:32.174505949 +0200
+@@ -5322,7 +5322,7 @@ fi
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
+-if test x"$YACC" == x"yacc"
++if test x"$YACC" = x"yacc"
+ then :
+   as_fn_error $? "Please install bison or byacc before configuring." "$LINENO" 5
+ fi
+@@ -5545,7 +5545,7 @@ fi
+ rm -f conftest.l $LEX_OUTPUT_ROOT.c
+ 
+ fi
+-if test x"$LEX" == x":"
++if test x"$LEX" = x":"
+ then :
+   as_fn_error $? "Please install flex before configuring." "$LINENO" 5
+ fi
diff --git a/mail-filter/mailfilter/files/0.8.9-prototypes.patch b/mail-filter/mailfilter/files/0.8.9-prototypes.patch
new file mode 100644
index 000000000000..22cb739464af
--- /dev/null
+++ b/mail-filter/mailfilter/files/0.8.9-prototypes.patch
@@ -0,0 +1,132 @@
+
+Patch from: https://github.com/nondeterministic/mailfilter/pull/7
+Bug: https://bugs.gentoo.org/870625
+
+From c8ce051933c29561bdc57de782d0445f1513100d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Wed, 14 Sep 2022 18:49:20 +0200
+Subject: [PATCH] Fix warnings about incorrect prototypes & use standard memcpy/memset
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Clang-15 rightfully complains about function definitions without proper
+prototypes. Also replace handrolled memcpy/memset with standard
+C library calls.
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ src/md5c.c | 47 +++++++++++------------------------------------
+ 1 file changed, 11 insertions(+), 36 deletions(-)
+
+diff --git a/src/md5c.c b/src/md5c.c
+index 2c2c564..ae5ec8d 100644
+--- a/src/md5c.c
++++ b/src/md5c.c
+@@ -24,6 +24,7 @@ documentation and/or software.
+  */
+ 
+ #include "md5.h"
++#include <string.h>
+ 
+ /* Constants for MD5Transform routine.
+  */
+@@ -94,8 +95,7 @@ Rotation is separate from addition to prevent recomputation.
+ 
+ /* MD5 initialization. Begins an MD5 operation, writing a new context.
+  */
+-void MD5Init (context)
+-MD5_CTX *context;                                        /* context */
++void MD5Init (MD5_CTX *context)
+ {
+   context->count[0] = context->count[1] = 0;
+   /* Load magic initialization constants.
+@@ -110,10 +110,7 @@ MD5_CTX *context;                                        /* context */
+   operation, processing another message block, and updating the
+   context.
+  */
+-void MD5Update (context, input, inputLen)
+-MD5_CTX *context;                                        /* context */
+-unsigned char *input;                                /* input block */
+-unsigned int inputLen;                     /* length of input block */
++void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
+ {
+   unsigned int i, index, partLen;
+ 
+@@ -152,9 +149,7 @@ unsigned int inputLen;                     /* length of input block */
+ /* MD5 finalization. Ends an MD5 message-digest operation, writing the
+   the message digest and zeroizing the context.
+  */
+-void MD5Final (digest, context)
+-unsigned char digest[16];                         /* message digest */
+-MD5_CTX *context;                                       /* context */
++void MD5Final (unsigned char digest[16], MD5_CTX *context)
+ {
+   unsigned char bits[8];
+   unsigned int index, padLen;
+@@ -180,9 +175,7 @@ MD5_CTX *context;                                       /* context */
+ 
+ /* MD5 basic transformation. Transforms state based on block.
+  */
+-static void MD5Transform (state, block)
+-uint32_t state[4];
+-unsigned char block[64];
++static void MD5Transform (uint32_t state[4], unsigned char block[64])
+ {
+   uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+ 
+@@ -272,10 +265,7 @@ unsigned char block[64];
+ /* Encodes input (uint32_t) into output (unsigned char). Assumes len is
+   a multiple of 4.
+  */
+-static void Encode (output, input, len)
+-unsigned char *output;
+-uint32_t *input;
+-unsigned int len;
++static void Encode (unsigned char *output, uint32_t *input, unsigned int len)
+ {
+   unsigned int i, j;
+ 
+@@ -290,10 +280,7 @@ unsigned int len;
+ /* Decodes input (unsigned char) into output (uint32_t). Assumes len is
+   a multiple of 4.
+  */
+-static void Decode (output, input, len)
+-uint32_t *output;
+-unsigned char *input;
+-unsigned int len;
++static void Decode (uint32_t *output, unsigned char *input, unsigned int len)
+ {
+   unsigned int i, j;
+ 
+@@ -305,26 +292,14 @@ unsigned int len;
+ /* Note: Replace "for loop" with standard memcpy if possible.
+  */
+ 
+-static void MD5_memcpy (output, input, len)
+-POINTER output;
+-POINTER input;
+-unsigned int len;
++static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
+ {
+-  unsigned int i;
+-
+-  for (i = 0; i < len; i++)
+-  output[i] = input[i];
++  memcpy(output, input, len);
+ }
+ 
+ /* Note: Replace "for loop" with standard memset if possible.
+  */
+-static void MD5_memset (output, value, len)
+-POINTER output;
+-int value;
+-unsigned int len;
++static void MD5_memset (POINTER output, int value, unsigned int len)
+ {
+-  unsigned int i;
+-
+-  for (i = 0; i < len; i++)
+- ((char *)output)[i] = (char)value;
++  memset(output, value, len);
+ }
diff --git a/mail-filter/mailfilter/mailfilter-0.8.9.ebuild b/mail-filter/mailfilter/mailfilter-0.8.9.ebuild
index 15aa7763546b..9601b73d633a 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.9.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.9.ebuild
@@ -12,6 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="+ssl"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-bashisms.patch
+	"${FILESDIR}"/${PV}-prototypes.patch
+)
+
 DEPEND="sys-devel/flex
 	ssl? ( dev-libs/openssl:= )"
 RDEPEND="ssl? ( dev-libs/openssl:= )"