gentoo resync : 15.06.2021

5 files changed, 45 insertions, 3 deletions

diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index da6764d357a0..3ff0b00ba368 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,7 +1,8 @@
+AUX libmicrohttpd-0.9.73-test-ssl3.patch 1227 BLAKE2B e4dad13af373f4ae5fb28fd94cd77fd86a261b2834a3636f328bc99188bfeb367f351f94bee0486716d91ed125ba913e34b891f4396aa58760391b4bf7a7cc32 SHA512 244ca6d634ecc44f0a4f3e433141a0dbefb72920b3fe29eb525a124e53de7c5c49a13f0f0400eff35274994a75c3f8c850558dca15b8e7121ee559fe1c17da8d
 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
-EBUILD libmicrohttpd-0.9.68-r1.ebuild 1200 BLAKE2B 3973e2a7077ad323d8177237d0a4e067303d6a9234bea971b0f541b67d680234d5edee136c34ee6b1078ee186a969f273d7f01b2067adffab2f9301f816576de SHA512 59fc30ceb6fa7dff759f115f8ce626085204e34e4d887d79a851fa5f9827b2570c047b76ae9ff5f2be3bea61e6e294347805c1161db827b606be93dc91588e6c
-EBUILD libmicrohttpd-0.9.72.ebuild 1236 BLAKE2B 21e77d98dc6839be7c55dfdefec799cdfb49f5631f05c61da8436ef27640201916c0987d9beba802dbabf823ec80f7724e38a379a085d45be3101459ed074c7b SHA512 1df698bac5e462b9475d0fbf7b0b2810852b23d5cfb0e3cd003eabc4fbd4de10b28679a9c776c4ce7a4d732f06062f81ea4a61a7bb243149809c70d75aa53007
-EBUILD libmicrohttpd-0.9.73.ebuild 1370 BLAKE2B d6f2a9f573c8e838af7f38e16ffb008dfb85a01b77d6eb1081377f817caf5e97661053ae22a309242aa1c6393f825d1c0427a893a853a37c6ff7bc839c37161d SHA512 91ea9a7f49a81c9e742ce9c12d9c1aeff10110acb701184acac81020ea43e1914a352de311d97f5ebb281bd1426d7f3e87ad90ceb699b723e4195caed6fe677c
+EBUILD libmicrohttpd-0.9.68-r1.ebuild 1256 BLAKE2B 859ca10c35695d9ca39109aef4966d029dc6f0f5c307453db26070fc57ab6d7d6a4d9ba16fa09bf5a80aa299b9a1698a0481b940d4b2f4e01aa0e22165f9468c SHA512 504463d6caf3edc4a594356fd7092cbe800da452c8d21fffd29d159a58f048b1f82581d189bcd80373e782de282ee7154fd83945dcd207cffad1aaf4b308e6d7
+EBUILD libmicrohttpd-0.9.72.ebuild 1292 BLAKE2B a4afc0c39b260ca28eefa81f54661d2ecfc77711aa318a1d3d99603a5fdba2364ad1917623e97cc32d052205cd62fa2243a17cdac192f0f3b17d28e16e8c7108 SHA512 d48f9b68ed4f2b9fd9a8e2104e844c365e2dc7de5abd638f62b6ba5966d17bb2077dfa338a49ccd201ddcd491a8b27c8b7420b700ecf3ecb4637d6b8234e75de
+EBUILD libmicrohttpd-0.9.73.ebuild 1426 BLAKE2B 8e2eb878d597d885dc4eda798284dc4be643bb6d9ecfd065a1418cc60e709e1969eb003818cb2c7507ab6711e9467e7e8b109228e05a02e1f6f59176e4161871 SHA512 995feea52dcd56f0b042c8d2b47f0e6a30a020829fcec3d97ab591b3880ec4ccf98dfa90f685ef1c52a868747b65ca46ff73187904be3218557813cf1b47f8c3
 MISC metadata.xml 631 BLAKE2B 84912d97f425f6adf4c70ce77df6cfc7c232d193206a28e41c6fc2ef7e4beea8bef738e5fa8f6fbf379cf2e3a5ed7750c85d0be8156a924e330e65891fb519c8 SHA512 d5ac18342550f72840cebf86c8f99b4f042e2abfd42fe26643264706679fa09b10c67b3174d41fcfd786aad5665e0c130da9a9876869a113d24493ced5334dc3
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch
new file mode 100644
index 000000000000..e8d5dce0edcb
--- /dev/null
+++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch
@@ -0,0 +1,35 @@
+ Disable usage of SSLv3 in testing
+
+ Integrated uptream version 0.9.74
+
+
+diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
+
+--- a/src/testcurl/https/test_tls_options.c
++++ b/src/testcurl/https/test_tls_options.c
+@@ -119,11 +119,6 @@ main (int argc, char *const *argv)
+     fprintf (stderr, "Curl does not support SSL.  Cannot run the test.\n");
+     return 77;
+   }
+-  if (0 != strncmp (ssl_version, "GnuTLS", 6))
+-  {
+-    fprintf (stderr, "This test can be run only with libcurl-gnutls.\n");
+-    return 77;
+-  }
+ 
+   if (! testsuite_curl_global_init ())
+     return 99;
+@@ -152,10 +147,10 @@ main (int argc, char *const *argv)
+   fprintf (stderr,
+            "The following handshake should fail (and print an error message)...\n");
+   if (0 !=
+-      test_wrap ("TLS1.0 vs SSL3",
++      test_wrap ("TLS1.1 vs TLS1.0",
+                  &test_unmatching_ssl_version, NULL, port, daemon_flags,
+                  aes256_sha,
+-                 CURL_SSLVERSION_SSLv3,
++                 CURL_SSLVERSION_TLSv1_1,
+                  MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
+                  MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
+                  MHD_OPTION_HTTPS_PRIORITIES,
+
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index 05e8225d1ee3..da4a05bb2914 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -11,6 +11,8 @@ 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"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index 40ebbfa6764d..52e14e5dad16 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
+
 S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS NEWS README ChangeLog"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
index 4a3af5871918..ec1dd7a58e54 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -12,6 +12,8 @@ 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"