svn commit: r306768 - in head/www/squid32: . files
Florian Smeets
flo at FreeBSD.org
Wed Oct 31 21:55:26 UTC 2012
Author: flo
Date: Wed Oct 31 21:55:25 2012
New Revision: 306768
URL: http://svn.freebsd.org/changeset/ports/306768
Log:
- fix process detection in Squid's rc.d script [1]
- remove a leftover substitution with a hard coded value
- remove a few comments which were accidentally left in from development
- rework the code that deals with kerberos negotiate auth a bit
- bump PORTREVISION for the squid rc.d script update
PR: ports/173236 [1]
PR: ports/173248
Submitted by: Thomas-Martin Seck <tmseck at web.de> (maintainer)
Reported by: Leonid Nevecherya <nlv at imbera.ru> [1]
Feature safe: yes
Modified:
head/www/squid32/Makefile
head/www/squid32/files/squid.in
Modified: head/www/squid32/Makefile
==============================================================================
--- head/www/squid32/Makefile Wed Oct 31 21:50:25 2012 (r306767)
+++ head/www/squid32/Makefile Wed Oct 31 21:55:25 2012 (r306768)
@@ -37,6 +37,7 @@
PORTNAME= squid
PORTVERSION= 3.2.${SQUID_STABLE_VER}
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
@@ -239,7 +240,6 @@ CONFIGURE_ARGS= --with-default-user=squi
.include <bsd.port.pre.mk>
# Authentication methods and modules:
-# TODO: external-session hängt wovon ab?
basic_auth= DB MSNT MSNT-multi-domain NCSA PAM POP3 RADIUS \
fake getpwnam
@@ -283,7 +283,6 @@ basic_auth+= SASL
libexec+= basic_sasl_auth
.endif
.if ${PORT_OPTIONS:MAUTH_SMB}
-# TODO: build-depends entfernen, wird nur für den configure-check gebraucht
BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/samba36
RUN_DEPENDS+= smbclient:${PORTSDIR}/net/samba36
basic_auth+= SMB
@@ -297,25 +296,21 @@ MAN8+= ext_wbinfo_group_acl.8
basic_auth+= NIS
libexec+= basic_nis_auth
.endif
-CONFIGURE_ARGS+= --enable-auth-basic="${basic_auth}" \
- --enable-auth-digest="${digest_auth}" \
- --enable-external-acl-helpers="${external_acl}" \
- --enable-auth-ntlm="${ntlm_auth}"
-# TODO:
-# - configure-Skript auf bashisms prüfen
-# - external/kerberos_ldap_group immer mit installieren?
-# - gehört wrapper auch zu kerberos oder kann man den immer installieren?
-# - negotiate_auth-Variable einführen
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
.if ${PORT_OPTIONS:MAUTH_KERB} && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
-CONFIGURE_ARGS+= --enable-auth-negotiate="kerberos wrapper"
+negotiate_auth= kerberos wrapper
libexec+= negotiate_kerberos_auth negotiate_kerberos_auth_test \
negotiate_wrapper_auth
MAN8+= negotiate_kerberos_auth.8
.else
-CONFIGURE_ARGS+= --enable-auth-negotiate="none"
+negotiate_auth= none
.endif
+CONFIGURE_ARGS+= --enable-auth-basic="${basic_auth}" \
+ --enable-auth-digest="${digest_auth}" \
+ --enable-external-acl-helpers="${external_acl}" \
+ --enable-auth-negotiate="${negotiate_auth}" \
+ --enable-auth-ntlm="${ntlm_auth}"
# Storage schemes:
storage_schemes= diskd rock ufs
Modified: head/www/squid32/files/squid.in
==============================================================================
--- head/www/squid32/files/squid.in Wed Oct 31 21:50:25 2012 (r306767)
+++ head/www/squid32/files/squid.in Wed Oct 31 21:55:25 2012 (r306768)
@@ -24,7 +24,7 @@
# system call is not available in FreeBSD versions prior to 7.1.
#
# squid_user: The user id that should be used to run the Squid master
-# process. Default: %%SQUID_UID%%.
+# process. Default: squid.
# Note that you probably need to define "squid_user=root" if
# you want to run Squid in reverse proxy setups or if you want
# Squid to listen on a "privileged" port < 1024.
@@ -81,6 +81,7 @@ squid_pidfile=${squid_pidfile:-"/var/run
squid_user=${squid_user:-"squid"}
pidfile=${squid_pidfile}
+procname=squid-1
required_dirs=${squid_chdir}
# squid(8) will not start if ${squid_conf} is not present so try
More information about the svn-ports-all
mailing list