gentoo resync : 31.05.2021

3 files changed, 45 insertions, 2 deletions

diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index eed6a0962dc0..6c11e5c705b3 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,5 +1,6 @@
+AUX ezmlm-idx-7.0.0-fno-common.patch 1007 BLAKE2B 9de98526ad5411e40a6b38099a4166e1cb24eea6a54f93df8b8aad4ce0e5769d2a9aa77e6f7396fc8d96f692c6b8c6c0115c990034aa66120d9ea626c82f7dce SHA512 dd172c7db7fae8f8278d462eea58e4d2213dc72079a9f021f1ce3ca7ed0923139d27d39d4bc8a2fed3e91a6df2f1145292acf0ebe255a89aa59a712e45043b91
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
 DIST ezmlm-idx-7.2.2.tar.gz 742451 BLAKE2B fd40b1216d34eba253ef00a53366c8a5f2d19edd9ef20ddea3047a6837263589ac8fc4911820836b49bf4c95b99a1c99d3d2808bc90dd8eb58bc262e6acc74d7 SHA512 4fdd30d6dc254fd0353f34675ea8baa91d95860de1fb23ff5517280c75a8d87405bdd7e180e25eb8f5c0b152a35a11a939f4e7364596e83d81053b1e6019245c
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 8ea76be3cc3ce3826ff5c1be24cd660835578acbf544d363a607ac8ab362085b973733dc38ab59d70b375373ba41343687bfe75f450338a15d4ad1f95c990235 SHA512 50fd8d98bf69dd62c1bdebe02247014fc42c3581279846c078ceb5739455c9b07f10f5a50d9e6ed9fb9ae4d9fe6cebdb41fe90ff0061058c0c832eab5f0b4361
+EBUILD ezmlm-idx-7.0.0-r4.ebuild 1480 BLAKE2B 3df36686d435c7b37141497940548b66585579ceaf81f5d9d3e1b4176dd2196a0ed730c72279e82e34c15562a94dfa8ffdb59e2e13bcbc96723bc5846c95a41d SHA512 37b982b59d8dd3583b36817769bf6495774184cf7eff4b69dbf31b6d6ff6bd4ae2b527f8a13242be45c0a67928a93cf114a70321ecf5df3635326e403820388e
 EBUILD ezmlm-idx-7.2.2.ebuild 1505 BLAKE2B da0a1f58d18db96925af3db6f5e968254360ff486650cadd53997b30424224e10aab119df80165a1bcb25ad5234f6681d44cd62ab3641fbeb03e091cfec07513 SHA512 3298e62c2b50dd2b614d82cdb5364069406bf51a636c29202d4b57db0c5194a39d41cde4c69379b20490ed75f686d5e8e2bf2dd87248837f4037c37c69a8fd79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.ebuild
index 7cac1d1df219..0c0c7c20584a 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}
 	virtual/qmail"
 REQUIRED_USE="?? ( mysql postgres )"
 
+PATCHES=( "${FILESDIR}/${PN}-7.0.0-fno-common.patch" )
+
 src_prepare() {
 	default
 	echo /usr/bin > conf-bin || die
diff --git a/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch b/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
new file mode 100644
index 000000000000..11e4cb5d3533
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
@@ -0,0 +1,40 @@
+fix build with -fno-common
+
+--- a/ezmlm-get.c	2021-05-24 12:07:05.245657000 +0200
++++ b/ezmlm-get.c	2021-05-24 12:07:11.477657000 +0200
+@@ -125,7 +125,7 @@
+ 
+ int act = AC_NONE;		/* Action we do */
+ int flageditor = 0;		/* if we're invoked for within dir/editor */
+-struct stat st;
++static struct stat st;
+ 
+ int flaglocked = 0;		/* if directory is locked */
+ int flagq = 0;			/* don't use 'quoted-printable' */
+@@ -157,7 +157,7 @@
+ substdio ssindex;
+ char indexbuf[1024];
+ 
+-int fdlock;
++static int fdlock;
+ 
+ void lockup(void)
+ /* lock unless locked */
+--- a/idxthread.c	2021-05-24 12:06:55.169657000 +0200
++++ b/idxthread.c	2021-05-24 12:07:09.197657000 +0200
+@@ -39,13 +39,13 @@
+ 
+ static char strnum[FMT_ULONG];
+ 
+-struct stat st;
++static struct stat st;
+ 			/* if no data, these may be the entire table, so */
+ 			/* need to be static */
+ static subentry sdummy;
+ static authentry adummy;
+ 
+-int fdlock;
++static int fdlock;
+ 
+ /* NOTE: These do NOT prevent double locking */
+ static void lockup(void)