* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/, net-libs/libmicrohttpd/files/
@ 2017-04-14 16:30 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2017-04-14 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 0f39cd3420fe6b5ce309555fd6c271150533b744
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 16:30:16 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 16:30:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f39cd34
net-libs/libmicrohttpd: version bump to 0.9.53
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-libs/libmicrohttpd/Manifest | 1 +
...microhttpd-0.9.53-fix-build-without-epoll.patch | 21 ++++++++
net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild | 62 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 7acdd328062..1fff86a96ce 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,3 +2,4 @@ DIST libmicrohttpd-0.9.47.tar.gz 1075636 SHA256 96bdab4352a09fd3952a346bc0189853
DIST libmicrohttpd-0.9.49.tar.gz 1087716 SHA256 9407d8252548ab97ace3276e0032f073820073c0599d43baff832902a8dab11c SHA512 9bae8d187e9567ef706a6d1b806417f2b5f667195adf7a86f96f156982e4cbcf472da10b3220c0679aeceb2c74e7778153160f3b697ac7444de038505b6e94f8 WHIRLPOOL 837c8612eb227c266ed3af773912bdbc215cbadc29766c5de10bce4a0588301213ea6ea140d3c15e6ec96c3dc3bc6b50caee892f30350d1c5e05b83639a61223
DIST libmicrohttpd-0.9.51.tar.gz 1114110 SHA256 3000bb0ba219061f2ea60251b8ea3d5f694e8c6ce1706bbff57e7e24867a23c7 SHA512 462178033d5fabc53885189a7f73a343a1a0d2f54e8ff6310a3e74ace3316567927c453773e62ff35150ec36658605d6d0a9c1c38c5d3186d543ca313f4a5912 WHIRLPOOL 9c68282e4f423f251e950f0016d3394c7ce97c85e86a57525a31f832fd2b6b32790a0395a0a0701ad0f4104ff575488ffaed547684d7c3f6f809a3e92bde464d
DIST libmicrohttpd-0.9.52.tar.gz 1244489 SHA256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4 WHIRLPOOL b70f91dba5e6e69fe42066345d51bb72248b1c4271fa88c0599d78adf17b3eb79144e5a83159f1636a79a6c9081ebb6274d90fa307d4f78a3edbfc7e0d6bd10a
+DIST libmicrohttpd-0.9.53.tar.gz 1301214 SHA256 9b15ec2d381f44936323adfd4f989fa35add517cccbbfa581896b02a393c2cc4 SHA512 2e29595c980cdcf12c1cead62f8938cc32e8c93d3a848e7473c5d5f596c6b6858732df0a3293b93d89577e5a325a62fe82adf3921a76d7184a647489364d7e2c WHIRLPOOL 940eb42aaca8581ab7c7f2f3f6c246bf001956965d5529491d780f377eb00cffbf28aec3069b6a8eb691a78d84e77555ec5554b10ce066a11333d6cae19641a4
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch
new file mode 100644
index 00000000000..ff27c26e3e6
--- /dev/null
+++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch
@@ -0,0 +1,21 @@
+commit 01df8861c19a203cea9ef26570893c2b9c0e48b2
+Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
+Date: Wed Apr 12 21:11:28 2017 +0300
+
+ Fixed GNU/Linux builds without epoll
+
+diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
+index 49a1b82..02713e3 100644
+--- a/src/microhttpd/daemon.c
++++ b/src/microhttpd/daemon.c
+@@ -2251,8 +2251,10 @@ send_param_adapter (struct MHD_Connection *connection,
+ if (0 < ret)
+ {
+ /* write successful */
++#ifdef EPOLL_SUPPORT
+ if (left > (uint64_t)ret)
+ connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;
++#endif /* EPOLL_SUPPORT */
+ return ret;
+ }
+ err = MHD_socket_get_error_();
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild
new file mode 100644
index 00000000000..9afe482cd6b
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+ dev-libs/libgcrypt:0=
+ net-libs/gnutls
+ )"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( net-misc/curl[ssl] )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-fix-build-without-epoll.patch
+ eapply_user
+}
+
+src_configure() {
+ econf \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-examples \
+ --enable-postprocessor \
+ --disable-thread-names \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable messages) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+ :
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/, net-libs/libmicrohttpd/files/
@ 2021-06-10 18:39 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-06-10 18:39 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/, net-libs/libmicrohttpd/files/
@ 2022-10-20 23:34 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-10-20 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 2f2316ccd5516c31dd42a90ffde9ff9ab89d9b88
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Mon Oct 17 17:49:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 23:34:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2316cc
net-libs/libmicrohttpd: fixed tests with LTO
Bug: https://bugs.gentoo.org/877447
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/27823
Signed-off-by: Sam James <sam <AT> gentoo.org>
...bmicrohttpd-0.9.75-fix-testsuite-with-lto.patch | 60 ++++++++++++++++++++++
net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild | 3 +-
net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild | 3 +-
net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild | 2 +
net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild | 2 +
5 files changed, 68 insertions(+), 2 deletions(-)
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.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index 98e6e1b1a342..da487b6ff5c8 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -24,7 +24,8 @@ 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..4985c28c2bdb 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
@@ -12,7 +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 )
+PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch
+ "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch )
LICENSE="LGPL-2.1+"
SLOT="0/12"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
index ab61a1435f63..e9712aa82f66 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.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.75-fix-testsuite-with-lto.patch )
+
LICENSE="LGPL-2.1+"
SLOT="0/12"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index 56141caaf078..c8f52e4fc451 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.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}"/${P}-fix-testsuite-with-lto.patch )
+
LICENSE="LGPL-2.1+"
SLOT="0/12"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-20 23:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-14 16:30 [gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/, net-libs/libmicrohttpd/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2021-06-10 18:39 Sam James
2022-10-20 23:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox