gentoo christmass resync : 25.12.2020

4 files changed, 56 insertions, 16 deletions

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index f873bb527f55..a55dc00859a5 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,10 +1,11 @@
 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
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r17.ebuild 7372 BLAKE2B 1eb362d660bbdd27d71c08e2abe086fefacc7c7e5f731887ecbad762c9370eeb39ed731210a0debe3ca419b0119b0f1ffb142f31f379974a496361d3fa5a014e SHA512 b8a056fcb785dea25fffff98fea7f071de14201b192ffbd162463f3a4eae1c481e3c7306d79a9000ccf8d5892824f10417de8cba8edb83bfe3ae8abb374124e7
 EBUILD opendkim-2.10.3-r19.ebuild 7537 BLAKE2B 0616b19c9311bd00b3163852f6e1d8c091659efcdfcba2987a96793f59bfbf7c09f5b354ebebbb9631f1ccd84807f5675481903f4c052a75349fb21ef12d76a0 SHA512 25e21bb76901057ad1818adaba45ad1894b91f8f2ea68d4d3694e0fc3fe920438f6848c939e7b69a10432d6078ec735169e6d9521d719cf2c4c9acedd53f7f7a
-EBUILD opendkim-2.10.3-r25.ebuild 7632 BLAKE2B 61ec5b795f374b7fe884f9ef841605a05b4c67678c8a6f908aa94874837998dd7a42bbc773b76b280ed58d2a4851bcabcdee30498497854a8113efc1326d7830 SHA512 78dd8a2a723d5990e12c58ceb2ec45c87c2034019e0c57f6d614d38d653c3dc5667d45f0b6ddaf95ad5aa07355c9c3b269d8a3b366c880c54642eac137dc299d
-MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399
+EBUILD opendkim-2.10.3-r25.ebuild 7675 BLAKE2B 2addb6c91c5736023931e1210001411cee9ae9e9d5182ed0ac4fb6a02fdd78b80c8acdc694965c22b89b93b3bcfe65342f8bd7fe9cb5527f337b0e7e337cd238 SHA512 98a8cdb930c177d1bcfeca302435ce985e103b5bd3c9248111d9a69c5c2b8c09503c88da942875c4b08bf96b27be6f1de7b2de6f2402bfa5b15080128650493c
+MISC metadata.xml 1942 BLAKE2B baf1f8f5be8cca84723fe3a17e91a2684a41445cfc707aadd1073febff1102505cd6fbfdce3756bb6f6c1529d9b7506d1baa5f50799c79ab4be79b4dcd17e9e4 SHA512 10256aaf84cccecf4a78df6a2572e1abc296c2e200269a2f5693a1664431d556d3e79a0820076965d6c56d70056562cfac458add472ce47043734edb8e228a90
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
new file mode 100644
index 000000000000..9e963eced4dd
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
@@ -0,0 +1,51 @@
+From 6dcab8d2e001bb4b91314693affa65e9c1a9adbd Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 22 Dec 2020 19:36:28 -0500
+Subject: [PATCH 1/2] configure.ac: drop lua5.1 pkg-config check.
+
+The official upstream name for the lua pkg-config file is "lua.pc", so
+preferring the name "lua5.1.pc" to the official one can lead to
+problems when both are installed. Specifically, if lua-5.2 is
+installed and its pkg-config file is called "lua.pc", then ./configure
+will still detect (and use!) lua-5.1 if it happens to be installed
+with just the right name.
+
+This was honestly left in only for superstitious reasons, and now it's
+actually causing problems on Gentoo systems that have more than one
+version of Lua installed. So, time to go.
+
+Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/111
+---
+ configure.ac | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 828fe53f..d3d688ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1517,20 +1517,10 @@ lua_found="no"
+ 
+ if test \(  x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
+ then
+-  PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
++  PKG_CHECK_MODULES([LIBLUA], [lua], [
+       LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+       lua_found="yes"
+-    ],
+-    [
+-      AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
+-      PKG_CHECK_MODULES([LIBLUA], [lua], [
+-          LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+-          lua_found="yes"
+-        ],
+-	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
+-      )
+-    ]
+-  )
++    ])
+ fi
+ 
+ if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
+-- 
+2.26.2
+
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 224c3bd7ac44..47cb0241dd48 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-  <maintainer type="person">
-    <email>gentoo@seichter.de</email>
-    <name>Ralph Seichter</name>
-  </maintainer>
-
   <maintainer type="person">
     <email>klondike@gentoo.org</email>
     <name>Francisco Blas Izquierdo Riera</name>
   </maintainer>
-
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-
   <longdescription>
     A program implementing the Milter API that signs and verifies
     using the DKIM standard. This is a fork of Sendmail's DKIM-milter
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
index 8ca7f3a8623d..b105074a89ac 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 lua5-2} )
+LUA_COMPAT=( lua5-1 lua5-2 )
 
 inherit autotools db-use eutils systemd tmpfiles lua-single
 
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-openrc.patch"
 	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
 	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
 	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
 	"${FILESDIR}/${P}-fix-libmilter-search.patch"
 )