commit: e753fa7bb080e7ff8a0a76cd0ef8328562a48fbe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 25 05:22:01 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 25 05:22:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e753fa7b
www-servers/lighttpd: fix meson typo in src/ Closes: https://bugs.gentoo.org/905219 Signed-off-by: Sam James <sam <AT> gentoo.org> .../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 +++ 4 files changed, 41 insertions(+) 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 <s...@gentoo.org> +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"
