Upgrade Squid to 2.7-STABLE4

ok ajacoutot@
This commit is contained in:
brad 2008-08-20 16:35:15 +00:00
parent 95138aec18
commit 464f38be0c
5 changed files with 17 additions and 29 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.95 2008/07/16 21:18:27 brad Exp $
# $OpenBSD: Makefile,v 1.96 2008/08/20 16:35:15 brad Exp $
COMMENT= WWW and FTP proxy cache and accelerator
DISTNAME= squid-2.7.STABLE3
DISTNAME= squid-2.7.STABLE4
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}Versions/v2/2.7/
DIST_SUBDIR= squid

View File

@ -1,5 +1,5 @@
MD5 (squid/squid-2.7.STABLE3.tar.gz) = pNdghpbitheqWFPH0j4lsA==
RMD160 (squid/squid-2.7.STABLE3.tar.gz) = gEEM4n86vQYB4Qq11pCZ2fPKryg=
SHA1 (squid/squid-2.7.STABLE3.tar.gz) = DJkFTV/WU32kZ6y/KZ/+XxpUKuM=
SHA256 (squid/squid-2.7.STABLE3.tar.gz) = 2YdXjGyibKjI1vrZIFgMw5tuvpXI/3J7G208ViX+Qo0=
SIZE (squid/squid-2.7.STABLE3.tar.gz) = 1782040
MD5 (squid/squid-2.7.STABLE4.tar.gz) = 4atVPw53XCpJBhL6rfgF1A==
RMD160 (squid/squid-2.7.STABLE4.tar.gz) = 3Nds95iiBf+ixAPqrfodr9Jjrjs=
SHA1 (squid/squid-2.7.STABLE4.tar.gz) = eaS0GpZZhc/VtQ/JCkN8WRnUtO0=
SHA256 (squid/squid-2.7.STABLE4.tar.gz) = 5NZ53LfqVqddV+iOZMTNZU3bROH86pKvT/AvrUzskVo=
SIZE (squid/squid-2.7.STABLE4.tar.gz) = 1783318

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.27 2008/07/16 21:18:27 brad Exp $
--- configure.in.orig Wed Jun 25 18:18:55 2008
+++ configure.in Sun Jun 29 03:10:24 2008
@@ -2286,18 +2286,6 @@ dnl during compile.
$OpenBSD: patch-configure_in,v 1.28 2008/08/20 16:35:15 brad Exp $
--- configure.in.orig Fri Aug 8 15:21:03 2008
+++ configure.in Fri Aug 8 22:44:09 2008
@@ -2293,18 +2293,6 @@ dnl during compile.
;;
esac
@ -20,7 +20,7 @@ $OpenBSD: patch-configure_in,v 1.27 2008/07/16 21:18:27 brad Exp $
# Recommended by Balint Nagy Endre <bne@CareNet.hu>
case "$host" in
*-univel-sysv4.2MP)
@@ -2836,12 +2824,14 @@ AC_ARG_WITH(maxfd,
@@ -2844,12 +2832,14 @@ AC_ARG_WITH(maxfd,
;;
esac
])

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cf_data_pre,v 1.28 2008/07/16 21:18:28 brad Exp $
--- src/cf.data.pre.orig Tue Jun 24 18:54:18 2008
+++ src/cf.data.pre Sun Jun 29 03:10:15 2008
@@ -3753,7 +3753,7 @@ DOC_END
$OpenBSD: patch-src_cf_data_pre,v 1.29 2008/08/20 16:35:15 brad Exp $
--- src/cf.data.pre.orig Thu Jul 10 05:47:28 2008
+++ src/cf.data.pre Fri Aug 8 22:44:01 2008
@@ -3755,7 +3755,7 @@ DOC_END
NAME: cache_effective_user
TYPE: string
@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.28 2008/07/16 21:18:28 brad Exp $
LOC: Config.effectiveUser
DOC_START
If you start Squid as root, it will change its effective/real
@@ -3767,7 +3767,7 @@ DOC_END
@@ -3769,7 +3769,7 @@ DOC_END
NAME: cache_effective_group
TYPE: string

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_client_side_c,v 1.15 2008/07/16 21:18:28 brad Exp $
--- src/client_side.c.orig Tue Jun 24 18:54:47 2008
+++ src/client_side.c Sun Jun 29 03:10:15 2008
@@ -4519,7 +4519,7 @@ clientNatLookup(ConnStateData * conn)
static int pffd = -1;
static time_t last_reported = 0;
if (pffd < 0) {
- pffd = open("/dev/pf", O_RDWR);
+ pffd = open("/dev/pf", O_RDONLY);
if (pffd >= 0)
commSetCloseOnExec(pffd);
}