commit: 776f3c282674288ce9ea8369bc06e7b8f0d452e4 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Thu Jun 10 18:31:55 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 10 18:39:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776f3c28
net-libs/libmicrohttpd: fixed testing Closes: https://bugs.gentoo.org/795105 Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/21191 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libmicrohttpd-0.9.73-test-ssl3.patch | 35 ++++++++++++++++++++++ .../libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild | 2 ++ net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild | 2 ++ net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild | 2 ++ 4 files changed, 41 insertions(+) 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 00000000000..e8d5dce0edc --- /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 05e8225d1ee..da4a05bb291 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 40ebbfa6764..52e14e5dad1 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 4a3af587191..ec1dd7a58e5 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"
