gentoo auto-resync : 14:01:2023 - 23:53:26

4 files changed, 64 insertions, 7 deletions

diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index a74fcc4ec516..fed882d49940 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,8 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
+AUX qmail-autoresponder-2.0-clear-struct.patch 965 BLAKE2B 9a5d4a43fed1cf06e63f3c68f4949a6d55110d5c76034b988282460c38fe51999c8461eeb7f2fe4a95e01897f252254c208bd7b50230efc2a11203c61b38637b SHA512 c8b3b55c18556f3a3870e035100d123bbd5ab2f6added13118b674fa4a9fe867a0d27fbc9dae782c799187c3b937b807dde10b6f86dee11abd3883d09ed5cfab
+AUX qmail-autoresponder-2.0-drop-mysql.patch 637 BLAKE2B 6461da3b84cb5ba82365e31fd488941467ebba278c32b5ecd4f769ba8eb3fc465b3f4c98d5b00a8ac9c94ef5bd26792717c9c084b82743c6fe67a30b609dd729 SHA512 72dbf2f9d19cf796ccf235c761f98f20ef5aff02cb07eee8970d0deb6b53a16661ea19c03aafcb29ae28a8aaccfce66d372c88f096a4b882ef5291f3c4b55065
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
 EBUILD qmail-autoresponder-0.97-r3.ebuild 1408 BLAKE2B 86a45e618ad1c013db90619fe4aaede21167c4c0f92b4a909a29a3876c90b7f06f8ebed4e482f82e3b122418568d09c9c36d6a31aa4f394a31a8271a938ab5c0 SHA512 3c9410769aafbb7157e623d9f6940143197816b5d3fbf01b01e4db7bc304cb081cad157fa421e37ce637cfdeb8516f6e6880fb98b0643a49abe3675e879ad19c
-EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
+EBUILD qmail-autoresponder-2.0-r1.ebuild 1112 BLAKE2B a359f3ea12257e0641dd669c4c578362de4e7f8574288017362ff29aaf9af1c31de5da7770cf5902ec04ad3220a58da2d78513161367f28f66805316b15667ec SHA512 8314b3579f73d840b110a3b5865ae0b6b5b8a05400965e39f1f05d43522cfe8a86ff278d1ae7b67e0c191d46989c2d29da95e54cd538bcf0db34957ec1982ca2
 MISC metadata.xml 416 BLAKE2B 502d2451318fa2dd457011e29cd1ebc52e9081fc280eb15bba4e2551b82f44ada3c59dcad6963f063c6a6c7dbf997c0e6e5478049e3b5bf7582c8245f355fe1e SHA512 3dfb37a7392b7fd7dff681905fdaeb972b296a75574a27b62aa05e1de0d761013633dcc48f914405dfc45ec0d9d31f5c755ad3181a9e0c82c13340b3c0177543
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch
new file mode 100644
index 000000000000..9a43d73465ec
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch
@@ -0,0 +1,25 @@
+Patch: https://github.com/bruceg/qmail-autoresponder/commit/baea8ec70d62fbc50868074c050dcb89f1a43f63
+
+From baea8ec70d62fbc50868074c050dcb89f1a43f63 Mon Sep 17 00:00:00 2001
+From: Bruce Guenter <bruce@untroubled.org>
+Date: Fri, 13 Apr 2018 10:39:45 -0600
+Subject: [PATCH] options: Clear time struct before using
+
+The strptime may not set all the fields in struct tm, so we need to
+clear it before parsing, so that mktime doesn't use uninitialized data.
+---
+ options.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/options.c b/options.c
+index 325ea83..ce63867 100644
+--- a/options.c
++++ b/options.c
+@@ -87,6 +87,7 @@ static const char* copy_time(void* ptr, const char* value, unsigned int length)
+   }
+   for (i = 0; i < sizeof time_formats / sizeof *time_formats; i++) {
+     struct tm tm;
++    memset(&tm, 0, sizeof tm);
+     if (strptime(value, time_formats[i], &tm) == value + length) {
+       if ((*dest = mktime(&tm)) != (time_t)-1)
+         return NULL;
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch
new file mode 100644
index 000000000000..280e5af722e0
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch
@@ -0,0 +1,21 @@
+Patch: https://github.com/bruceg/qmail-autoresponder/commit/514a15e22d2eaf888592690f6be3e7c7dd18b7d0
+Bug: https://bugs.gentoo.org/740804
+From 514a15e22d2eaf888592690f6be3e7c7dd18b7d0 Mon Sep 17 00:00:00 2001
+From: Bruce Guenter <bruce@untroubled.org>
+Date: Fri, 13 Apr 2018 10:27:03 -0600
+Subject: [PATCH] options: Drop the extraneous #include <mysql/mysql.h>
+
+---
+ options.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/options.c b/options.c
+index 8d1d1e4..325ea83 100644
+--- a/options.c
++++ b/options.c
+@@ -1,5 +1,4 @@
+ #define _XOPEN_SOURCE
+-#include <mysql/mysql.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
index 1fdf92e79e0d..1580fd65df44 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,11 +14,20 @@ LICENSE="GPL-2+"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="mysql"
 
-DEPEND=">=dev-libs/bglibs-2.04
-	mysql? ( dev-db/mysql-connector-c:0= )"
-RDEPEND="${DEPEND}
+DEPEND="
+	>=dev-libs/bglibs-2.04
+	mysql? ( dev-db/mysql-connector-c:0= )
+"
+RDEPEND="
+	${DEPEND}
 	virtual/qmail
-	mysql? ( virtual/mysql )"
+	mysql? ( virtual/mysql )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-clear-struct.patch"
+	"${FILESDIR}/${P}-drop-mysql.patch"
+)
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die