| 1 |
commit: 776f3c282674288ce9ea8369bc06e7b8f0d452e4 |
| 2 |
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> |
| 3 |
AuthorDate: Thu Jun 10 18:31:55 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 10 18:39:16 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776f3c28 |
| 7 |
|
| 8 |
net-libs/libmicrohttpd: fixed testing |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/795105 |
| 11 |
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/21191 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libmicrohttpd-0.9.73-test-ssl3.patch | 35 ++++++++++++++++++++++ |
| 16 |
.../libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild | 2 ++ |
| 17 |
net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild | 2 ++ |
| 18 |
net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild | 2 ++ |
| 19 |
4 files changed, 41 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..e8d5dce0edc |
| 24 |
--- /dev/null |
| 25 |
+++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch |
| 26 |
@@ -0,0 +1,35 @@ |
| 27 |
+ Disable usage of SSLv3 in testing |
| 28 |
+ |
| 29 |
+ Integrated uptream version 0.9.74 |
| 30 |
+ |
| 31 |
+ |
| 32 |
+diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c |
| 33 |
+ |
| 34 |
+--- a/src/testcurl/https/test_tls_options.c |
| 35 |
++++ b/src/testcurl/https/test_tls_options.c |
| 36 |
+@@ -119,11 +119,6 @@ main (int argc, char *const *argv) |
| 37 |
+ fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); |
| 38 |
+ return 77; |
| 39 |
+ } |
| 40 |
+- if (0 != strncmp (ssl_version, "GnuTLS", 6)) |
| 41 |
+- { |
| 42 |
+- fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); |
| 43 |
+- return 77; |
| 44 |
+- } |
| 45 |
+ |
| 46 |
+ if (! testsuite_curl_global_init ()) |
| 47 |
+ return 99; |
| 48 |
+@@ -152,10 +147,10 @@ main (int argc, char *const *argv) |
| 49 |
+ fprintf (stderr, |
| 50 |
+ "The following handshake should fail (and print an error message)...\n"); |
| 51 |
+ if (0 != |
| 52 |
+- test_wrap ("TLS1.0 vs SSL3", |
| 53 |
++ test_wrap ("TLS1.1 vs TLS1.0", |
| 54 |
+ &test_unmatching_ssl_version, NULL, port, daemon_flags, |
| 55 |
+ aes256_sha, |
| 56 |
+- CURL_SSLVERSION_SSLv3, |
| 57 |
++ CURL_SSLVERSION_TLSv1_1, |
| 58 |
+ MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, |
| 59 |
+ MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, |
| 60 |
+ MHD_OPTION_HTTPS_PRIORITIES, |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild |
| 64 |
index 05e8225d1ee..da4a05bb291 100644 |
| 65 |
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild |
| 66 |
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild |
| 67 |
@@ -11,6 +11,8 @@ DESCRIPTION="Small C library to run an HTTP server as part of another applicatio |
| 68 |
HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" |
| 69 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" |
| 70 |
|
| 71 |
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) |
| 72 |
+ |
| 73 |
LICENSE="LGPL-2.1" |
| 74 |
SLOT="0/12" |
| 75 |
KEYWORDS="amd64 x86" |
| 76 |
|
| 77 |
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild |
| 78 |
index 40ebbfa6764..52e14e5dad1 100644 |
| 79 |
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild |
| 80 |
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild |
| 81 |
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND} |
| 82 |
virtual/pkgconfig |
| 83 |
" |
| 84 |
|
| 85 |
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) |
| 86 |
+ |
| 87 |
S=${WORKDIR}/${MY_P} |
| 88 |
|
| 89 |
DOCS="AUTHORS NEWS README ChangeLog" |
| 90 |
|
| 91 |
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild |
| 92 |
index 4a3af587191..ec1dd7a58e5 100644 |
| 93 |
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild |
| 94 |
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild |
| 95 |
@@ -12,6 +12,8 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" |
| 96 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" |
| 97 |
S="${WORKDIR}"/${MY_P} |
| 98 |
|
| 99 |
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) |
| 100 |
+ |
| 101 |
LICENSE="LGPL-2.1+" |
| 102 |
SLOT="0/12" |
| 103 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" |
Archives