Date: Wed, 31 Oct 2012 21:39:22 +0100 (CET) From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173248: [Maintainer] www/squid32: fix process detection in rc.d script Message-ID: <20121031203922.182B113127C@wcfields.tmseck.homedns.org> Resent-Message-ID: <201210312040.q9VKe2FT064639@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173248
>Category: ports
>Synopsis: [Maintainer] www/squid32: fix process detection in rc.d script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 31 20:40:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 8.3-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of October 31, 2012.
>Description:
- fix process detection in Squid's rc.d script, ports/173236.
- 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
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid32) (Revision 2065)
+++ Makefile (.../local/squid32) (Revision 2065)
@@ -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 @@
.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 @@
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,22 @@
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
Index: files/squid.in
===================================================================
--- files/squid.in (.../www/squid32) (Revision 2065)
+++ files/squid.in (.../local/squid32) (Revision 2065)
@@ -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_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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121031203922.182B113127C>