gentoo auto-resync : 21:10:2022 - 02:01:39

7 files changed, 85 insertions, 14 deletions

diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 5634ae98051d..20dbf0c0fd1c 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,12 +1,13 @@
 AUX libmicrohttpd-0.9.73-test-ssl3.patch 1227 BLAKE2B e4dad13af373f4ae5fb28fd94cd77fd86a261b2834a3636f328bc99188bfeb367f351f94bee0486716d91ed125ba913e34b891f4396aa58760391b4bf7a7cc32 SHA512 244ca6d634ecc44f0a4f3e433141a0dbefb72920b3fe29eb525a124e53de7c5c49a13f0f0400eff35274994a75c3f8c850558dca15b8e7121ee559fe1c17da8d
+AUX libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch 2078 BLAKE2B c3a7882d6e340c29fb26dce1c08ee2bf13a7fec0dfaa2b02c4f12afaa7d1ac0c610e33867b44f053db757188d160c57eedd55a77f1bcbdfcbf7d957ffcd81489 SHA512 b19c93b5139bfd50f7ab05c3a586a0d1ecb2c3e67b4f57eb48d1c0839dac44e860b699df6812f40563891435ba47b124fade74703d72c7f345c15dc367b3a0ce
 DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99a69510a14a802609d038964d927516f8f52b4330d0eee2c7b98096b2d840158e4945310edef290224ea256d9616fb4d94 SHA512 9daaab5fb35fef6f2a19b7e08eeb8473aeb0a67631808a8d7a7f78a09cb621ca5d32dbbbca616865a40afb92f8c6495f9e2ba1674880af8011a2bc798c070a13
 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
 DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
 DIST libmicrohttpd-0.9.74.tar.gz 1962057 BLAKE2B 6751696740e2893b6ad1ecf5f6e6716dc4b053f788ca1c9c76a25051437942cd975dc0ee428a65af58da04f4cca41c4ed79cdd335b3f90d1dd52651185ee42dc SHA512 86e8b88e064f17557455617975888993a285f4de6d4051cb837ef3e7328d3718001ef280473d306724dd85a01e1787fca099d4bd18e5d78b766e41a3a9f126ef
 DIST libmicrohttpd-0.9.75.tar.gz 1952076 BLAKE2B 419d7b7113edbcc54eec3e3b6da92d040e15b451bde4e1372b368fdd87277c85daddc295bc71d25bf02135921a8716876e9536c9dee286fa29b66bfb8167ebd2 SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
-EBUILD libmicrohttpd-0.9.68-r1.ebuild 1276 BLAKE2B 054bf890fc417e7cfae6ae5fd76f79e8c504f3a8a1cbfc445de1b3c751ee44e5cfde835b3a163764fdd8ed70c9c47d36276b86e28c3b39d211b53a19b6c4b7d9 SHA512 5adccd704274a8afe9f2aec820acd8d82a841cbf875384c6295290fa72632d01903d0b81a7b420531b1b3942b97e7eb7da21200c4a24a52952128406948568dd
-EBUILD libmicrohttpd-0.9.72.ebuild 1312 BLAKE2B 789ae7820d0f18794673d6215119b33af8f769de2b48b8ed361f8ecc0faf210689e14a11ca2c60c45d4858a4247afce6e131c068bc1acf139e17a4a366172789 SHA512 4506663bfe461066d74be3e4ba3dffa2e50074a0ed4d1c8f722907ccb613a6a369ad83dc41758bb0631d143e8e963a103300b719f2fb3e93bbdb544cb3e96272
-EBUILD libmicrohttpd-0.9.73.ebuild 1439 BLAKE2B e4c43d565e2827e14c0698ced8ee6cf55f8cf9a1a64005881d4f8dba32cfee051d91751c7ebee2cbe6179fabfd548daa586d48aa8490125d5f3555ad999fdfd2 SHA512 295e483b95e2a0a16922c9ca4155092f0c3d950805fe091dbf779ed20236621fb100f9979b549ea75883de74ee8a7ec3ac121676beddc5ec8b143bb076753a58
-EBUILD libmicrohttpd-0.9.74.ebuild 1399 BLAKE2B c65c16dc88fb965625e895cb9a650d71dd4809103b7204174233827a808a2a27b935574d4dd11b636867b2c34869e4758bdb9b46fad2dc3b0d34e769b048caa0 SHA512 413885fd40f7ab597d3faa5ae853403c841d8150319f353d68a63497cb28a7566bfb8dd90598064172df27b75d43d7aee7a1a05d7ca2a1a65d443b27aa0062ec
-EBUILD libmicrohttpd-0.9.75.ebuild 1411 BLAKE2B ee867e5d108874d8d44ba62bca12eaaee6fa7834e3d8d0274fcfc250678602de2bc9844ab5a8f301ef2c686392640bdb7c412a31ca6a0aa33bd08b9574d1bb50 SHA512 a980fe6ddd8f3d60ebfecbfc60777a53ccbfd3114e95d810c4fd447e0cf4f54b8f21c3cfc843e200823706c7d46e6bdccf7d3d5311d4818d9b5303c6b253c999
+EBUILD libmicrohttpd-0.9.68-r1.ebuild 1276 BLAKE2B 44f61ab6d7bcb0560753c3041ae8774117352aea3c458b512bbcff555a7d2e6b17b058ae2df1e96ecd34e980dea1d1775a3751dc04035f27d65e35badb7165bc SHA512 17c77b620782f66530957ed15e8393f47cee20e3ccb5770b0636ae1001937e1b42641490954ed384a631d37360ecbb38250c79be6fd06c7e56467573e1c9fa64
+EBUILD libmicrohttpd-0.9.72.ebuild 1370 BLAKE2B 3f3543b7cbfdf248ff96f321c39b96548731a81f9efb41da38a16a22302ddbeab89c309a8cbb7b449aaf4c6e1d0361481741c7f7481f142bd9eae4d19dd3a828 SHA512 4e24aacac8985335c539edc30146b13cec7c4bd310036215f55597f4f333bd2b0a5c7ebf3512bd04d70d20f60adb49111eddbc518e82dd169d37cb0a44de27fd
+EBUILD libmicrohttpd-0.9.73.ebuild 1497 BLAKE2B bbebc3a02af0205dd075feab9867bbd2845f0ab1031f25f9db5f5bbd27a142b847d97d23ed143244916cb355fe58d2558c33af347b421678c885e8e47095bec3 SHA512 dba6eb92e5621951e3db98760f9c2a0e5940099e4eb7ec25a2a4b6d0b6b146d60dc011c9d5bcefe4fb080a3e293e226f4523983939f749c317855965b4ef6e26
+EBUILD libmicrohttpd-0.9.74.ebuild 1468 BLAKE2B 720f7ab18f302f8285df11475c7a43d8658923433ba8ed0938895acbbe66a729e715a3f82691d809b2de9c738165a5c3d827d280bc22baac2ca51a6cee3fc8c3 SHA512 545b6d88c037e82a044d3bca588be1ed45b7cb5b1160bcc81fc3aba67608026213d96f1b92bac703adda98216809584456d15a66d08ae1e8f80c1ebeb48180e4
+EBUILD libmicrohttpd-0.9.75.ebuild 1472 BLAKE2B cb34d443f9750e8b98a61aafa5522165f6d472a96df3e6dbad778982448a02d69b3c6f127f01af64f04af11b20eb64edb60d13d9f924c376c437a986cc89b477 SHA512 19b87380485323e3fd67f31032a70cd2da3491c1476669b025a48098f0f934d6a10394b5b45805f08c9215cec9b130ff12564b3d5e92e3930a094c31005fb12b
 MISC metadata.xml 632 BLAKE2B 1944894dc81e31fc69c406a905d6f2670c62d55938b53da47d98ba4b64795226230671c0ca7188653807def9b182191c817a7cbf5cdcbb07ef2c42fb68e61ab3 SHA512 43ebbf10601c286197dda1f2361f80fc2c2a9525dfbfcfd5870810dc7428143fde1fd9966097a64c2ee1ae792deca17864efdb4cb5a57e57e94cc86dda9cb318
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch
new file mode 100644
index 000000000000..b87bdb64579f
--- /dev/null
+++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch
@@ -0,0 +1,60 @@
+Fixed incorrect function redeclaration in the testsuite.
+This fixes 'make check' with LTO.
+
+Author: Karlson2k (Evgeny Grin)
+Gentoo bug: https://bugs.gentoo.org/877447
+
+
+diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
+index 47f644d2..786918f2 100644
+--- a/src/testcurl/https/test_https_get_parallel.c
++++ b/src/testcurl/https/test_https_get_parallel.c
+@@ -46,7 +46,7 @@
+ extern const char srv_key_pem[];
+ extern const char srv_self_signed_cert_pem[];
+ 
+-int curl_check_version (const char *req_version, ...);
++int curl_check_version (const char *req_version);
+ 
+ 
+ /**
+diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
+index 4853e7eb..5f4d0486 100644
+--- a/src/testcurl/https/test_https_get_parallel_threads.c
++++ b/src/testcurl/https/test_https_get_parallel_threads.c
+@@ -48,7 +48,7 @@
+ extern const char srv_key_pem[];
+ extern const char srv_self_signed_cert_pem[];
+ 
+-int curl_check_version (const char *req_version, ...);
++int curl_check_version (const char *req_version);
+ 
+ /**
+  * used when spawning multiple threads executing curl server requests
+diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
+index d5aa8310..8fbc540a 100644
+--- a/src/testcurl/https/test_tls_options.c
++++ b/src/testcurl/https/test_tls_options.c
+@@ -36,7 +36,7 @@
+ extern const char srv_key_pem[];
+ extern const char srv_self_signed_cert_pem[];
+ 
+-int curl_check_version (const char *req_version, ...);
++int curl_check_version (const char *req_version);
+ 
+ /**
+  * test server refuses to negotiate connections with unsupported protocol versions
+diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h
+index a9af504d..e3f552a8 100644
+--- a/src/testcurl/https/tls_test_common.h
++++ b/src/testcurl/https/tls_test_common.h
+@@ -72,7 +72,7 @@ struct CipherDef
+ 
+ 
+ int
+-curl_check_version (const char *req_version, ...);
++curl_check_version (const char *req_version);
+ 
+ int
+ curl_tls_is_gnutls (void);
+
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index 281d4b602214..5ffa2ab06746 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,8 +11,6 @@ DESCRIPTION="Small C library to run an HTTP server as part of another applicatio
 HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
-
 LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="amd64 x86"
@@ -30,6 +28,8 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS NEWS README ChangeLog"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index 98e6e1b1a342..2a68bf80c8c9 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch
+	"${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch
+)
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
index 40a1b1ecad61..078fcb4fdb0a 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,8 +12,6 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
-
 LICENSE="LGPL-2.1+"
 SLOT="0/12"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
@@ -28,6 +26,11 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch
+	"${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch
+)
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
index ab61a1435f63..66062fe3d002 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -26,6 +26,8 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
 
 DOCS=( AUTHORS NEWS COPYING README ChangeLog )
 
+PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch )
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index 56141caaf078..91a33a5ffc66 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -26,6 +26,8 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
 
 DOCS=( AUTHORS NEWS COPYING README ChangeLog )
 
+PATCHES=( "${FILESDIR}"/${P}-fix-testsuite-with-lto.patch )
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \