From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1440818-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 88D58158095
for <garchives@archives.gentoo.org>; Fri, 30 Sep 2022 03:11:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B3A122BC053;
Fri, 30 Sep 2022 03:11:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9B4C32BC053
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 03:11:40 +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 CFFED341384
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 03:11:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4777E5F6
for <gentoo-commits@lists.gentoo.org>; Fri, 30 Sep 2022 03:11:38 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1664507478.b0b1b66a70addea502d60a9b6d6a86c075cb16f2.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-proxy/squid/squid-5.7.ebuild
X-VCS-Directories: net-proxy/squid/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: b0b1b66a70addea502d60a9b6d6a86c075cb16f2
X-VCS-Branch: master
Date: Fri, 30 Sep 2022 03:11:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 22f2a1b2-9af8-4b08-b363-3da2b18b09a5
X-Archives-Hash: bc04f3f9bd35e866531d9036b0da9e58
commit: b0b1b66a70addea502d60a9b6d6a86c075cb16f2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 03:11:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 03:11:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b1b66a
net-proxy/squid: fix disabling NTLM
While at it, tidy up some whitespace.
Closes: https://bugs.gentoo.org/873427
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/squid/squid-5.7.ebuild | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/net-proxy/squid/squid-5.7.ebuild b/net-proxy/squid/squid-5.7.ebuild
index f3ad18c4f62d..693209d20296 100644
--- a/net-proxy/squid/squid-5.7.ebuild
+++ b/net-proxy/squid/squid-5.7.ebuild
@@ -205,6 +205,8 @@ src_configure() {
myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
if use kerberos; then
+ # We intentionally overwrite negotiate_modules here to lose
+ # the 'none'.
negotiate_modules=( kerberos wrapper )
if has_version app-crypt/heimdal; then
@@ -221,10 +223,13 @@ src_configure() {
fi
# NTLM modules
- local ntlm_modules=(
- none
- $(usev samba 'SMB_LM')
- )
+ local ntlm_modules=( none )
+
+ if use samba ; then
+ # We intentionally overwrite modules here to lose
+ # the 'none'.
+ ntlm_modules=( $(usev samba 'SMB_LM') )
+ fi
# External helpers
local ext_helpers=(
@@ -240,7 +245,7 @@ src_configure() {
use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
if use mysql || use postgres || use sqlite; then
- ext_helpers+=( SQL_session )
+ ext_helpers+=( SQL_session )
fi
# Storage modules
@@ -282,12 +287,12 @@ src_configure() {
}
myeconfargs+=(
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}" )
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}" )
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}" )
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}" )
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}" )
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}" )
+ --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
+ --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
+ --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
+ --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
+ --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
+ --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
)
econf "${myeconfargs[@]}"