| 1 |
commit: b0b1b66a70addea502d60a9b6d6a86c075cb16f2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 03:11:05 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 03:11:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b1b66a |
| 7 |
|
| 8 |
net-proxy/squid: fix disabling NTLM |
| 9 |
|
| 10 |
While at it, tidy up some whitespace. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/873427 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
net-proxy/squid/squid-5.7.ebuild | 27 ++++++++++++++++----------- |
| 16 |
1 file changed, 16 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-proxy/squid/squid-5.7.ebuild b/net-proxy/squid/squid-5.7.ebuild |
| 19 |
index f3ad18c4f62d..693209d20296 100644 |
| 20 |
--- a/net-proxy/squid/squid-5.7.ebuild |
| 21 |
+++ b/net-proxy/squid/squid-5.7.ebuild |
| 22 |
@@ -205,6 +205,8 @@ src_configure() { |
| 23 |
myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 ) |
| 24 |
|
| 25 |
if use kerberos; then |
| 26 |
+ # We intentionally overwrite negotiate_modules here to lose |
| 27 |
+ # the 'none'. |
| 28 |
negotiate_modules=( kerberos wrapper ) |
| 29 |
|
| 30 |
if has_version app-crypt/heimdal; then |
| 31 |
@@ -221,10 +223,13 @@ src_configure() { |
| 32 |
fi |
| 33 |
|
| 34 |
# NTLM modules |
| 35 |
- local ntlm_modules=( |
| 36 |
- none |
| 37 |
- $(usev samba 'SMB_LM') |
| 38 |
- ) |
| 39 |
+ local ntlm_modules=( none ) |
| 40 |
+ |
| 41 |
+ if use samba ; then |
| 42 |
+ # We intentionally overwrite modules here to lose |
| 43 |
+ # the 'none'. |
| 44 |
+ ntlm_modules=( $(usev samba 'SMB_LM') ) |
| 45 |
+ fi |
| 46 |
|
| 47 |
# External helpers |
| 48 |
local ext_helpers=( |
| 49 |
@@ -240,7 +245,7 @@ src_configure() { |
| 50 |
|
| 51 |
use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group ) |
| 52 |
if use mysql || use postgres || use sqlite; then |
| 53 |
- ext_helpers+=( SQL_session ) |
| 54 |
+ ext_helpers+=( SQL_session ) |
| 55 |
fi |
| 56 |
|
| 57 |
# Storage modules |
| 58 |
@@ -282,12 +287,12 @@ src_configure() { |
| 59 |
} |
| 60 |
|
| 61 |
myeconfargs+=( |
| 62 |
- --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}" ) |
| 63 |
- --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}" ) |
| 64 |
- --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}" ) |
| 65 |
- --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}" ) |
| 66 |
- --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}" ) |
| 67 |
- --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}" ) |
| 68 |
+ --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}") |
| 69 |
+ --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}") |
| 70 |
+ --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}") |
| 71 |
+ --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}") |
| 72 |
+ --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}") |
| 73 |
+ --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}") |
| 74 |
) |
| 75 |
|
| 76 |
econf "${myeconfargs[@]}" |
Archives