cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.7.STABLE9, from Brad (maintainer)

Browse Source
This commit is contained in:
sthen 2010-06-18 10:32:17 +00:00
parent 435965d034
commit b363d9e7cc
5 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/squid/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.103 2010/05/19 07:38:06 espie Exp $ # $OpenBSD: Makefile,v 1.104 2010/06/18 10:32:17 sthen Exp $
COMMENT= WWW and FTP proxy cache and accelerator COMMENT= WWW and FTP proxy cache and accelerator
DISTNAME= squid-2.7.STABLE7 DISTNAME= squid-2.7.STABLE9
PKGNAME= ${DISTNAME}p1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/ MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/
DIST_SUBDIR= squid DIST_SUBDIR= squid

10
www/squid/distinfo
View File

@ -1,5 +1,5 @@
MD5 (squid/squid-2.7.STABLE7.tar.gz) = xQYgf5IabaGHi0CF4gLhkA== MD5 (squid/squid-2.7.STABLE9.tar.gz) = fTuLC92jrlbkONSpWpfTsw==
RMD160 (squid/squid-2.7.STABLE7.tar.gz) = wq2hqrOIJEqqIEdqWITpSzEH+/w= RMD160 (squid/squid-2.7.STABLE9.tar.gz) = WcYzSL7tmmcmEtSPnvXnyoH6mEA=
SHA1 (squid/squid-2.7.STABLE7.tar.gz) = lKOFpJT1DPM5TiJs50OuOjrVFEA= SHA1 (squid/squid-2.7.STABLE9.tar.gz) = bZD+BkaLZisu79f/60e5p48Khx0=
SHA256 (squid/squid-2.7.STABLE7.tar.gz) = K5Jq7OfUvqwDcNm3KJnTvn9Iwp6XOhMoZmk4ouTE/6Y= SHA256 (squid/squid-2.7.STABLE9.tar.gz) = 1UygSDE8S2Rgn8358ZNKcPwXAgMqXwQHMFbXSR0914E=
SIZE (squid/squid-2.7.STABLE7.tar.gz) = 1784325 SIZE (squid/squid-2.7.STABLE9.tar.gz) = 1789462

10
www/squid/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.28 2008/08/20 16:35:15 brad Exp $ $OpenBSD: patch-configure_in,v 1.29 2010/06/18 10:32:17 sthen Exp $
--- configure.in.orig Fri Aug 8 15:21:03 2008 --- configure.in.orig Tue Mar 16 20:10:12 2010
+++ configure.in Fri Aug 8 22:44:09 2008 +++ configure.in Thu Jun 17 22:13:14 2010
@@ -2293,18 +2293,6 @@ dnl during compile. @@ -2350,18 +2350,6 @@ dnl during compile.
;; ;;
esac esac
@ -20,7 +20,7 @@ $OpenBSD: patch-configure_in,v 1.28 2008/08/20 16:35:15 brad Exp $
# Recommended by Balint Nagy Endre <bne@CareNet.hu> # Recommended by Balint Nagy Endre <bne@CareNet.hu>
case "$host" in case "$host" in
*-univel-sysv4.2MP) *-univel-sysv4.2MP)
@@ -2844,12 +2832,14 @@ AC_ARG_WITH(maxfd, @@ -2906,12 +2894,14 @@ AC_ARG_WITH(maxfd,
;; ;;
esac esac
]) ])

20
www/squid/patches/patch-lib_rfc1035_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-lib_rfc1035_c,v 1.1 2010/02/03 06:41:17 jasper Exp $
Security fix for CVE-2010-0308, "Squid DNS Packet Processing
Denial of Service Vulnerability"
Patch from upstream svn, changeset 12597.
--- lib/rfc1035.c.orig Tue Feb 2 14:50:56 2010
+++ lib/rfc1035.c Tue Feb 2 14:51:24 2010
@@ -286,7 +286,9 @@ rfc1035NameUnpack(const char *buf, size_t sz, int *off
size_t len;
assert(ns > 0);
do {
- assert((*off) < sz);
+ if ((*off) >= sz) {
+ return 1;
+ }
c = *(buf + (*off));
if (c > 191) {
/* blasted compression */

14
www/squid/patches/patch-src_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $ $OpenBSD: patch-src_Makefile_in,v 1.17 2010/06/18 10:32:17 sthen Exp $
--- src/Makefile.in.orig Thu Apr 30 21:24:42 2009 --- src/Makefile.in.orig Sun Mar 14 16:27:27 2010
+++ src/Makefile.in Thu Oct 29 18:44:21 2009 +++ src/Makefile.in Thu Jun 17 22:13:15 2010
@@ -238,7 +238,7 @@ CPP = @CPP@ @@ -238,7 +238,7 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CRYPTLIB = @CRYPTLIB@ CRYPTLIB = @CRYPTLIB@
@ -19,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $
target_alias = @target_alias@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
@@ -610,8 +610,8 @@ EXTRA_DIST = \ @@ -609,8 +609,8 @@ EXTRA_DIST = \
DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
DEFAULT_ICP_PORT = @CACHE_ICP_PORT@ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
DEFAULT_PREFIX = $(prefix) DEFAULT_PREFIX = $(prefix)
@ -30,7 +30,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_LOG_PREFIX = $(localstatedir)/logs DEFAULT_LOG_PREFIX = $(localstatedir)/logs
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -885,37 +885,37 @@ distclean-compile: @@ -884,37 +884,37 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
install-dataDATA: $(data_DATA) install-dataDATA: $(data_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@ -78,7 +78,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $
done done
# This directory's subdirectories are mostly independent; you can cd # This directory's subdirectories are mostly independent; you can cd
@@ -1097,7 +1097,7 @@ check: $(BUILT_SOURCES) @@ -1096,7 +1096,7 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(PROGRAMS) $(DATA) all-am: Makefile $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
@ -87,7 +87,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.16 2009/10/30 00:56:57 sthen Exp $
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: $(BUILT_SOURCES) install: $(BUILT_SOURCES)
@@ -1244,7 +1244,7 @@ cf.data: cf.data.pre Makefile @@ -1243,7 +1243,7 @@ cf.data: cf.data.pre Makefile
sed "\ sed "\
s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\ s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\ s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\