From e59b99df9503539c0231e655a17bccf83f8a270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Jun 2023 07:29:14 +0100 Subject: gentoo auto-resync : 25:06:2023 - 07:29:14 --- www-servers/lighttpd/Manifest | 7 +++--- .../files/lighttpd-1.4.69-fix-meson-typo.patch | 29 ++++++++++++++++++++++ www-servers/lighttpd/lighttpd-1.4.69.ebuild | 4 +++ www-servers/lighttpd/lighttpd-1.4.70.ebuild | 4 +++ www-servers/lighttpd/lighttpd-1.4.71.ebuild | 4 +++ 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch (limited to 'www-servers/lighttpd') diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index dab8fa2d01ff..1e4a9e7877de 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -3,6 +3,7 @@ AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad9690 AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331 AUX lighttpd-1.4.68-meson-mod_evasive-remove.patch 585 BLAKE2B 7f1745436c59d461edf1b6e7b847ea2285f6b94bf01c00af5f8d134ba9a479fcb0a9bca4cdc7b8c6b77593751a315ec9cf59da5e4b5ac5a896f6e903ad9f5c21 SHA512 c4f2b8cb24d2bdc2ad0d6a82512890fa1e2915806e90cf42ac8043a0f71cbce42dab3eb3c3130b2311ee0d396648eb9cda347e5dffb73516e6f1ae33d8066635 +AUX lighttpd-1.4.69-fix-meson-typo.patch 1444 BLAKE2B 1f742b8cdc7965c7925baf25b22a28a5207591791970c3e9ec5b1667db06cbc01d94957bbbcc83cdd179ac6c9a35cfc1bcfe3caf5378b4656059ea1008a5fed0 SHA512 d3e38dffedad22c99f6409c9d7c8953430ae2bcd3f264be1218b393b7e01f9d2c7ccf43c0ded18b3931619c3ab4bf7b9cee9189c008dc15d9aa6ab238cbf34da AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416 AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe @@ -13,7 +14,7 @@ DIST lighttpd-1.4.69.tar.xz 1045516 BLAKE2B 4b9c15bd69db5afcf40c3df41831d2fcecbb DIST lighttpd-1.4.70.tar.xz 1070048 BLAKE2B 3f2e56343e4bf6904babadf5b1a879e44b598f6ae3b3abe9260c47ae72bdc9424fed55104646caf5fb35b0ae8cb084b1eba694a3e18a7c9c76e08e3cd8802a19 SHA512 50a4b9e3ded2c40ad6c2f4d0dff8b89d412a839ba2e6eb0d9310c344adfa7c2067f3220f666b81fc0e1a1efafa222f5bba00f91b5925f55fddeacc2304837a21 DIST lighttpd-1.4.71.tar.xz 1070904 BLAKE2B fa039ca7877050b4720c815c4bd164ad0fe7e367e4302b8e0a3ab92654a2169ded0b0a42209ca1a0561b5090670e8a8d71b594c65c439a8d03a49685405dae2a SHA512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598 EBUILD lighttpd-1.4.68.ebuild 6134 BLAKE2B d3f37d71841a1100922d6eb2bb8dca791c225696d104c573c764dc237e57d6d0176d2ae7b648743e4fc815b15ba0edfdb7ae6e82015a26f784a27ff7dae0203b SHA512 711c6376bb1bdb3784faec233f2efdff5bcd4be9e33bce41a07232c074d6d7ad479ff22697b7b0cccbc799ac8a82946942ff85215b5be82392f4491555fa31c9 -EBUILD lighttpd-1.4.69.ebuild 6073 BLAKE2B 0200efd5b8c15c5d13bc07cfac28920f525fe52abfa827810f4bf7a489b0326b07d5805952e144a9a1b9f3da151cbcfeafe65932bfcd5686493bcf897db7669c SHA512 efe1edc84ccb2cbfce2a6c65893c8bc8ad6b0f4c749c55bb106b35ecdd43a80d967eb19b8788b4a21cc30dba0e126db38b72070eab7acd3c6fdf472a214cccb7 -EBUILD lighttpd-1.4.70.ebuild 6076 BLAKE2B a7839c7b76ebf861d3c02202d1622ae790eb3242ce5cf01b57d0726c92b690c3fc2b55cc415ce51ce77186b72cb3318f887c889ff5271761d4338cd8c6bef4bb SHA512 ac7e2031314135e8b80f97aca63e8f5306d4cd666633f55ae1fa97c3a326edbc54de275cd0124d2acbdda598f6c79a759aa33b68660b1be81facf2792a21d523 -EBUILD lighttpd-1.4.71.ebuild 6076 BLAKE2B a7839c7b76ebf861d3c02202d1622ae790eb3242ce5cf01b57d0726c92b690c3fc2b55cc415ce51ce77186b72cb3318f887c889ff5271761d4338cd8c6bef4bb SHA512 ac7e2031314135e8b80f97aca63e8f5306d4cd666633f55ae1fa97c3a326edbc54de275cd0124d2acbdda598f6c79a759aa33b68660b1be81facf2792a21d523 +EBUILD lighttpd-1.4.69.ebuild 6135 BLAKE2B 011fc91e0daa007346842f850ec870ea08f8938c67b5b343c6ebe7e8764ec7bb180235f09dbd32a41c93b49dd40c77bbab18cae44635c3d7c4a9f78c880425ae SHA512 94a1d23734e1a176d88eea23940caa9ed63453bc45cc1d06e3f8a0fcbe0836f709baa6e25354fc9b0580edb3bbdc6922a24e0eda827eb5c913f3dbfda28ba851 +EBUILD lighttpd-1.4.70.ebuild 6138 BLAKE2B 40ae26fa1b109d292cdd8bc0770391aeb550f7967c5aebfa9bd5795cc46653f142370ed9df76b1cc97f8ad6da391e47889a41c72e3329fed6739a63164df8321 SHA512 402cfc85f4bb144e5e9b5adc591cc79832c4bd8138278e1e5c411f74146ae5a05548416af355ba385bec4a3edaa9a90db830a2febb0155845f5b53145efda020 +EBUILD lighttpd-1.4.71.ebuild 6138 BLAKE2B 40ae26fa1b109d292cdd8bc0770391aeb550f7967c5aebfa9bd5795cc46653f142370ed9df76b1cc97f8ad6da391e47889a41c72e3329fed6739a63164df8321 SHA512 402cfc85f4bb144e5e9b5adc591cc79832c4bd8138278e1e5c411f74146ae5a05548416af355ba385bec4a3edaa9a90db830a2febb0155845f5b53145efda020 MISC metadata.xml 1964 BLAKE2B f579b748ff30526597b77536bc6431ae08f340d1fa3fbc142b4668978bf8982bef21ed6975d89ef0cc8446b5a54a962c9bc2d62529f42da9642495ae58032918 SHA512 54b3c0a182c3eb48aa80d079738ec57b885115864c082f4c9c026273bf43893e222c24263e09a3bda4cf154264b064bd079dd9f4083fdb86c4529971208c259a diff --git a/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch b/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch new file mode 100644 index 000000000000..07e65091a08c --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch @@ -0,0 +1,29 @@ +https://github.com/lighttpd/lighttpd1.4/pull/127 + +From 7445f72eb441052f7051f029b25d39855dc75e1c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 25 Jun 2023 06:18:40 +0100 +Subject: [PATCH] src: Fix 'getoption' meson typo + +Bug: https://bugs.gentoo.org/905219 +--- a/src/meson.build ++++ b/src/meson.build +@@ -381,7 +381,7 @@ if get_option('with_gnutls') + # function: gnutls_check_version (-lgnutls) + libgnutls = [ dependency('gnutls') ] + conf_data.set('HAVE_GNUTLS_CRYPTO_H', true) +- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) ++ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) + libcrypto = [ dependency('gnutls') ] + endif + endif +@@ -402,7 +402,7 @@ if get_option('with_nss') + #libnss3 = [ compiler.find_library('nss3') ] + #libnssutil3 = [ compiler.find_library('nssutil3') ] + conf_data.set('HAVE_NSS3_NSS_H', true) +- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) and not(getoption('with_gnutls')) ++ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) and not(get_option('with_gnutls')) + libcrypto = [ dependency('nss') ] + endif + endif + diff --git a/www-servers/lighttpd/lighttpd-1.4.69.ebuild b/www-servers/lighttpd/lighttpd-1.4.69.ebuild index 942b36ef6672..d1ef39483fca 100644 --- a/www-servers/lighttpd/lighttpd-1.4.69.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.69.ebuild @@ -72,6 +72,10 @@ BDEPEND=" test? ( virtual/perl-Test-Harness ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" diff --git a/www-servers/lighttpd/lighttpd-1.4.70.ebuild b/www-servers/lighttpd/lighttpd-1.4.70.ebuild index d8c68c6d4ed0..5aa9f6dcb73d 100644 --- a/www-servers/lighttpd/lighttpd-1.4.70.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.70.ebuild @@ -72,6 +72,10 @@ BDEPEND=" test? ( virtual/perl-Test-Harness ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" diff --git a/www-servers/lighttpd/lighttpd-1.4.71.ebuild b/www-servers/lighttpd/lighttpd-1.4.71.ebuild index d8c68c6d4ed0..5aa9f6dcb73d 100644 --- a/www-servers/lighttpd/lighttpd-1.4.71.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.71.ebuild @@ -72,6 +72,10 @@ BDEPEND=" test? ( virtual/perl-Test-Harness ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" -- cgit v1.2.3