From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7232A15802E for ; Sun, 30 Jun 2024 08:31:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C77FE2AF6; Sun, 30 Jun 2024 08:31:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1586BE2AF6 for ; Sun, 30 Jun 2024 08:31:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B9E4340C20 for ; Sun, 30 Jun 2024 08:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC711D98 for ; Sun, 30 Jun 2024 08:31:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1719736233.3c0c49b302a9951deb742ad1ffaebcdd04e33ca0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/lighttpd/lighttpd-9999.ebuild www-servers/lighttpd/metadata.xml X-VCS-Directories: www-servers/lighttpd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3c0c49b302a9951deb742ad1ffaebcdd04e33ca0 X-VCS-Branch: master Date: Sun, 30 Jun 2024 08:31:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d5025b8-4b99-459c-8c40-6de5e948057a X-Archives-Hash: fdfea37449fe939906890cc18c2817c1 commit: 3c0c49b302a9951deb742ad1ffaebcdd04e33ca0 Author: Sam James gentoo org> AuthorDate: Sun Jun 30 08:30:33 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 30 08:30:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0c49b3 www-servers/lighttpd: drop crypto-* flags for now This reverts commit 3f1aad3dcf145d7d7b6a877c157db123f4de26b3 for now, pending anyone requesting the functionality. The crypto-* flags allow specifying the default implementation but users can do this via configuration or, if needed, MYMESONARGS if they want a smaller binary. Let's see what the feedback is. Signed-off-by: Sam James gentoo.org> www-servers/lighttpd/lighttpd-9999.ebuild | 34 +++---------------------------- www-servers/lighttpd/metadata.xml | 4 ---- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild index e53ed82ab8c5..95a95e50e4a8 100644 --- a/www-servers/lighttpd/lighttpd-9999.ebuild +++ b/www-servers/lighttpd/lighttpd-9999.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD GPL-2" SLOT="0" -IUSE="+brotli crypto-gnutls crypto-mbedtls crypto-nettle crypto-openssl dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" +IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -36,10 +36,6 @@ COMMON_DEPEND=" >=dev-libs/xxhash-0.8.2 virtual/libcrypt:= brotli? ( app-arch/brotli:= ) - crypto-gnutls? ( net-libs/gnutls ) - crypto-mbedtls? ( net-libs/mbedtls ) - crypto-nettle? ( dev-libs/nettle:= ) - crypto-openssl? ( >=dev-libs/openssl-0.9.7:= ) dbi? ( dev-db/libdbi ) @@ -111,32 +107,8 @@ pkg_setup() { } src_configure() { - - local c_defs - local with_nettle - - # choose crypto library - # (one specific library might be preferred on embedded systems via + # (One specific library might be preferred on embedded systems via # MYMESONARGS with e.g. -DFORCE_blah_CRYPTO) - if use crypto-nettle ; then - with_nettle=$(meson_use crypto-nettle with_nettle) - elif use nettle ; then - with_nettle=$(meson_use nettle with_nettle) - else - if use crypto-mbedtls ; then - c_defs+=-DFORCE_MBEDTLS_CRYPTO - elif use crypto-openssl ; then - c_defs+=-DFORCE_OPENSSL_CRYPTO - elif use crypto-gnutls ; then - c_defs+=-DFORCE_GNUTLS_CRYPTO - fi - fi - - local c_args - if c_defs ; then - c_args=-Dc_args=\"${c_defs[0]}\" - fi - local emesonargs=( -Dmoduledir="$(get_libdir)"/${PN} @@ -166,7 +138,7 @@ src_configure() { $(meson_feature maxminddb with_maxminddb) $(meson_use mbedtls with_mbedtls) - ${with_nettle} + $(meson_use nettle with_nettle) $(meson_use nss with_nss) # Obsolete diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml index 02655cc07024..9e9e76560d95 100644 --- a/www-servers/lighttpd/metadata.xml +++ b/www-servers/lighttpd/metadata.xml @@ -15,10 +15,6 @@ Enable output compression via app-arch/brotli (recommended) - Use net-libs/gnutls as crypto library - Use net-libs/mbedtls as crypto library - Use dev-libs/nettle as crypto library - Use dev-libs/openssl as crypto library Build module for TLS via net-libs/gnutls Enable output compression via app-arch/libdeflate Add support for geolocation using dev-libs/libmaxminddb