diff options
| author | krion <krion@FreeBSD.org> | 2004-06-10 23:40:44 +0800 |
|---|---|---|
| committer | krion <krion@FreeBSD.org> | 2004-06-10 23:40:44 +0800 |
| commit | 42bad3fe54c824e861223ef1efa16fee85bd1e94 (patch) | |
| tree | fd4840126f5ccc25b7217724ea8a978eb4d89216 /www/squid30/files | |
| parent | 52cacacfecf16f635e4a07d5ad01a1410ec152f2 (diff) | |
| download | freebsd-ports-gnome-42bad3fe54c824e861223ef1efa16fee85bd1e94.tar.gz freebsd-ports-gnome-42bad3fe54c824e861223ef1efa16fee85bd1e94.tar.zst freebsd-ports-gnome-42bad3fe54c824e861223ef1efa16fee85bd1e94.zip | |
- Support systems where pf(4) must be installed from ports (see
ports/67724, submitted by Michal F. Hanula)
- Change ": foo=${foo:=bar}" into "foo=${foo:-bar}" to make the
shell scripts easier to read and understand
- Correct credits for the recently published NTLM auth
vulnerability and fix a nearby braino, too
- Bump PORTREVISION
PR: ports/67797
Submitted by: maintainer
Diffstat (limited to 'www/squid30/files')
| -rw-r--r-- | www/squid30/files/patch-helpers-ntlm_auth-SMB-libntlmssp.c | 4 | ||||
| -rw-r--r-- | www/squid30/files/pf_from_ports.patch.in | 20 | ||||
| -rw-r--r-- | www/squid30/files/squid.sh | 6 |
3 files changed, 25 insertions, 5 deletions
diff --git a/www/squid30/files/patch-helpers-ntlm_auth-SMB-libntlmssp.c b/www/squid30/files/patch-helpers-ntlm_auth-SMB-libntlmssp.c index c837e41da5d3..8b91e979a9d2 100644 --- a/www/squid30/files/patch-helpers-ntlm_auth-SMB-libntlmssp.c +++ b/www/squid30/files/patch-helpers-ntlm_auth-SMB-libntlmssp.c @@ -1,11 +1,11 @@ This patch fixes a buffer overflow vulnerability in the NTLM auth -helper which was reported by Stefan Esser on the 07th June 2004. +helper which was reported by iDefense on the 07th June 2004. Original advisory: <http://www.idefense.com/application/poi/display?id=107&type=vulnerabilities&flashstatus=false> CVE-ID: CAN-2004-0541 Patch obtained from: <http://www.squid-cache.org/~wessels/patch/libntlmssp.c.patch> -The patch was slightly modified by the me (tmseck@netcologne.de) to make +The patch was slightly modified by me (tmseck@netcologne.de) to make it apply cleanly to the FreeBSD port. Index: libntlmssp.c diff --git a/www/squid30/files/pf_from_ports.patch.in b/www/squid30/files/pf_from_ports.patch.in new file mode 100644 index 000000000000..dd0617e41500 --- /dev/null +++ b/www/squid30/files/pf_from_ports.patch.in @@ -0,0 +1,20 @@ +--- configure.orig Thu Jun 10 12:22:06 2004 ++++ configure Thu Jun 10 13:31:53 2004 +@@ -3781,7 +3781,7 @@ + memory.h \ + mount.h \ + net/if.h \ +- net/pfvar.h \ ++ %%PF_INCLUDEDIR%%/net/pfvar.h \ + netdb.h \ + netinet/if_ether.h \ + netinet/in.h \ +@@ -7604,7 +7604,7 @@ + echo $ac_n "checking if PF header file is installed""... $ac_c" 1>&6 + echo "configure:7606: checking if PF header file is installed" >&5 + # hold on to your hats... +- if test "$ac_cv_header_net_pfvar_h" = "yes"; then ++ if test "$ac_cv_header_%%PF_AC_INCLUDEPATH%%_net_pfvar_h" = "yes"; then + PF_TRANSPARENT="yes" + cat >> confdefs.h <<\EOF + #define PF_TRANSPARENT 1 diff --git a/www/squid30/files/squid.sh b/www/squid30/files/squid.sh index 73fb0504db7a..4102d27fbc11 100644 --- a/www/squid30/files/squid.sh +++ b/www/squid30/files/squid.sh @@ -20,9 +20,9 @@ command=%%PREFIX%%/sbin/squid extra_commands=reload reload_cmd="${command} -k reconfigure" stop_cmd="${command} -k shutdown" -: ${squid_chdir:=%%PREFIX%%/squid/logs} -: ${squid_user:=%%SQUID_UID%%} -: ${squid_flags:="-D"} +squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs} +squid_user=${squid_user:-%%SQUID_UID%%} +squid_flags=${squid_flags:-"-D"} default_config=%%PREFIX%%/etc/squid/squid.conf if [ -f /etc/rc.subr ]; then |