Attachment 129280 Details for Bug 173248 – file.diff

[patch] file.diff

file.diff (text/plain), 2.88 KB, created by Thomas-Martin Seck on 2012-10-31 20:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas-Martin Seck

Created: 2012-10-31 20:40:01 UTC

Size: 2.88 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 173248: 129280