mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade net-libs/libmicrohttpd to 0.9.73

Browse Source 
Signed-off-by: ArkaprabhaChakraborty <chakrabortyarkaprabha998@gmail.com>
This commit is contained in:
ArkaprabhaChakraborty 2021-11-09 21:05:38 +00:00
parent eef37ccc04
commit d7d1a79cd7
11 changed files with 178 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/Manifest vendored
View File

@ -1,5 +1,3 @@
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
DIST libmicrohttpd-0.9.54.tar.gz 1309560 SHA256 bcc721895d4a114b0548a39d2241c35caacb9e2e072d40e11b55c60e3d5ddcbe SHA512 d3276ad3af123aacc5ff885786861ccc94397576b81999974456b9b803fe5d911115f6595281ffce2240087f98a6527a840506eabeec9f2589d555fd235b6c89 WHIRLPOOL 5d5c099ea269c3d767b6d3f706453ec31b584c74fc01cbfc55ba0a54ce902611853cfeca7f7c8cc3f3c47147cb3db7cea3730abc86174f5d857471d75013b2c5
DIST libmicrohttpd-0.9.55.tar.gz 1308328 SHA256 0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8 SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173 WHIRLPOOL de74ff40e8795c562bd14c347a1b764d198762f7e1efac9279c1b366265a701c4867600efdb9f59eed1e833e080d166f22d34c6dae05c59d89ef311cdd50365b
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

21
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch vendored
View File

@ -1,21 +0,0 @@
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_();

35
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch vendored Normal file
View File

@ -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,

57
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.51.ebuild vendored
View File

@ -1,57 +0,0 @@
# 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_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
}

57
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild vendored
View File

@ -1,57 +0,0 @@
# 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_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
}

62
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.53.ebuild vendored
View File

@ -1,62 +0,0 @@
# 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
}

57
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild vendored
View File

@ -1,57 +0,0 @@
# 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 ~arm64 ~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_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
}

29
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.54.ebuild → sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild vendored
View File

@ -1,7 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
EAPI="7"
inherit multilib-minimal
MY_P="${P/_/}"
@ -9,37 +11,36 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="epoll messages ssl static-libs test"
KEYWORDS="amd64 x86"
IUSE="+epoll ssl static-libs test"
RESTRICT="!test? ( test )"
RDEPEND="ssl? (
dev-libs/libgcrypt:0=
net-libs/gnutls
)"
RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
# We disable tests below because they're broken,
# but if enabled, we'll need this.
DEPEND="${RDEPEND}
test? (
ssl? ( net-misc/curl[ssl] )
)"
test? ( net-misc/curl[ssl?] )"
S=${WORKDIR}/${MY_P}
DOCS="AUTHORS NEWS README ChangeLog"
src_configure() {
multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
--enable-bauth \
--enable-dauth \
--disable-examples \
--enable-messages \
--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)
@ -50,7 +51,7 @@ src_test() {
:
}
src_install() {
multilib_src_install_all() {
default
use static-libs || find "${ED}" -name '*.la' -delete

57
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild vendored Normal file
View File

@ -0,0 +1,57 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit multilib-minimal
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 arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="+epoll ssl static-libs test thread-names"
RESTRICT="!test? ( test )"
RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
DEPEND="${RDEPEND}
test? ( net-misc/curl[ssl?] )
virtual/pkgconfig
"
PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch )
S=${WORKDIR}/${MY_P}
DOCS="AUTHORS NEWS README ChangeLog"
multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
--enable-shared \
$(use_enable static-libs static) \
--disable-nls \
--enable-bauth \
--enable-dauth \
--disable-examples \
--enable-messages \
--enable-postprocessor \
--enable-httpupgrade \
--disable-experimental \
$(use_enable thread-names) \
$(use_enable epoll) \
$(use_enable test curl) \
$(use_enable ssl https) \
$(use_with ssl gnutls)
}
multilib_src_install_all() {
default
use static-libs || find "${ED}" -name '*.la' -delete
}

58
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild vendored Normal file
View File

@ -0,0 +1,58 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit multilib-minimal
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"
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"
IUSE="+epoll ssl static-libs test thread-names"
RESTRICT="!test? ( test )"
RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
# libcurl and the curl binary are used during tests on CHOST
DEPEND="${RDEPEND}
test? ( net-misc/curl[ssl?] )"
BDEPEND="ssl? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS README ChangeLog )
multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
--enable-shared \
$(use_enable static-libs static) \
--disable-nls \
--enable-bauth \
--enable-dauth \
--disable-examples \
--enable-messages \
--enable-postprocessor \
--enable-httpupgrade \
--disable-experimental \
--disable-heavy-tests \
$(use_enable thread-names) \
$(use_enable epoll) \
$(use_enable test curl) \
$(use_enable ssl https) \
$(use_with ssl gnutls)
}
multilib_src_install_all() {
default
if ! use static-libs; then
find "${ED}" -name '*.la' -delete || die
fi
}

13
sdk_container/src/third_party/portage-stable/net-libs/libmicrohttpd/metadata.xml vendored
View File

@ -1,12 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
<maintainer type="person" proxied="yes">
<email>k2k@narod.ru</email>
<name>Evgeny Grin</name>
</maintainer>
<use>
<flag name="messages">enable error messages</flag>
<flag name="epoll">use epoll() system call</flag>
<flag name="epoll">Use epoll() system call</flag>
<flag name="thread-names">Assign thread names to internal threads, useful for dependent apps debugging</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gnu:libmicrohttpd</remote-id>
</upstream>
</pkgmetadata>