gentoo auto-resync : 12:07:2024 - 12:25:38

4 files changed, 122 insertions, 2 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index d19600441189..21433ce6719a 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -5,6 +5,7 @@ AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad9690
 AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da
 AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331
 AUX lighttpd-1.4.75-sparc.patch 2571 BLAKE2B 4f97bc86e54173a91a18e60645da4ab5e65832a6474901ee6bb0b2bba69f1a8d03f25e8dde46067442c51982de7f449bb3f5e7aff81f40994fef9cc161866af2 SHA512 ef71b102459dc2214236dcad022ae3a5f87fe7f199bb5b8aa9b4dec22a3a4a095e0042273956f69875223ca6dc4376b1a56a05289de780543fc5aea7e8308797
+AUX lighttpd-1.4.76-sparc.patch 3809 BLAKE2B ef0f255855fb8b3383b46873c8e8731a2f5b1719cba6873b62c7810b47390cbc6873092a20bb0fc7ff2f4f498356e061a09b3ecb415201f42b562f7ab45d42d8 SHA512 5094e3d3c3015f1b83486fcecdcbe6b8b14765ce0ebd81ce886b4dbd0104cc9da67ca7e42cacccfce5ad2d562c32b51bb904e04829be5b4a50730893293b56a3
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962
 AUX lighttpd.initd-r2 1949 BLAKE2B aafc91df917057db7cc271fd2b4b2bd5b1ccf3070f11eacf17109e8be13c0061be0c63a822ea235392d41efd772ca27011990e539cfdd1712a1e4a5425c121eb SHA512 4eb6c08fd484f336c4e530ce5efee953d7e538475975852105ea3fb38a4c1705780dca479d0be9239a1f8ad6d0b018b43a00f177f7b0dc19a4fffd03e242ef4f
@@ -18,7 +19,7 @@ DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1e
 DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9
 EBUILD lighttpd-1.4.75-r1.ebuild 5331 BLAKE2B 9bbaf77c6ca099309104e54d3259d24e4c257bec824cea7130f9f928102b4b11cc19bbfb6545153d90fbd228281ec2966a0e0b9f8cfa32de1cd3ae39b7c7999c SHA512 f92527e7d305fa6c078df7ba90246e4a0c5abf83a23ad738d60aae39b6581a6339a301d2e47c6ef2ea0421907765dcdfaf939d7e920e196240a3d45d1a532555
 EBUILD lighttpd-1.4.75.ebuild 5687 BLAKE2B 64288bb588482ae52ee638ec3ef6518d95aeca22b72e0b47340195ff86690c8aedd54d1cff23dc6ce252a9b35f717219f8c192c4d0b499eef11be81eec788e6a SHA512 b05ba9c875e606b1941f47b7b153f6e22064351589ae5ea593b4e6d7d9b9f936da7c8cee9dc93472d2b0d0100b31eb1e08f195ca7309fc9c9cabb0f00cc4658c
-EBUILD lighttpd-1.4.76-r1.ebuild 5599 BLAKE2B 9d2af35d8f8ef7b6d31fff225810f3999054ee20341f368ce7be320cb3648f0808839d64b8276521e7353a44ea3a4a5148cb47f2056a06d3d622063a980dae47 SHA512 ed63a58fcd244d1edeefb88deabb79427fab311dca3648476ca59d335c4b2a1b2a327803645d3a52c1f8285790c8a02908f5e38b9535e392bc3fcbd1b2b27dba
-EBUILD lighttpd-1.4.76.ebuild 5273 BLAKE2B 9982041e0d3f0d1d87089bea5c714f2b90523adda8e22b984a05a443b18989cf1e9e0412fb2491026dab3af4fe4db46696f3c45cfb8e8218df0c50a4ad6de7c0 SHA512 7fa06818b5c12e93da52080a2a84f8300ab4ff493199dafe29202c711fe1da10fe3bb0187ed4b9922c3bdb2f7b11f0742778f830be76adec1a888b05272e3e2b
+EBUILD lighttpd-1.4.76-r1.ebuild 5644 BLAKE2B da13815c219e8b7dd45e68a9d4b0a298e703304a20ca09cdc90cb988458817bbeedab5c305d06c0e55c937646ef09c4e660da8390d101dd705b91c4133403a57 SHA512 a9d0e93c5b2ccf541a7ce6fa828b8f6a02c8d74ef221ae5e134a2e0bcd150469b5c6ba9dac66b952693c81b1a704fcce2fbceeb1658d77df74b896369dc72cf9
+EBUILD lighttpd-1.4.76.ebuild 5318 BLAKE2B 805189a9ca127c84cde20395d6313e99fd8c3866a27840d6aca9fecea9782069660e6570f460e13c5a4820a744b0accb143d30d370f557f7960d45c1b9199923 SHA512 3b31f769bfb03d15dac67dab0f1157cec52549471059c25ed646f5dc0ce916bb707ef36d668f2e042b6255097b0b1a33218f31fb6d25cb3068701be333b60132
 EBUILD lighttpd-9999.ebuild 5593 BLAKE2B 696097729f6dc5bb471d4a1bc82ed2fffdf179b7eb60784153ebc1664974896f2854d815822f9bd4e44751973a92b94697dfac5952971d84c2a445264fe2640e SHA512 72e7ed36ca5e68cdb9e516fe246f00c1d83122573ce81564ed11ddfd987b30f54363b5512d5561739a01b202e3357d0d2b66b40c919ed88ae685dd96574a0b7f
 MISC metadata.xml 1839 BLAKE2B 1d3bb5474c1bf9f16d84013bec3c0b43d2e2c5d44535e80b2a225bc64345155ba812d0ed9826f8f4072b9a9a113ede7ab5de05b0442bd8968fcad0916edba9fb SHA512 bb491fac80fd3e92b38f35fdd75e09ca6574819eba0d9fd8bed7256be603a113a3127d2ca32c42b9dc4e3a3359f55f62d44650768844cae374d7aa81432a7983
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
new file mode 100644
index 000000000000..48568889a661
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch
@@ -0,0 +1,111 @@
+https://github.com/lighttpd/lighttpd1.4/commit/88ff3763dae65371eab9f8a22ac1c95c96fe4490
+https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958
+
+From 88ff3763dae65371eab9f8a22ac1c95c96fe4490 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Tue, 23 Apr 2024 00:16:29 -0400
+Subject: [PATCH] Revert "[core] special value for Linux POLLRDHUP on SPARC"
+ (fixes #3251)
+
+This reverts commit f14f9142f4487704e2ce0f196263c091accdb12c.
+
+x-ref:
+  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
+  https://redmine.lighttpd.net/issues/3251
+---
+ src/fdevent.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/fdevent.h b/src/fdevent.h
+index e9c380b0f..1b0a062fc 100644
+--- a/src/fdevent.h
++++ b/src/fdevent.h
+@@ -40,8 +40,6 @@ struct fdnode_st {
+ #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
+  || defined(__FreeBSD__)
+ #define FDEVENT_RDHUP  0x4000
+-#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
+-#define FDEVENT_RDHUP  0x0800
+ #else
+ #define FDEVENT_RDHUP  0x2000
+ #endif
+
+From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Wed, 24 Apr 2024 03:07:37 -0400
+Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes
+ #3251)
+
+x-ref:
+  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
+  https://redmine.lighttpd.net/issues/3251
+---
+ src/fdevent.h      |  2 ++
+ src/fdevent_impl.c | 18 ++++++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/src/fdevent.h b/src/fdevent.h
+index 1b0a062fc..556a14455 100644
+--- a/src/fdevent.h
++++ b/src/fdevent.h
+@@ -40,6 +40,8 @@ struct fdnode_st {
+ #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
+  || defined(__FreeBSD__)
+ #define FDEVENT_RDHUP  0x4000
++#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
++#define FDEVENT_RDHUP  0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/
+ #else
+ #define FDEVENT_RDHUP  0x2000
+ #endif
+diff --git a/src/fdevent_impl.c b/src/fdevent_impl.c
+index 8bfc1cc68..c84c8df57 100644
+--- a/src/fdevent_impl.c
++++ b/src/fdevent_impl.c
+@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events)
+     struct epoll_event ep;
+   #ifndef EPOLLRDHUP
+     events &= ~FDEVENT_RDHUP;
++  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
++    if (events & FDEVENT_RDHUP) {
++        events &= ~FDEVENT_RDHUP;
++        events |= EPOLLRDHUP;
++    }
+   #endif
+     ep.events = events | EPOLLERR | EPOLLHUP;
+     ep.data.ptr = fdn;
+@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev)
+     ck_static_assert(EPOLLERR   == FDEVENT_ERR);
+     ck_static_assert(EPOLLHUP   == FDEVENT_HUP);
+   #ifdef EPOLLRDHUP
++   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
++    ck_static_assert(EPOLLRDHUP  & FDEVENT_RDHUP);
++   #else
+     ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP);
++   #endif
+   #endif
+ 
+     ev->type      = FDEVENT_HANDLER_LINUX_SYSEPOLL;
+@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events)
+ 
+   #ifndef POLLRDHUP
+     events &= ~FDEVENT_RDHUP;
++  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
++    if (events & FDEVENT_RDHUP) {
++        events &= ~FDEVENT_RDHUP;
++        events |= POLLRDHUP;
++    }
+   #endif
+ 
+     if (k >= 0) {
+@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev)
+     ck_static_assert(POLLHUP   == FDEVENT_HUP);
+     ck_static_assert(POLLNVAL  == FDEVENT_NVAL);
+   #ifdef POLLRDHUP
++   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
++    ck_static_assert(POLLRDHUP  & FDEVENT_RDHUP);
++   #else
+     ck_static_assert(POLLRDHUP == FDEVENT_RDHUP);
++   #endif
+   #endif
+ 
+     ev->type      = FDEVENT_HANDLER_POLL;
diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
index 95a95e50e4a8..c61fbf73771c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
@@ -75,6 +75,10 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-sparc.patch
+)
+
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${ED}/etc/lighttpd/lighttpd.conf"
diff --git a/www-servers/lighttpd/lighttpd-1.4.76.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild
index 48fd28333e6b..f34148cf6d04 100644
--- a/www-servers/lighttpd/lighttpd-1.4.76.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.76.ebuild
@@ -69,6 +69,10 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-sparc.patch
+)
+
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${ED}/etc/lighttpd/lighttpd.conf"