diff options
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/Manifest.gz | bin | 4375 -> 4376 bytes | |||
-rw-r--r-- | www-servers/lighttpd/Manifest | 4 | ||||
-rw-r--r-- | www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch | 111 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild | 227 |
4 files changed, 0 insertions, 342 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz Binary files differindex b0323b39d6eb..e832d2ae0078 100644 --- a/www-servers/Manifest.gz +++ b/www-servers/Manifest.gz diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index dbee5ca1c909..d943876d34cb 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -4,7 +4,6 @@ AUX conf/lighttpd.conf-r3 7828 BLAKE2B 0a1a2687c781f93955a62af7d71625e37c8c5fc6c AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331 -AUX lighttpd-1.4.76-sparc.patch 3809 BLAKE2B ef0f255855fb8b3383b46873c8e8731a2f5b1719cba6873b62c7810b47390cbc6873092a20bb0fc7ff2f4f498356e061a09b3ecb415201f42b562f7ab45d42d8 SHA512 5094e3d3c3015f1b83486fcecdcbe6b8b14765ce0ebd81ce886b4dbd0104cc9da67ca7e42cacccfce5ad2d562c32b51bb904e04829be5b4a50730893293b56a3 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416 AUX lighttpd.initd-r2 1949 BLAKE2B aafc91df917057db7cc271fd2b4b2bd5b1ccf3070f11eacf17109e8be13c0061be0c63a822ea235392d41efd772ca27011990e539cfdd1712a1e4a5425c121eb SHA512 4eb6c08fd484f336c4e530ce5efee953d7e538475975852105ea3fb38a4c1705780dca479d0be9239a1f8ad6d0b018b43a00f177f7b0dc19a4fffd03e242ef4f AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe @@ -12,11 +11,8 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a AUX lighttpd.service-r1 349 BLAKE2B 89db06cef70a9c0c875cf9c6a82cdc9b36a1c576f4d3088f7fedb9cae4216295b94d4d610c52190d3651e576126c7c66fa1f1dbaf230216ad50284cc5a38c176 SHA512 315f8b06905642daa8d1d295c282143b97c342170586cc8d42de572b20f313a90701ec4fba3b8320ee8882a355bef53c0581970517181bfcbb0ac3c9c02771a1 AUX lighttpd.service-r2 414 BLAKE2B 24e1f3e41304ee6865b33ed847b8dc7c41a24e02acfbd3436b25fc69c10531b2a8f6ac751fd4a5bde73eba45c7f66867dcf2efcaba4e08905b8364d30dcb8386 SHA512 670e11aba26282087c46d063d6d64f2b3da91d06fc12d60300e96a7fbab1eaa5d397dd6f11eeda6eb1bffa1fb82304cd9a6909b14102e4d482c3720341c56e57 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe -DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1eebd4fa244a047ffba2a0ac92d89900e6285f385126a29100a5fd024868908fd5028ac1b947ca648305199661976 SHA512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 -DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9 DIST lighttpd-1.4.77.tar.xz 857872 BLAKE2B 52775633d494d502b76ec200efefadb99996d32e5127ac858d11712f683ffd8233855c8dcd30b3e5f285389ba2fbfbddc1090752d38e4ec0c0f267fc7d4afe80 SHA512 696fd4fd8486a6c3fd1131c7e8a935a02b5384882b74ddc19bf79d085e2a0abed9184a30f97e3a7aafb816d3589e110e8d70115daa15cdc52cf61aa4129e3565 DIST lighttpd-1.4.77.tar.xz.asc 833 BLAKE2B 5d3bdccd5788fce50d908eb028760290bd8033d27c0f15f414d2c5fe7d07b31ecd05aa2028d3a6b37ebdaaf2aafebb37c685834af6c502b80de185740c52de3a SHA512 5068f871244929054cc63c0381ec99f43cea573bd1d303ce3ad8a46df09e4358a96679fcb0a689d49ee2ab0228f11a95270b4e8418b7d69b7cddce425f1b14b1 -EBUILD lighttpd-1.4.76-r3.ebuild 5634 BLAKE2B 7622bc4110c0cfeeb2420f161408cb312079a57d3659387d74e98da576630927422b93541700c01108854e81c4d568ec8edeba2730581e8df58654aa30afe5a5 SHA512 04bcc37758a37f8cde2fb9d34519f09576972b114466e003f919ff245182b5b48342c6b2b9b7c771476627699a822111303acd67bf69c2929152dfef1cd0be9e EBUILD lighttpd-1.4.77.ebuild 5589 BLAKE2B a32dd6dea0ffc0ceac6abca642f3ff58fa579e4073b62e5795c96db485d1967d3c2facc25c8b49b5075d1c39c1ac3f78bf7cb8aae60c6035ccb4d79dea1e48a6 SHA512 ee3ba16ac1cf01ab30f6f4dbbd81a023d0b58f40fec4ce517e57db7f13f453fd880cba1ab51c1b41c181d53bfda39ec080370d4869519f2d36d306f10013b950 EBUILD lighttpd-9999.ebuild 5596 BLAKE2B 2886161ea52ea6c45e3e8ab3600e4015ff844d3401946797f4c3bbd4796eaeeb023a04f5afd71cb12241226b628d56a5f8a87b8e4cfc77ed2c8e693d98fecbb6 SHA512 7a0432a1336aaddf9f22a6a30c4fbae95f6134547981da8fe4cb35f52e90ddf2b4c7c9891b620bce0ecdd9170e5191868f77eb051d40b14af348d8520c77f021 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 deleted file mode 100644 index 48568889a661..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch +++ /dev/null @@ -1,111 +0,0 @@ -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-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild deleted file mode 100644 index a2ca309dcecd..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc -inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig - -DESCRIPTION="Lightweight high-performance web server" -HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd" -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://git.lighttpd.net/lighttpd/lighttpd1.4.git" - inherit git-r3 -else - SRC_URI=" - https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz - verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc ) - " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) -" - -# Match the bundled xxhash version for the minimum version -COMMON_DEPEND=" - acct-group/lighttpd - acct-user/lighttpd - >=dev-libs/xxhash-0.8.2 - virtual/libcrypt:= - brotli? ( app-arch/brotli:= ) - dbi? ( - dev-db/libdbi - ) - gnutls? ( net-libs/gnutls ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2.1.26:= ) - libdeflate? ( app-arch/libdeflate ) - lua? ( ${LUA_DEPS} ) - maxminddb? ( dev-libs/libmaxminddb ) - mbedtls? ( net-libs/mbedtls:0= ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss ) - pcre? ( dev-libs/libpcre2 ) - php? ( dev-lang/php:*[cgi] ) - sasl? ( dev-libs/cyrus-sasl ) - ssl? ( >=dev-libs/openssl-0.9.7:= ) - unwind? ( sys-libs/libunwind:= ) - webdav? ( - dev-libs/libxml2 - dev-db/sqlite - ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - zlib? ( >=sys-libs/zlib-1.1 ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${COMMON_DEPEND} - elibc_musl? ( sys-libs/queue-standalone ) -" -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-apache ) -" -BDEPEND=" - virtual/pkgconfig - test? ( virtual/perl-Test-Harness ) - 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" - - # Enable php/mod_fastcgi settings - if use php; then - sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die - fi - - # Automatically listen on IPv6 if built with USE=ipv6 (which we now always do) - # bug #234987 - sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die -} - -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi - - if ! use pcre ; then - ewarn "It is highly recommended that you build ${PN}" - ewarn "with perl regular expressions support via USE=pcre." - ewarn "Otherwise you lose support for some core options such" - ewarn "as conditionals and modules such as mod_re{write,direct}." - fi - - DOC_CONTENTS="IPv6 migration guide:\n - https://wiki.lighttpd.net/IPv6-Config - " -} - -src_configure() { - # (One specific library might be preferred on embedded systems via - # MYMESONARGS with e.g. -DFORCE_blah_CRYPTO) - local emesonargs=( - -Dmoduledir="$(get_libdir)"/${PN} - - ${c_args} - - $(meson_feature brotli with_brotli) - - # TODO: revisit (was off in autotools ebuild) - -Dwith_bzip=disabled - - $(meson_feature dbi with_dbi) - - # Obsolete - -Dwith_fam=disabled - - $(meson_use gnutls with_gnutls) - $(meson_feature kerberos with_krb5) - $(meson_feature ldap with_ldap) - - $(meson_feature libdeflate with_libdeflate) - - $(meson_feature unwind with_libunwind) - - $(meson_use lua with_lua) - -Dlua_version=${ELUA} - - $(meson_feature maxminddb with_maxminddb) - $(meson_use mbedtls with_mbedtls) - - $(meson_use nettle with_nettle) - $(meson_use nss with_nss) - - # Obsolete - -Dwith_pcre=disabled - - $(meson_use pcre with_pcre2) - - $(meson_feature sasl with_sasl) - $(meson_use ssl with_openssl) - - -Dwith_xxhash=enabled - $(meson_feature webdav with_webdav_props) - - # Unpackaged in Gentoo - -Dwith_wolfssl=false - - $(meson_use xattr with_xattr) - $(meson_feature zlib with_zlib) - $(meson_feature zstd with_zstd) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # Init script stuff - newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd - newconfd "${FILESDIR}"/lighttpd.confd lighttpd - - # Configs - insinto /etc/lighttpd - newins "${FILESDIR}"/conf/lighttpd.conf-r3 lighttpd.conf - doins "${FILESDIR}"/conf/mod_cgi.conf - doins "${FILESDIR}"/conf/mod_fastcgi.conf - doins doc/config/conf.d/mime.conf - - # Update lighttpd.conf directives based on conditionals - update_config - - # Docs - dodoc AUTHORS README NEWS doc/scripts/*.sh - newdoc doc/config/lighttpd.conf lighttpd.conf.distrib - readme.gentoo_create_doc - - docinto txt - dodoc doc/outdated/*.txt - - doman doc/*.8 - - # Logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd - - keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs - fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd - fperms 0750 /var/l{ib,og}/lighttpd - - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service - newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - readme.gentoo_print_elog - - if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then - elog - elog "Gentoo has a customized configuration," - elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your" - elog "existing configuration." - fi - - if use brotli || use zstd || use zlib ; then - elog - elog "Remember to clean your cache directory when using" - elog "output compression!" - elog "https://wiki.lighttpd.net/Docs_ModDeflate" - fi -} |