diff options
Diffstat (limited to 'www-servers')
31 files changed, 443 insertions, 854 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz Binary files differindex 2d5c226e54fd..faa8e420a274 100644 --- a/www-servers/Manifest.gz +++ b/www-servers/Manifest.gz diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest index e5dd9e87ca71..eafe692ace75 100644 --- a/www-servers/adsf/Manifest +++ b/www-servers/adsf/Manifest @@ -1,5 +1,5 @@ DIST adsf-1.5.0.tar.gz 175804 BLAKE2B d6e0173d9fff05ad089ad8cb5136ddc8dbb506c9f942aea12237d90455acaa959c4e1ae8bfb7f0fda392e34b6dca68a6a02b1c01ab64ae219a13a51ad936e361 SHA512 13fc104c338b762ad690dbeee71effe2c1afde87b3391727fd4553fde3623ba9af6ff46fefb95c92fce10395781e48dc9f3798e9ece885d69f004ecf16947af7 DIST adsf-1.5.2.tar.gz 185809 BLAKE2B c4853e9f182ec97009e78c9675a4f7d40d2612c12a8b488cf0278435c0924a93088a4ad04e8372e9a2b6dacb7c77c917059b6bcc5a0557db3b2bb3cab2f4defb SHA512 df6ccd28432f527836f551d5e441f4bfccc91766ad1039dbcbdb2e6ef03d69d1adea17b146d45892c2fb8fca14c742206736b191b6317762e66d73a4dd45722a EBUILD adsf-1.5.0.ebuild 1324 BLAKE2B 432c141acbe316cff44fe35087dde71f1ef2059cc5dc63b8f004fe9a19b92ae5a402f105feab4c54b347a6e2c979633d35cd46d7cd8d5bb543b51f5cee509f07 SHA512 db30578be9e51cb15a2dca827fe3891b50cd781fbbe7efb0421a4f5fdd9d0bffac55b517dee033e317e78e9770ccdbdea266e32f0eb00c610ed7cdf27dbe7aeb -EBUILD adsf-1.5.2.ebuild 1342 BLAKE2B 73a57468b1d9a4ea92f439c0c04e54fc040729835533e0fe45463f267f13d6a316b344318c5e753ed81862974785d3c6836769ba15d7b8964143af465817e4d7 SHA512 e30c4a92b05d5e03f1243bdc220a4786255a33022eb8b90354131adf34cb9f4fd79de47dec20faf5c51c4d1a8b5159ba124bc393b26637e173dc876b8c3bfd79 +EBUILD adsf-1.5.2.ebuild 1359 BLAKE2B 763d6c14eef496cf34b76c95a2c46cd421cfbe7ff4ee88ba4720ee333f2155e374aa72f0e8740b77578e57993ff3db7e3734f1181564441a0532727590df98a3 SHA512 57f6dc99cddea3cbb84dd5dc439daa6b1c42b764a1ebf29b88377b4d6aa615941cc0c35102017d535e59b87e513ee056ff27733f128af9a5e7f5966863b8b673 MISC metadata.xml 347 BLAKE2B 9fdee14600f946595d3c1f0be7184d1cd2c87a699050efae9bddd4099911a2b2af814b885f7f0cef9aeb7f6695b51d648e8b3653e11730a7c068728d0ecbb992 SHA512 6ff28dea4c0e4b906ea89dc181dfdfce231e649fb585ed7f7c5edef8e52181e7bdbd37d00e8c22d0d46870769d7756cf0ae6792d212e654c1df50ec548b686d4 diff --git a/www-servers/adsf/adsf-1.5.2.ebuild b/www-servers/adsf/adsf-1.5.2.ebuild index 32bd95a98242..21cc0fce45ef 100644 --- a/www-servers/adsf/adsf-1.5.2.ebuild +++ b/www-servers/adsf/adsf-1.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,7 @@ ruby_add_rdepend " >=dev-ruby/rackup-2.1:2 " -ruby_add_bdepend "test? ( dev-ruby/rack-test )" +ruby_add_bdepend "test? ( dev-ruby/rack-test dev-ruby/webrick )" all_ruby_prepare() { sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \ diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index 8ef65587b0dd..88c4dace471c 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -2,17 +2,17 @@ AUX confd-2.7.5 150 BLAKE2B cd6cb3f151c7c20dccc84b80802e7dfd375897961b6335ec8a7b AUX initd-2.7.5 1562 BLAKE2B ee67b1f2c1a809454ec1b8b860300108d4b21183148ec28b881d096587c7728d765e7d15f0ba1587cf4f607e9e129ae8b4769b3afef1992128ed3a1c13fa4e36 SHA512 636e28583673dcb7c9756a684bb52700987e0d3a8cbd7084c7322c220ea4033206d050a64e66c609bf69d38d49e000df3fe15b969d6d7daabe05e5d8cc83a899 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26 AUX remove-binary-altering-commands-2.7.5.patch 2269 BLAKE2B a87a3f7fc6dcb4754f859eec96ab582b85472137fd11a620786f9f6257165e3878fd14d24bead78758cc3e6288ca2024fef5f7415fea373c1b9cd4ad75b1468d SHA512 f06938b2c737c0c3eb4c721b7625fcc06308fd34fe595eec0986a8f65f5983f0af9033e23540e5be882590d566b4a753e9a4fd1bcda502d5e4578d9f3aac9b4e -DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5 -DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af SHA512 c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb -DIST caddy-2.7.6.tar.gz 606077 BLAKE2B 1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179 SHA512 ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5 DIST caddy-2.8.4-deps.tar.xz 9995236 BLAKE2B c19901a458eae2d395fddb9ef8b02225f56e1cf5032a85493de58a9f797369997cb8be8fe52d6ec85333d26d879316f48af73fbd429ae2a4a3c6d2a5e57caea0 SHA512 2ff16025abb9b9a26abd2e2261b487ac34c31c09227ab573cdacad3a5206603a74a5585fa08041c2372469651d8a2a3410f2c562041aef3038c7ecc4fc8baec8 DIST caddy-2.8.4-docs.tar.gz 24660 BLAKE2B 39628524c155b97f20ba00dec592d33e363086278ef96bd216807347d7b61a1a10d7bb50be84f84f3c4a6a972ff5034840700bf2bcd763cbcec75414a667b964 SHA512 c40a3e2b911ac106706e54022563685a0c920e35fe4716d878b79a3ebd8f422aa3bec847b3a0767a53453e40d8b21a3af1804a3c7bf62ddf61fc290c4129de0b DIST caddy-2.8.4.tar.gz 662064 BLAKE2B 77aa671c22e55dff6bab3d251fa9f0a082e41176bf82f5cc9be5b9bee4a234e568c73b8865da116d0db26efbccdd58eeadac80f9160a06946426277640cec11c SHA512 5c354d0ceb3e927b918594c8c7de51f658aba798ac23d41b751c55b728f9fc5c46fa1f8c2e86c838e58d7b3514bc11937a765b36fd87971ea1757c92a70e9665 DIST caddy-2.9.0-deps.tar.xz 10147016 BLAKE2B 3f33fa41cea04e47ef30f3eba5de7b88731154e1598fd37bc55cb63905a98c2c3ee1119a7b386b2c9f278465484c6d4d00dd8bc90962d472fe0acd559f8675fa SHA512 74124dcb80f87eff1d6834569ac3e8428d55b99044f6cac043f6e997e3b2de1e31089ab712c1b2f4fb0d64b6732291dd30316bfc92c6b9000bd2cda39b4d0a90 DIST caddy-2.9.0-docs.tar.gz 24713 BLAKE2B c022672d818bf56160a561c307bc2526f0e0c6cc920286a744fc800273c9240e2852955c8c7035edad7591a168a177bf5c15822bbaee8704c4c3ca44bc44314d SHA512 f6f8a8d465373b4b2672bdf5a8124d3cedc90c8eea933f1494e6e6eab85ee788320a04c6ca7ccedac0ecbb8a335e0e179a8dd4ba07aeca685f297e525d21c368 DIST caddy-2.9.0.tar.gz 700749 BLAKE2B 299e5bcda972af0b50d51c135a844221222fef91a1b38d9fda70113087f3587253c8c1d6efda1895a1b64a42444b4d95cd4a80822bc9af7979b55b93b3e6a492 SHA512 e2e7f38d11a69159ef347acb93779a35778267440d55a80b90da75739aabc95ee385fb9256eb79e25326d5e16cf831746d98dc03ccfe97e11d8d52f521154a68 -EBUILD caddy-2.7.6-r2.ebuild 3264 BLAKE2B bbf3b4e68064269d510c5f4a7b03ea26952d59e882b7c7d909f4536643a22d45d70b5b44fa81ad5952691c7509cb8adce110d2b5fff25663ea9728592beb58db SHA512 9803cd8094c42d845f6139f37f4d221009f6124d82eec36027d70f9a9ca4548b3ced4257b6e02a5ad306301ee232dc78534cb1a0a798f9b50f719f7c7f19f71a +DIST caddy-2.9.1-deps.tar.xz 10115764 BLAKE2B a5dbfe050f1e71dd40feea375f93ef94a31bd75dd6605e460265351719130be04e3883523e550256fe03dd976dbf117292b5f9f44ce8c70030c0f9def423ebb2 SHA512 5a794d5afff72eed255badfcb4043e4714a47ed44ad724d16cf6d3f5b73015700951cf67c3f4d7916a44553ad3c0e629d0f257fe6132dcfd8f882c914a04b1af +DIST caddy-2.9.1-docs.tar.gz 24734 BLAKE2B 5c9dd78cd43cd2960f477f1fa89b8a6c4fc4e3d2c1b656051bde06afed8bebf5d1768fff77aab9fd8d5260044159e09e70474dd678cff245632fa7e14dcf05a0 SHA512 91efb7b10f68ab5e6bbfd2789a6f79c325d20692cb84a7651cce0487c97cd7699929e351ca78922ad34716958ebbf9b237e97465abdb263592745f4529cb4909 +DIST caddy-2.9.1.tar.gz 701830 BLAKE2B cb36a2dae6f5944ebe44e4233e1e558389394c2176725c8f771d98a69c81de523fa04aed504a9ab7ae97fea4dce7c774d62b799a255a2af658d8677e8c079471 SHA512 2ed36bfe8de3a2c7270e202b2d9ab4c3c78174fcd09c02e38d61d1bd57afa6471a2a690f15edcf91f2bfb105dbf2b0c2186d0c5e6f20ec169e98c66f8f71d0f8 EBUILD caddy-2.8.4.ebuild 3240 BLAKE2B 23f62d20d52aef5adb90970e863335f24d010b0d873d3e8a45a250171b948dac5f45cfe1b686794d91c6a677dc9f1a9af9cdbe9056d599652d5daca729ab0a99 SHA512 9f3ea82c74b08e48329e0ffb7149035193f4adc9b9cab96d0be064430ed104f9df5e57ae6b51c971cb052f1a617f5cc88812608f263f4ddbedfaa92ee29c2854 -EBUILD caddy-2.9.0.ebuild 3168 BLAKE2B 8409d4476068527f0f0b120cc2e71ddbb39574b55926e51d0b61b5d5689987308b78bbfa6af14dc04b52c9343cc3d8eb353b3bdca2f702e657f55e46d8fb59f4 SHA512 bf9deda2dfb2a518df969b1c65991d829d4252d9f7eb7d4ba0f60e3f9fae7f5f0ef1988223372a3476afe78f311c75a0444aeca0cbdb9b2ee7b3096ccb024a25 +EBUILD caddy-2.9.0.ebuild 3166 BLAKE2B 9435efcba66f1446718aacf11711637016bfe31beeb44e318ad88b0ef8074bcfa94e28051ab0b4069f16cd407951b6b47801a8649f47eb9aa92ce2140be17462 SHA512 77f6e43d92e0c55293a0527c4066b423e619e6741db5f0ea398bb07d84cba58cd513107d75f89cba9ff6a9238e070ba2efef9c0cad443e250a91d1498ee57a3a +EBUILD caddy-2.9.1.ebuild 3216 BLAKE2B 95aaed16e788ee07c512a3599f3909059e5570cc72cd8c70115bc94ae318c746fa03cc137773ee2aee625cde6aaf504d47ef7d1f8c1a167e0d8d3ce89ac7dfa9 SHA512 db422066bfa0b43a0e2fdcadf88dbe6c4e83f3aa74e5ba5a4734ad6e7790b0676c9aec7cae6736ea71b54ad1bd27ec4c8c049a8f6ca0d7bdb5af42613cb405aa EBUILD caddy-9999.ebuild 3216 BLAKE2B 95aaed16e788ee07c512a3599f3909059e5570cc72cd8c70115bc94ae318c746fa03cc137773ee2aee625cde6aaf504d47ef7d1f8c1a167e0d8d3ce89ac7dfa9 SHA512 db422066bfa0b43a0e2fdcadf88dbe6c4e83f3aa74e5ba5a4734ad6e7790b0676c9aec7cae6736ea71b54ad1bd27ec4c8c049a8f6ca0d7bdb5af42613cb405aa MISC metadata.xml 1212 BLAKE2B d5395939287c1f47d7c6e6590492ead98297a229620056bfe220c5b19b5d980f51c3ace25415e5c8f2c30cf65ff6690861b20871cf7088763f7509c799e94242 SHA512 947fba49f76b506cdf9889fd120acf0eaa6b82243c649944319d37232dc8cdf7c4ab1b3c418761c99ff0404e92f7957a61e5be8e44ca2635f93b9c2161e36dc5 diff --git a/www-servers/caddy/caddy-2.9.0.ebuild b/www-servers/caddy/caddy-2.9.0.ebuild index c5b4c02a8bcf..d537a7b8cd57 100644 --- a/www-servers/caddy/caddy-2.9.0.ebuild +++ b/www-servers/caddy/caddy-2.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz " - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" + KEYWORDS="amd64 arm64 ~loong ~riscv" fi # MAIN diff --git a/www-servers/caddy/caddy-2.7.6-r2.ebuild b/www-servers/caddy/caddy-2.9.1.ebuild index 4d96ac727530..15958c6dfe2c 100644 --- a/www-servers/caddy/caddy-2.7.6-r2.ebuild +++ b/www-servers/caddy/caddy-2.9.1.ebuild @@ -14,10 +14,10 @@ if [[ "${PV}" == 9999* ]]; then else SRC_URI=" https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz " - KEYWORDS="amd64 arm64 ~loong ~riscv" + KEYWORDS="~amd64 ~arm64 ~loong ~riscv" fi # MAIN @@ -38,10 +38,6 @@ FILECAPS=( -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}" ) -PATCHES=( - "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch -) - # takes a module as an only arg add_custom_module() { local LINE_NO=$(grep -n 'plug in Caddy modules here' cmd/caddy/main.go | awk -F: '{print $1;}' || die) @@ -81,10 +77,10 @@ src_unpack() { src_prepare() { default - sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die + sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die if [[ "${PV}" != 9999* ]]; then - mv ../vendor ./ || die + ln -sv ../vendor ./ || die eapply ../go-mod-sum.patch for moo in ${MY_MODULES}; do @@ -114,18 +110,18 @@ src_install() { dobin "${PN}" insinto /etc/"${PN}" - doins ../dist-"${PV}"/config/Caddyfile - systemd_dounit ../dist-"${PV}"/init/*.service + doins ../dist-*/config/Caddyfile + systemd_dounit ../dist-*/init/*.service newinitd "${FILESDIR}"/initd-2.7.5 "${PN}" newconfd "${FILESDIR}"/confd-2.7.5 "${PN}" insinto /etc/logrotate.d newins "${FILESDIR}/logrotated" "${PN}" insinto /usr/share/"${PN}" - doins ../dist-"${PV}"/welcome/index.html + doins ../dist-*/welcome/index.html newbashcomp completion.bash "${PN}" newfishcomp completion.fish "${PN}".fish newzshcomp completion.zsh _"${PN}" - newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md + newdoc ../dist-*/init/README.md systemd-services-README.md doman manpages/* } diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index dbee5ca1c909..fbccbe25ff68 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -4,19 +4,20 @@ 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 -AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f -AUX lighttpd.service-r1 349 BLAKE2B 89db06cef70a9c0c875cf9c6a82cdc9b36a1c576f4d3088f7fedb9cae4216295b94d4d610c52190d3651e576126c7c66fa1f1dbaf230216ad50284cc5a38c176 SHA512 315f8b06905642daa8d1d295c282143b97c342170586cc8d42de572b20f313a90701ec4fba3b8320ee8882a355bef53c0581970517181bfcbb0ac3c9c02771a1 AUX lighttpd.service-r2 414 BLAKE2B 24e1f3e41304ee6865b33ed847b8dc7c41a24e02acfbd3436b25fc69c10531b2a8f6ac751fd4a5bde73eba45c7f66867dcf2efcaba4e08905b8364d30dcb8386 SHA512 670e11aba26282087c46d063d6d64f2b3da91d06fc12d60300e96a7fbab1eaa5d397dd6f11eeda6eb1bffa1fb82304cd9a6909b14102e4d482c3720341c56e57 +AUX lighttpd.service-r3 3240 BLAKE2B b7681c9289162cdc37cbd84108c6466ad342cda939f8f6a1be0220efc9400038f38c257af00958ecb8a80e5d1989f2edb67009b0ca59f8e1e0ab5b810b51f0db SHA512 758fbe5960045dcd0cd9a8416909510f57d66b721c1ad8ac2b4e9bb08e36ea6ab466f4bea8217165b0e3e71b9bbef9ab80996bbb796cec2d9c60b46688cf23ed 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 +DIST lighttpd-1.4.78.tar.xz 863668 BLAKE2B 7465cc1794a5cf1167635615126e458c6708c58aaf87fc3bab9c54a140973193227f1dc0071ee618d3e6087d220de40883196f8d3c0a8e998036b3bb47e51d01 SHA512 40559e676da38b7b4742d7140ab1afe6b69a10ececc5ab1e18c1ea0e4b1c3f13f8058e8e005cbad3df8c008b6b80511afbd0bde9c8094848f3db4d5a29961181 +DIST lighttpd-1.4.78.tar.xz.asc 833 BLAKE2B 6341885ffda6712aa3eef07842a0534d9a4e80f0b55c98711f977fdc726d5193f17b0f5d6615fa2d8748b895a12484264cf98e3cac4a7b805e7eafa5459a3efd SHA512 09569a4ebff206cfa2ad5439e5fa6876ed10ea555c8cc990bcf83dffc2723febfdcbdd26ede09eb616fdc6c6a94b53d23842567af6901ec66dfcbb287374a7c5 +DIST lighttpd-1.4.79.tar.xz 865428 BLAKE2B 99a30d778b8df794695ed8ae6a016e0cec7c0a428ac247a87087f683e9a10a7a957d7e637a5710ea3df7793b046f7f0a659013d680c34c434a607885bd5f9997 SHA512 e0f1bb2cfca5e81001ea30d13f088425dfc7acbec924ecddf438eb6326ab3158a61c6c4aaee0b68a90666d1cb987ce94b1f6a48afd92485cc995db5b58265f83 +DIST lighttpd-1.4.79.tar.xz.asc 833 BLAKE2B a05351e88f73134b90fe85056d3dfa4861d34915980d2fb095327b26ec15d090db576208837a232b2faf9b929874ef86a9370859b078f87d7ec228f71db08a46 SHA512 d57546d57652ab27a5972c2a6977f175a0f9062dcfcdfaa6f4ec952d07d0780d5a98d6d94eaab086e9c5577a3e960371459d1f3cd8631b881d0a6164a6471326 EBUILD lighttpd-1.4.77.ebuild 5589 BLAKE2B a32dd6dea0ffc0ceac6abca642f3ff58fa579e4073b62e5795c96db485d1967d3c2facc25c8b49b5075d1c39c1ac3f78bf7cb8aae60c6035ccb4d79dea1e48a6 SHA512 ee3ba16ac1cf01ab30f6f4dbbd81a023d0b58f40fec4ce517e57db7f13f453fd880cba1ab51c1b41c181d53bfda39ec080370d4869519f2d36d306f10013b950 -EBUILD lighttpd-9999.ebuild 5596 BLAKE2B 2886161ea52ea6c45e3e8ab3600e4015ff844d3401946797f4c3bbd4796eaeeb023a04f5afd71cb12241226b628d56a5f8a87b8e4cfc77ed2c8e693d98fecbb6 SHA512 7a0432a1336aaddf9f22a6a30c4fbae95f6134547981da8fe4cb35f52e90ddf2b4c7c9891b620bce0ecdd9170e5191868f77eb051d40b14af348d8520c77f021 +EBUILD lighttpd-1.4.78.ebuild 5538 BLAKE2B b48fa4b7f9488e12a6ae4e41a169fd47db34a7ac1683874e2a2ff2ee906be489d8f00758d0ae553e6e322c9876f758333a0a0ae6712da4f6079580f287cc9ce4 SHA512 24fcd52741449726054f28ade1392fa25607eed1f2c9f92bbcc092755c1802c2a5e97c039929a541260e2987a717c2f8b956cb398a3229eb64db678d6676ba77 +EBUILD lighttpd-1.4.79.ebuild 5538 BLAKE2B a3d77d8130d3bbb1d2d9b56439a77431f4c19a8ebecd3efb8651990745b25332c2dc1581153e42010604c85b04f99389a12381548cc1f53cedae1a3c4bbcc067 SHA512 2ea33c021ddff87904ce5b7056f45de9f769db02b682d46a662618bdd1869ffd0528a526bf0bdd3fe566241f0a0386d6ac3ccc05cff1bebbaabc658f00e22681 +EBUILD lighttpd-9999.ebuild 5538 BLAKE2B a3d77d8130d3bbb1d2d9b56439a77431f4c19a8ebecd3efb8651990745b25332c2dc1581153e42010604c85b04f99389a12381548cc1f53cedae1a3c4bbcc067 SHA512 2ea33c021ddff87904ce5b7056f45de9f769db02b682d46a662618bdd1869ffd0528a526bf0bdd3fe566241f0a0386d6ac3ccc05cff1bebbaabc658f00e22681 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/files/lighttpd.service b/www-servers/lighttpd/files/lighttpd.service deleted file mode 100644 index f5f5be757626..000000000000 --- a/www-servers/lighttpd/files/lighttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Lightning Fast Webserver With Light System Requirements -After=syslog.target network.target - -[Service] -ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/www-servers/lighttpd/files/lighttpd.service-r1 b/www-servers/lighttpd/files/lighttpd.service-r1 deleted file mode 100644 index 2a8f22474eea..000000000000 --- a/www-servers/lighttpd/files/lighttpd.service-r1 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Lighttpd Daemon -After=syslog.target network-online.target - -[Service] -Type=simple -PIDFile=/run/lighttpd.pid -ExecStartPre=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf -ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf -ExecReload=/bin/kill -USR1 $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/www-servers/lighttpd/files/lighttpd.service-r3 b/www-servers/lighttpd/files/lighttpd.service-r3 new file mode 100644 index 000000000000..288d08e00729 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.service-r3 @@ -0,0 +1,84 @@ +[Unit] +Description=Lighttpd Daemon +After=syslog.target network-online.target +Documentation=man:lighttpd https://wiki.lighttpd.net + +# optional: systemd socket activation for lighttpd +# Requires lighttpd.conf: server.systemd-socket-activation = "enable" +# Requires installation, configuration, enabling of systemd lighttpd*.socket +# https://git.lighttpd.net/lighttpd/lighttpd1.4/src/branch/master/doc/systemd/ +#Requires=lighttpd-http-ipv4.socket lighttpd-http-ipv6.socket lighttpd-https-ipv4.socket lighttpd-https-ipv6.socket + +[Install] +WantedBy=multi-user.target + +[Service] +Type=simple +PIDFile=/run/lighttpd.pid +ExecStartPre=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf +ExecReload=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf +ExecReload=/bin/kill -USR1 $MAINPID +Restart=on-failure + +# increase num files soft limit; 1024 harkens back to select() limit +# (lighttpd.conf must still be configured with `server.max-fds`; default 4096) +LimitNOFILE=32768:524288 + +# +# system capabilities hardening +# + +# (comment all out if running lighttpd as root to manage system, e.g. via LuCI) + +# Recommended configuration: have systemd start lighttpd as unprivileged user. +# Note: starting lighttpd as unprivileged user requires TLS certificates to be +# readable by the unprivileged user and will fail for existing configurations +# where that is not currently the case. For that scenario and for similar +# compatibility reasons, this is not yet enabled by default. +#User=lighttpd +#Group=lighttpd + +# Allow unprivileged lighttpd to bind,listen to ports < 1024 (i.e. 80 and 443). +AmbientCapabilities=CAP_NET_BIND_SERVICE + +# Recommended configuration: strictly limit capabilities +# Limit capabilities, including for children and privileged processes, e.g. root +# CAP_NET_BIND_SERVICE allows bind() to ports < 1024 (i.e. 80 and 443). +# CAP_SETGID, CAP_SETUID, and CAP_SYS_CHROOT are self explanatory. +#CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT +# If not starting lighttpd as root, minimal capability to bind to ports < 1024: +#CapabilityBoundingSet=CAP_NET_BIND_SERVICE + +# Using systemd socket activation, even CAP_NET_BIND_SERVICE is not necessary +# and could be removed from AmbientCapabilities and CapabilityBoundingSet. +# Requires lighttpd*.socket 'Requires' in [Unit] section at top of this file. + +# Note: PrivateTmp=yes +# could break backends if named socket from independent daemon is located +# in /tmp; must relocate lighttpd.conf socket paths to e.g. /run/lighttpd +# Note: ProtectHome=read-only +# could break CGI scripts or WebDAV writing to home paths +# Note: RestrictSUIDSGID=yes +# could break CGI scripts or WebDAV setting suid/sgid permission bit on files + +KeyringMode=private +LockPersonality=yes +MemoryDenyWriteExecute=yes +NoNewPrivileges=yes +PrivateDevices=yes +PrivateTmp=yes +ProtectClock=yes +ProtectControlGroups=yes +ProtectHome=read-only +ProtectHostname=yes +ProtectKernelLogs=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +ProtectProc=invisible +ProtectSystem=full +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictNamespaces=yes +RestrictRealtime=yes +RestrictSUIDSGID=yes +SystemCallArchitectures=native diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.78.ebuild index a2ca309dcecd..ad6023182db3 100644 --- a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.78.ebuild @@ -17,13 +17,12 @@ else 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" + 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 )" +IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl unwind webdav xattr +zlib zstd" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -71,14 +70,9 @@ RDEPEND=" " BDEPEND=" virtual/pkgconfig - test? ( virtual/perl-Test-Harness ) - verify-sig? ( sec-keys/openpgp-keys-lighttpd ) + verify-sig? ( >=sec-keys/openpgp-keys-lighttpd-20250325 ) " -PATCHES=( - "${FILESDIR}"/${P}-sparc.patch -) - # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" @@ -202,7 +196,7 @@ src_install() { fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd fperms 0750 /var/l{ib,og}/lighttpd - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service + systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf } diff --git a/www-servers/lighttpd/lighttpd-1.4.79.ebuild b/www-servers/lighttpd/lighttpd-1.4.79.ebuild new file mode 100644 index 000000000000..acf2800b1887 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.79.ebuild @@ -0,0 +1,221 @@ +# 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 unwind webdav xattr +zlib zstd" + +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 + verify-sig? ( >=sec-keys/openpgp-keys-lighttpd-20250325 ) +" + +# 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-r3 ${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 +} diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild index 54f788708629..acf2800b1887 100644 --- a/www-servers/lighttpd/lighttpd-9999.ebuild +++ b/www-servers/lighttpd/lighttpd-9999.ebuild @@ -22,8 +22,7 @@ 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 )" +IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl unwind webdav xattr +zlib zstd" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -71,8 +70,7 @@ RDEPEND=" " BDEPEND=" virtual/pkgconfig - test? ( virtual/perl-Test-Harness ) - verify-sig? ( sec-keys/openpgp-keys-lighttpd ) + verify-sig? ( >=sec-keys/openpgp-keys-lighttpd-20250325 ) " # update certain parts of lighttpd.conf based on conditionals @@ -198,7 +196,7 @@ src_install() { fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd fperms 0750 /var/l{ib,og}/lighttpd - systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service + systemd_newunit "${FILESDIR}"/${PN}.service-r3 ${PN}.service newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf } diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest index 3814fecb3244..99440d4c66bf 100644 --- a/www-servers/nginx-unit/Manifest +++ b/www-servers/nginx-unit/Manifest @@ -2,9 +2,7 @@ AUX nginx-unit.confd 510 BLAKE2B 03cb328cbeef1baa1cf1590b11e8019efae98729ffd44fd AUX nginx-unit.initd-r2 808 BLAKE2B efb9c3f33c5fd3070333ddb224ff0bcd4e7f8e1147b426193a006f3b880f547d168179199d8cbedcec2f0a0a517650c5ceeccf812170a9f85eef896f2940dab2 SHA512 408e7e73b74ce9371e78f2113617b4627b430b19ccb2881d310aa9a33b7e1fc7a30051e558fb524af42bcbed7a76da4a494b0b931839d614e83b9ffa0a3ea0b6 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d DIST nginx-unit-1.33.0.tar.gz 1025455 BLAKE2B d17c02def260c325284c807b51c44b23bfe72b2be52bb98909b33e0f904cf833b1b254a5679ac0482fa0b3f4e4e1964017819bc05b3f7ea7ce18029d6ea9d68d SHA512 c0b2a7e8ede3fc11b52c6c44d7460c52e35dfed9b9ae6cfb5bd90c24859f601bc462626aa68a24191689bb5406250d391428c06641d84e3cf1d8615e7485fb93 -DIST nginx-unit-1.34.1.tar.gz 1054774 BLAKE2B ee595554ec0f43f9c2e9b36c2f8bec32530238917b56610d8b99e94befff9a6f2018b295ff11edd1f08ec60c7980dd099a78cf49465f2dfb83a8677db0a08540 SHA512 51bcab68d9a015f4e2710312af28afd7f7179a4b9c57dfc26f5bd4a94ad93c1cd4246a92e131a4ff460d51f3003acae636b5a62c2f257671b26eea3080858352 DIST nginx-unit-1.34.2.tar.gz 1054961 BLAKE2B ecb9756c7c8bfb6100d74a8bedba6fd950850c443ff50a53143e09e8e2eb8c71fba59ac1b79f044900224504f96f952e75dfc94f9bc43e04c64291b453d1346c SHA512 c3d778b7f3de6231d4833f17b8a40c4d971a1b186efc5b4160da4acc62c43acb129c1596896ea64aa1d6c52a37418bc823094ef2e89a15494cf3d3d09eb0f666 EBUILD nginx-unit-1.33.0.ebuild 2326 BLAKE2B 04f4ec27ca32017eb8a645db76a68213a0d062bb328e566bd05837facc9037f0be5bbaa5cb44002879b8b1d626049af93ac8b9465b8d46fef31b0ae76d3d170e SHA512 a9e3be0629361e88ec427b707b080aa1ae67b46971dd4b5ae5de112ef9fe3c927cbdb9c15491e00d37f9713b0f747a7b38c2f0a479f90903c767bb0ce95d056c -EBUILD nginx-unit-1.34.1.ebuild 2255 BLAKE2B 295008ab28666354358c70e9c35e4c0857a3c38afd2676cbe77da4c44079f47b481b8f5a0aca16dbf365c89a510aaf0d3c5a97941fde9ed202c107940100b282 SHA512 acade7548be19b588ddc18249b4408c9052003f79b7e1e771656f401b247166d81ca41234f212b0fe4cc00da8db787fbaac77e8ebc522a73149bd70dfd76fa47 -EBUILD nginx-unit-1.34.2.ebuild 2255 BLAKE2B 295008ab28666354358c70e9c35e4c0857a3c38afd2676cbe77da4c44079f47b481b8f5a0aca16dbf365c89a510aaf0d3c5a97941fde9ed202c107940100b282 SHA512 acade7548be19b588ddc18249b4408c9052003f79b7e1e771656f401b247166d81ca41234f212b0fe4cc00da8db787fbaac77e8ebc522a73149bd70dfd76fa47 +EBUILD nginx-unit-1.34.2.ebuild 2287 BLAKE2B 5a02dc481ab8225f7c047c318b27fdaa78619c37c1175a4f5edf8a1ac59736f12d48bd57e683e7ffbd4fdc04e9cb5714b778c5ba07c84a3b4492a89bc1665fca SHA512 49840be8bffa8ac3e1edf521d19f5819249e12de7d913d66d93ec850d6dd4110d8a28bd4cc625a9b30778b36086f8e48bd4f836e838787c09ca53eb648f17d58 MISC metadata.xml 830 BLAKE2B fba25edba205efbc1b147f616b836569d45578ce661057d78bbfcf30a850b560b35417bed519072ceb11fabcb3d53938205c95193dd567224f0048884e66f4d4 SHA512 6e0e32e10e6878ea7853993087636fba3941735d28b3229e683b25491ff4cce49cec1b116c3ac2cc92db7e9231b7a78f9756970b4e968cbd0d4addb1a7fbdfa0 diff --git a/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild deleted file mode 100644 index 20f2c7f88c5b..000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{12..13} ) - -inherit flag-o-matic python-single-r1 systemd toolchain-funcs - -MY_P="unit-${PV}" -MY_USE="perl python ruby" -MY_USE_PHP="php8-3" - -DESCRIPTION="Dynamic web and application server" -HOMEPAGE="https://unit.nginx.org" -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="${MY_USE} ${MY_USE_PHP} perl ssl" - -REQUIRED_USE="|| ( ${IUSE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="perl? ( dev-lang/perl:= ) - php8-3? ( dev-lang/php:8.3[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby:= - dev-ruby/rubygems:= - ) - ssl? ( dev-libs/openssl:0= ) - virtual/libcrypt:0=" -BDEPEND=" - sys-apps/which -" -RDEPEND="${DEPEND} - acct-user/nginx-unit - acct-group/nginx-unit" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - eapply_user - sed -i '/^CFLAGS/d' auto/make || die - default -} - -src_configure() { - local opt=( - --control=unix:/run/${PN}.sock - --log=/var/log/${PN} - --modules=/usr/$(get_libdir)/${PN} - --pid=/run/${PN}.pid - --prefix=/usr - --state=/var/lib/${PN} - --user=${PN} - --group=${PN} - ) - - use ssl && opt+=( --openssl ) - export AR="$(tc-getAR)" - export CC="$(tc-getCC)" - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" - - # Modules require position-independent code - append-cflags $(test-flags-CC -fPIC) - - for flag in ${MY_USE} ; do - if use ${flag} ; then - ./configure ${flag} || die "Module configuration failed: ${flag}" - fi - done - - for flag in ${MY_USE_PHP} ; do - if use ${flag} ; then - local php_slot="/usr/$(get_libdir)/${flag/-/.}" - ./configure php \ - --module=${flag} \ - --config=${php_slot}/bin/php-config \ - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" - fi - done -} - -src_install() { - default - - if use perl ; then - emake DESTDIR="${D}/" perl-install - fi - - rm -rf "${ED}"/usr/var - - diropts -m 0770 - keepdir /var/lib/${PN} - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service -} diff --git a/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild b/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild index 20f2c7f88c5b..73e626e570e1 100644 --- a/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild +++ b/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild @@ -68,7 +68,7 @@ src_configure() { ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" # Modules require position-independent code - append-cflags $(test-flags-CC -fPIC) + append-cflags $(test-flags-CC -fPIC -Wno-incompatible-pointer-types) for flag in ${MY_USE} ; do if use ${flag} ; then diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index b1a8d7e5c6e6..273e79d10de6 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,36 +1,29 @@ AUX tomcat-10.1.20-do-not-copy.patch 1164 BLAKE2B 4df0dc611ab7694d784adfaf132502c8e11b60f91a8dbb5e1385ed44e965f175660e9d5ed29d0e32d1b77a614d1bb41499bcc987e109d41bc1acd5876ace3c0c SHA512 e7a1f058566a44b6b88f3c968cddb7effe9301aadc199d127bf8269c847ecc6a2c4ad8d09b3d489dba49eff79e69e033e3acb729fd7337ec8bb378aa65c0bdfa AUX tomcat-10.1.20-offline.patch 562 BLAKE2B 338f3fe3604004ab2920d67c39facb41d506a3a56c5fe7d1c11f4fa11b8391aac7b0088b46be3b4ef5ffef7590b525f09a53985abc8d753999a548ea9a2f31c5 SHA512 0f814adf5a837985b14aca22fd1e41f36eff74c6065577a5fb46df19c67cfd85aac86edbdd12f009014c9a96342baa8db74130d0020c0390e74bdfa5cd7a56e6 AUX tomcat-11.0.0-offline.patch 562 BLAKE2B eaadd020053976c37d8a1e77d7a19c65b3a843c7a4ec3cc18c709f0d37726d39135bc603c4d33a45efebaa640de197301f972ba5be486dcf834a1a91519cb327 SHA512 5b3b629623152fe2fa6f29d4078b5af9128cba562faa509c9b64677eb9cafb0a88aaf2203bd599346abff7b9588d19fcff2fa9f8c2350c7855f658107cbd4206 +AUX tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch 3179 BLAKE2B 67b8a76576e4ed1d1fdb777c8b6dfb7ab67e9c5d8046a1ebf057439f5a4d96de9cba191f9d4f4759bfae70b1b2a514619aeec696989a3328e8d6e53360d03200 SHA512 b10fafb0ee0abd3fd5bf6ef373aed070769e6bc6146064e810a9f2995dcc78e10f641af4c19ce68b7c60d42fcc0024b47ee651de3e7eca2ab4701505c1c9fe38 +AUX tomcat-9.0.104-build.xml.patch 1250 BLAKE2B 4825624dcbd4e8ebadd75d8c7828ada05a56c1471ec6c8bde2c024ebf42a7959fb39061a5d9a4ecc21fa301fd70c3255b0f631a6cea3319efb0885476ce60aea SHA512 4e7d587700eefd81b6b620ea6578f5ae08fb268ce228859265af0aa43e73ba40a2a6c577e042a4600e78558188685d045ee9cbdf4f7d4d520f4ae2535da1c38b AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d -DIST apache-tomcat-10.1.34-src.tar.gz 6946871 BLAKE2B 9e25c8fd0ca4a8d19e2d4f912bb904d691b98b1597fbdd823a3381bdf99073a00cc8655924ef733c13214afb2a9ef92f75708eb4454e266245ad8861f90f64cb SHA512 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca -DIST apache-tomcat-10.1.34-src.tar.gz.asc 833 BLAKE2B 564c266e4967967450c10944a388c3df051971d00a632d8ecfe68f0a8741f89b270d965f8f62ff8cdc1f097f184f34025ec18b0e4ecfef26bed3a8db9ff8e028 SHA512 2c96d2f89f2bfc449516cdc06682a5404168cdd9e473211444a141aafe3fabe743d68d4e7e32c8a2bc2bb23d875e09c28781ca4cb33e9e13288086c97c20e891 -DIST apache-tomcat-10.1.35-src.tar.gz 6979367 BLAKE2B c216bdbccdbcdefab75339cae3983c989fc392512c02c02a9fd3954b3be80d1d7dd320dbc22b68457c8771a4f8aea28f637a95d9188d38ccd4e8bee2f389db1d SHA512 08d6c80c16bb5b82c9bf2d11750c2ac9b7336cae73b3ee9e0c7316a56a68f297c75f61d780ae42f9b97eb65213ad01c36b4bcfe33885d091cae3d5414e5cb64e -DIST apache-tomcat-10.1.35-src.tar.gz.asc 833 BLAKE2B e23ae9b0766bb870abf93800a2ba9b4d62ad8d5cd4836d48a8a1893861841050d7a034017076bd92279b94b0b808e634949b355845d75a584c14fe7716393790 SHA512 cbc3b325da80fe2fa574a3eadec703d4717f0acf7f76064b1790ada0bc87ab01c32fda90da8d4f2e9e6bcb2d622ccf25b622ad0440c41acd65b05e02525c4de9 -DIST apache-tomcat-10.1.36-src.tar.gz 6981087 BLAKE2B 95c5fca22c65d85284fe91b384ae9a879a0b215b40610dd6ac27ffb371b64fc92bb69edb9f90a60f2d709268fd8210867bc8a73f74e8703876ceb64f780d5b6f SHA512 18123ea1639733f14cf0b1ca0df8255b8d69abc7dd19cad10ad51f4f1f1c16f8f08fba668101169df68d23400f75f3aacab9040edba9330b78939b7c6399ae10 -DIST apache-tomcat-10.1.36-src.tar.gz.asc 833 BLAKE2B 560d59d5668b0c06b44dcbd4be871beed5d2b10ad54799e7792f01c8a80156565565111a5a28141494bbfe95a561df5fc5db79dcb56bbd3fb2a11bab1bbd6265 SHA512 22153e1d7797cfb519f7df0968a60f2b1a39de156cd53011fba32c4e51a61e7f8fe4a4b75b673bd5611485f4ef1ca50e43f08d7d09925731253dc114ba0221e1 -DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B 3ed1b184ecf43d12678d3682830065562ce4442aab571ee926b91f509195e314aeceeb10ff2ad935332b38607fd09237eeca274d526df9b7daad17fe6f144508 SHA512 38c5b9c75edb7e620a89376deab0c2e2af08e5853021e207ba26f8b4a2fa1dae2aecffb79bc9c443eb989c96317268a947a42b6869ca2cd827d2bda3be426433 -DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B 0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c SHA512 ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016 -DIST apache-tomcat-11.0.3-src.tar.gz 6914800 BLAKE2B 1051d30e3837478b75fc0b22932d8bd313a449a02ecbc7b3dd899259d980c8d37acd29a01496105feeaf07b39a2ddd7806d7c04868a898a956a7ce4ef502e5dd SHA512 c4c49ece1ffeeed8949fafa5ecc24ee8e92455f7a22eb18e88fc454f6bf511d45dd240e6ebc178d421e8a3e178249b7bb4f8b17b9fc3a599a6626928c209c3c7 -DIST apache-tomcat-11.0.3-src.tar.gz.asc 849 BLAKE2B e42d128645f754f4a88ad3ed27ba5ba8ba438fdae0f84f2a797c7d5ec9ceab7eb270cd2231382b93111fed56d36fd2d7540dc8a5dd36a0403f8f85d3fa592563 SHA512 42f487c65d48bd4a2ffc7f2d1b7900c6a744c55970ceda11965bc6163986444d200716758e40fd1efc5325b89d903c20d5b25cde0c3acceb2f3b221e50d243ef -DIST apache-tomcat-11.0.4-src.tar.gz 6916906 BLAKE2B d0259932fa5568cf921ec6f4ad1d5c221564fe1887fcfa1a8456d0389315fc5bebbf6edab241cddaf2396765093c10ae5708ebaa4a8e79fab60d3700245f7be7 SHA512 9996df1b38abd72710ef741a8858cb714a974819f033d5091d3ccd167bdaa6268c95f0501c54b35385c1164d67b2ef9e54588e92b9d59ec112bf5c74263c6131 -DIST apache-tomcat-11.0.4-src.tar.gz.asc 849 BLAKE2B 98565cc37686c15fb52fb502ad7cb4cc99c2ed1d1320e204fe8ec08742866ed3d5e04fb9e23fb3c6ebc0ea217b2e297641a70149a49b2bfdc8899840ffa1056c SHA512 b0a6bed243c28d82144c27fcb29eb85a8d3bb394ae52845691c4dc70c448c7e6563813e21259e2640ab62ba405b86888347c91096c061248d831a6a0a2854768 -DIST apache-tomcat-9.0.100-src.tar.gz 7126491 BLAKE2B 4cc63bb9d350eb2df55b9241bf25b88a0a88b8b7a73aa76af16e05cc77a63d4cfa668f1042a0c3d1c63ce4a8f42be384b5ec314cf4aeab17df1579abe16155ff SHA512 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 -DIST apache-tomcat-9.0.100-src.tar.gz.asc 833 BLAKE2B 5a9e763c63e32e7cf6845d5891d3a99524056372dd796507fdb61209c9d3ccf83c663ec557557f683593f36f713065fac6cb40ab783a9dc65258835e7da2f92e SHA512 53fac33978b490dbc61c0464ce6a13fa23f0ea6bebcd4cf832429b58ce2bd8079ca840c0fcef8fc786841d6b42cdd26f3e26f391effba1eb2a5264c094c9ec0c -DIST apache-tomcat-9.0.98-src.tar.gz 7091158 BLAKE2B 040f6a1a02140b85e324f1a17485c3866d9d336f8c032e7de4b8e3880d405339d43e853cf0999ff3e5e4e12c0551d64a39a3bb218dd0cad4cc5124ce2915a3cd SHA512 eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc -DIST apache-tomcat-9.0.98-src.tar.gz.asc 833 BLAKE2B 2f232eeb4af506cf81a32ae6f2bca8c2e7b7c3bc8cc8fade48685fd888e7bd7ea4da1967eb815ae2321d2a02ffbc5598f1ecc8a52695d41e3b2830447331b1ac SHA512 fb6f36bb4a19cc52c3bc1f7d6ccd922db7b61e0274a0aa93e5d79bf2ca0938446509b1e3f966963a583ca9a513fafc9d5c9039bac9d7a03dae1cdd94a722ef3b -DIST apache-tomcat-9.0.99-src.tar.gz 7124431 BLAKE2B ed4d9c07a55823f6945bd7b14c17d3970236041c07578f68f23826195a708706e7241fcf8e3e7786c4ad67299bd8cd361f322bf39ea8843da06856ec2d485d11 SHA512 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 -DIST apache-tomcat-9.0.99-src.tar.gz.asc 833 BLAKE2B de6f0834b2bdfc8240d9098bd3f992a37e65ddf1c8091245fbfd9fc49f9cf4510d70a5abeb575d780360c65a99c270d7c2beeeaa2d1b9e42936a0a42e53bd457 SHA512 0fc436938e8547096827e3a5ec833573e3b495f183014b4f8957ffbcc944a7af8832132251c2aa3e1ad234059131d836f66b8105919801b2d14aa58628cb32b5 -EBUILD tomcat-10.1.34.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f -EBUILD tomcat-10.1.35.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f -EBUILD tomcat-10.1.36.ebuild 5435 BLAKE2B b0eec1155288c70b85a967c8f76b3e73800c0a0dd4b7b2a0af9ec5ae3cb15cc1c216be07bb79df9d69cfff5056682f30f13299be07ca27d0e4395d68543ff241 SHA512 1caad80ce202fd2fb59ad4de24e0159744c02ee1a21aeff87fe7a904ea31bf95e211d10081db2fefe475009c91a0d92d31e9237fbea8c590f8b421328eb4978d -EBUILD tomcat-11.0.2.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a -EBUILD tomcat-11.0.3.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a -EBUILD tomcat-11.0.4.ebuild 5550 BLAKE2B 7d7f58e609ba4b5ecb654bbfd0b46ffbe8749a9d09528ac7f60473c1a8b89cb9caac9fbc5bf6eed1fc665f8474853eac0fd04e8c551948cf153ef152eb2741aa SHA512 190ef64fae906d8551e7053754da4f9a90a46047b4d4ecd7e6e7de3a7af7d9a44f1d34ad8f3776992c0a82f1ed835f4bf6fd7302b7892915ba0ce353eec01547 -EBUILD tomcat-9.0.100.ebuild 5015 BLAKE2B 78cf93968d00bb774b6b855ee9e3ebfa7518bcb98acdca79bebb218171810e7a50ea8e5a8a089154dce01b16b501425b6823b33f57b18ac8f01ab6a087d0522d SHA512 a9f52428978e4af8e297f3a095b0770200ff9b5ab4e5a9935dedc45c913b0cf8ea5d455a22c870a0f2f358400b32ad4ba2d291246fb1df8741c02d66f8ac03c2 -EBUILD tomcat-9.0.98.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c -EBUILD tomcat-9.0.99.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c +DIST apache-tomcat-10.1.39-src.tar.gz 6988808 BLAKE2B a0b5c962660ce32d19d1c3470c978b6c40aec3c50f741f96ece6bad4f63805c531a9ad2255a111348e11c9f05829ac68f45a43a75e422aa5e01b6ab5285fb798 SHA512 ff36f5ba20b5305f207b80a8f2f781b8075d334de327b36f70846a009d0441e993315ca1568bc67cbbdc09520cfbbb768437c4122699507bfc9b8b5e971a9151 +DIST apache-tomcat-10.1.39-src.tar.gz.asc 833 BLAKE2B 6979ce15e50cbbe5ff610d32dfe32b42ff50f53fc3de6bca127e229551882dd1f5d59907166a35d7a5e036365cb2c7ec14d1170f0f8da399290b53e0e3883eb1 SHA512 e99937734460d80ca431610b8496a56871f9536cd93eb21ad7c07176855dcc5157043ac77423a7cfd9c5ca527bef7c53d178ab6fc9f7cfdaed663b2cda727664 +DIST apache-tomcat-10.1.40-src.tar.gz 6995521 BLAKE2B b196e637d488501cf6b309d452472e44770f1bd2a5e2fd3f83c358388414dd660509c437d266537f14b9571a067ccdbede86fb90ae9ee60c8cfaf018caed88c8 SHA512 8174f0c6a4deb505bf8edc29917a237a52ea20166d582849ca7d5623f318c34f8adfd0576e2b4434292507d0237a1dfb54b9d496a379b1db51d46225ab6f5d87 +DIST apache-tomcat-10.1.40-src.tar.gz.asc 833 BLAKE2B 5b28148654ea28d637529f40388c9f1f0a9f415f131a4ee25c6b0667da03ee5e071363490c5b966b70c01e4efc9184f2f834307726ee2b06320870d2bed98e81 SHA512 0b2f3aa14613dd507d11451b922cf570e065f13f7f070a62805ccaebb2fcd2c3ae3ac66caee5d6161d94ec0b4706e314643a1465c8e7988ba34a936eff96f29c +DIST apache-tomcat-11.0.5-src.tar.gz 6918820 BLAKE2B 90789cf6cd68cbf813ce47a7860bec03f22f00fabf90df7742e9e37a8dea458445f54e9dea4ac26d9b5b2143c337973a89c71af16fe3d0d500115b7fb158c5e4 SHA512 58d864c0a560c840b303d20b34b1aeb9c03a534bb58badcf407144d1797d355f8f83e91963b8a8f656cae6abd6f9228206eeec3c5ff61a6318f5a9393ee2f91a +DIST apache-tomcat-11.0.5-src.tar.gz.asc 849 BLAKE2B 2ebf1daddf32988d7e708eacf2d6d606d671f55fee6061d4d3381f029eb616a3e367ad982816ea63eefa8fd75b4b1f6360409ca3f9883519b72c1a7896270eb9 SHA512 c1f7d37e5e81a94fb5e5522831e772d29035b2e9684a90471ae45680d18ab536fd8acf72b06f648635df9e0cc32a69bdaab38442598684d388eb4acf9015cecb +DIST apache-tomcat-11.0.6-src.tar.gz 6923455 BLAKE2B 1381bfe42390235e9726c5704ff943707b3f8f776a25ca8093f013b39bdcf219eb43e0151eafda7d86b9d7f4f2f6d4d117bc9f9be46b77147287387109967771 SHA512 83ac60a058eb1fdff77b94708cd1c54efe7754b2dc4db6fe9ebae58791db74901a9646707d3e5f34856d134fa9a50e77866a3c1726dfec7622b064cee3265b9f +DIST apache-tomcat-11.0.6-src.tar.gz.asc 849 BLAKE2B 21ac13391c6fe25496ede76af999032dfaec14edb3d8babe99bf63f6fed047eedb240c4aa557370d787c62cf2169a7e4333a036231f81f2684b4407b30fbf55e SHA512 9a42f9a7264c8f757b710b1cf6ab0642b0446838b56644ef51799b0f2c7202d03e7fd57d89e6bc42fedbf8ab42838128151554d5109e5206ca36853e3b9eab9b +DIST apache-tomcat-9.0.102-src.tar.gz 7133459 BLAKE2B 211ce90f9b3ea4fb4ec213ed4523c5934fd105afa6e6b9664297d26e3fa21cc2c61f8f5f9c88bcc9af3a2a2c27c13417053db30dc3d24572f61c54607aea1153 SHA512 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 +DIST apache-tomcat-9.0.102-src.tar.gz.asc 833 BLAKE2B 79fd45f7d94b66c0140c20dbf2711005e512e2709dc105d78e774145a07ad681c2264bef56099329db5d371252dcad4d6b7fa2762534db691ff383ff5c7b84ca SHA512 deb59a0dd77dcac3ce9996360883341d9450f00a6fcaedffb1d162e37344cb28cb816d5342b3d5c401edbfa76aae8b474c5228210f1a414d5ac1a2c71a5d9020 +DIST apache-tomcat-9.0.104-src.tar.gz 7141508 BLAKE2B 125a38e2e46e190e84368f7269968b5724cc84dea0b1ced5f6edf0fc2f494b6fb60d70b27fc046ce4007565b428ad922c3e14ed8b0f1960726b0cc67d01d95af SHA512 d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c +DIST apache-tomcat-9.0.104-src.tar.gz.asc 833 BLAKE2B 2d42e131df4c42dc831c0d0b8d2068083c5812e500737e84f3c6a37a1a695311e871b2c1ad7bacbdfd53b2400fe1211039bdcfa48908335551bef99a5de7da89 SHA512 533f81f8dce8f840c19796d306565aff4bd16797dc3c2786ae6a748e2b91214768849036477d465e1de522880458bc35e38424a2cd30e13152561df575af7947 +EBUILD tomcat-10.1.39.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f +EBUILD tomcat-10.1.40.ebuild 5435 BLAKE2B b0eec1155288c70b85a967c8f76b3e73800c0a0dd4b7b2a0af9ec5ae3cb15cc1c216be07bb79df9d69cfff5056682f30f13299be07ca27d0e4395d68543ff241 SHA512 1caad80ce202fd2fb59ad4de24e0159744c02ee1a21aeff87fe7a904ea31bf95e211d10081db2fefe475009c91a0d92d31e9237fbea8c590f8b421328eb4978d +EBUILD tomcat-11.0.5.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a +EBUILD tomcat-11.0.6.ebuild 5815 BLAKE2B 32c8761ca451a47317f10f94327a64275c71112792dfcb0c38cc0b318166dfb15836e9768a04ae7cf25977202919172b443ee0d39c3fe22db6bd99413df1bce8 SHA512 f98ddf127ca67e04b86802f11e66a905f99a987500f442d75ba074faa4f88aa1827e0076e9e80c171186a0911e9c4a48f020a97a560d13987fa89be0748bca79 +EBUILD tomcat-9.0.102.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c +EBUILD tomcat-9.0.104.ebuild 5016 BLAKE2B b83df22afc4999af3fec7d442dd6ad92448f73fe8f5198535e051640b59bd7d5187be30b48f4a60d64815203a9fe812a950522febbf1e980bc867a4cce70cb37 SHA512 33bdfb8d6f68df937acd014d2e879494d95ef4cdc4af78887b941f05e95f2b8b4530af3de22e38f0d07d758b4d83479dafa5c6f0d5b0a017f5cbc48e93926ae4 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0 diff --git a/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch b/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch new file mode 100644 index 000000000000..8515cab96a71 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch @@ -0,0 +1,43 @@ + +In order to allow building tomcat-11.0.6 with java 21 we have to use an older version of eclipse-ecj. +We cannot keyword eclipse-ecj:4.35 as long we don't have Java 23 or higher keyworded. +Otherwise compilation would run into this error: + + [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:327: error: cannot find symbol + [javac] settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23); + [javac] ^ + [javac] symbol: variable VERSION_23 + [javac] location: class CompilerOptions + [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:415: error: cannot find symbol + [javac] settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_23); + [javac] ^ + [javac] symbol: variable VERSION_23 + [javac] location: class CompilerOptions + [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:416: error: cannot find symbol + [javac] settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_23); + [javac] ^ + [javac] symbol: variable VERSION_23 + [javac] location: class CompilerOptions + +--- a/java/org/apache/jasper/compiler/JDTCompiler.java ++++ b/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -324,7 +324,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { + } else if (opt.equals("22")) { + settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_22); + } else if (opt.equals("23")) { +- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23); ++ settings.put(CompilerOptions.OPTION_Source, "23"); + } else if (opt.equals("24")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. +@@ -412,8 +412,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { + settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_22); + settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_22); + } else if (opt.equals("23")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_23); +- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_23); ++ settings.put(CompilerOptions.OPTION_TargetPlatform, "23"); ++ settings.put(CompilerOptions.OPTION_Compliance, "23"); + } else if (opt.equals("24")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. diff --git a/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch new file mode 100644 index 000000000000..753661661249 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch @@ -0,0 +1,31 @@ +1. we don't need commons-daemon +2. jdt.jar is eclipse-ecj.jar which we provide as a separate package +3. javadoc would fail without network access + +--- a/build.xml ++++ b/build.xml +@@ -1496,7 +1496,6 @@ + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> + +- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> + + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> +@@ -1557,7 +1556,6 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -2436,8 +2434,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <link href="../elapi"/> + <link href="../websocketapi"/> + <link href="../jaspicapi"/> +- <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/> +- <link href="https://javaee.github.io/javaee-spec/javadocs/"/> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> diff --git a/www-servers/tomcat/tomcat-10.1.35.ebuild b/www-servers/tomcat/tomcat-10.1.35.ebuild deleted file mode 100644 index 4b4c261716e6..000000000000 --- a/www-servers/tomcat/tomcat-10.1.35.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-10.1.20-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-10.1.34.ebuild b/www-servers/tomcat/tomcat-10.1.39.ebuild index 4b4c261716e6..4b4c261716e6 100644 --- a/www-servers/tomcat/tomcat-10.1.34.ebuild +++ b/www-servers/tomcat/tomcat-10.1.39.ebuild diff --git a/www-servers/tomcat/tomcat-10.1.36.ebuild b/www-servers/tomcat/tomcat-10.1.40.ebuild index 0431b446752a..0431b446752a 100644 --- a/www-servers/tomcat/tomcat-10.1.36.ebuild +++ b/www-servers/tomcat/tomcat-10.1.40.ebuild diff --git a/www-servers/tomcat/tomcat-11.0.3.ebuild b/www-servers/tomcat/tomcat-11.0.3.ebuild deleted file mode 100644 index b370601d77b4..000000000000 --- a/www-servers/tomcat/tomcat-11.0.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="11" -KEYWORDS="amd64 ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.33" - -COMMON_DEP=" - dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" - -# jre-17:* because of line 1081, build.xml -# <filter token="target.jdk" value="${compile.release}"/> -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-17:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-11.0.0-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-11.0.2.ebuild b/www-servers/tomcat/tomcat-11.0.5.ebuild index b370601d77b4..b370601d77b4 100644 --- a/www-servers/tomcat/tomcat-11.0.2.ebuild +++ b/www-servers/tomcat/tomcat-11.0.5.ebuild diff --git a/www-servers/tomcat/tomcat-11.0.4.ebuild b/www-servers/tomcat/tomcat-11.0.6.ebuild index db48095019e5..e567904a0461 100644 --- a/www-servers/tomcat/tomcat-11.0.4.ebuild +++ b/www-servers/tomcat/tomcat-11.0.6.ebuild @@ -17,11 +17,15 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="11" + KEYWORDS="~amd64 ~arm64 ~amd64-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? +# We use ECJ_SLOT="4.33" instead of "4.35" because "4.35" would need Java +# version 23 or higher to build which is not keyworded: +# To use "4.33" we also added "tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch". ECJ_SLOT="4.33" COMMON_DEP=" @@ -62,6 +66,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc PATCHES=( "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" "${FILESDIR}/tomcat-11.0.0-offline.patch" + "${FILESDIR}/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch" "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" ) diff --git a/www-servers/tomcat/tomcat-9.0.98.ebuild b/www-servers/tomcat/tomcat-9.0.102.ebuild index eeca0d02b4c7..eeca0d02b4c7 100644 --- a/www-servers/tomcat/tomcat-9.0.98.ebuild +++ b/www-servers/tomcat/tomcat-9.0.102.ebuild diff --git a/www-servers/tomcat/tomcat-9.0.100.ebuild b/www-servers/tomcat/tomcat-9.0.104.ebuild index 4b6049e0edfa..548b4ce433e2 100644 --- a/www-servers/tomcat/tomcat-9.0.100.ebuild +++ b/www-servers/tomcat/tomcat-9.0.104.ebuild @@ -53,7 +53,7 @@ BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" PATCHES=( - "${FILESDIR}/tomcat-9.0.87-build.xml.patch" + "${FILESDIR}/tomcat-9.0.104-build.xml.patch" "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" ) diff --git a/www-servers/tomcat/tomcat-9.0.99.ebuild b/www-servers/tomcat/tomcat-9.0.99.ebuild deleted file mode 100644 index eeca0d02b4c7..000000000000 --- a/www-servers/tomcat/tomcat-9.0.99.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.20" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-9.0.87-build.xml.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index 16167d90b5b8..b83167942459 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -5,5 +5,5 @@ AUX uwsgi.initd-r7 3831 BLAKE2B e284adae0d4f467b6b28481b917d31a77703057e912c22fb DIST uwsgi-2.0.23.tar.gz 810116 BLAKE2B be4353ac71a5282233b0a996e74e49bff66f4c460eb2640058c7028cfeae41214661785de78cdd4aa35415bcc4595e1e340ba48db87bee413754b13d8b24a7d8 SHA512 4060dd66f8c6309497b52a961c36a58fe2b3b3afc7e11b97cfa464757c614d1d44ccc561b18500a394b5d95e5660eae48759003a30ec07379a6f079f63f3899b DIST uwsgi-2.0.27.tar.gz 815302 BLAKE2B 6e1aab8a896405f0ab87fdb33bb14117cfd8473da61008e3ecf6b0d2664e7fd29acc12ba322c40772f015adb99ba79c3edcb40b87051fba918c162740d53f241 SHA512 78de6b8aa401ca5e27204cc68dec540617407dc9a0dad2c785a7eadc449889aad4eb516d4d8d257dc46e5b91b6c2d85be5953b19e0897375a7f0fecaa298d066 EBUILD uwsgi-2.0.23.ebuild 10877 BLAKE2B 18f9c29fed7a010ada499843442c3ad69d041f0467f8d50a6e08e6bd924997430c00a2b1e204f06bc4569e303e98f244ad61c7edce66425d95f89811611e9253 SHA512 f997b3a7fd0dec1242be2862e47db99423a96b800d9316e19f55f919e156dd1f58386d28b20fae311615028a52dbdabb98635051d49226fb4016e3b7c1f73155 -EBUILD uwsgi-2.0.27.ebuild 10945 BLAKE2B de2143ed4645402f9b3d6bbb284259cf8c144f3f19f1f8f85bb1f97c9438d57735ba2879c91b768820b47ac5d8681e5cb1b34ff21c2f98f3f82ea906d34db4f6 SHA512 fbea15ac78d6c1fb7cc6288cc400792f9fac6eecdd2a67abc0a8a6255e0b7263d63bb99e571958bd7b4aabe4ac25cca4196e9f256febbe33735b9259d8d09fe8 +EBUILD uwsgi-2.0.27.ebuild 10948 BLAKE2B 324130d39a9e21da2a202e7659100b9920dbb2b65aab363af4d7189140ee3c16e3eda56cd5b0900649bd90eaf95a005177ed451a00a7f1f730fd9db3a0b8690f SHA512 6edbc2847ffdac1698a1bff31a713664a2b2ba35e6df2264e5bdfbed1b86568f386f24269815a5935b2be993a4471b2450ddfed8e2f74d9ba5d518f6de8b04dd MISC metadata.xml 1049 BLAKE2B 5d12b036bb85027d016d48dbd975dac53c64778da842b00bfa7cf85188686838bcf3effb48e972650e3bc2bd39ec41123d6951650223e12319dd0ce79da64f15 SHA512 4aca870984e4c336b22a1047c7bf42f9f1b74059527327dcc343c3c3384a56b5ba0b6f54542fe1c75aab1b9699780bcf744a1d886f49cccf7a7aabf8d4347f58 diff --git a/www-servers/uwsgi/uwsgi-2.0.27.ebuild b/www-servers/uwsgi/uwsgi-2.0.27.ebuild index ba530a77a2e0..146bf9447c67 100644 --- a/www-servers/uwsgi/uwsgi-2.0.27.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ PHP_EXT_NAME="dummy" PHP_EXT_OPTIONAL_USE="php" USE_PHP="php8-1 php8-2" # deps must be registered separately below -POSTGRES_COMPAT=( 13 14 15 16 ) +POSTGRES_COMPAT=( 13 14 15 16 17 ) MY_P="${P/_/-}" |