upgrade to Squid 2.3.STABLE4

This commit is contained in:
brad 2000-07-20 01:17:09 +00:00
parent 3c070e1df8
commit 55da5bf055
5 changed files with 9 additions and 82 deletions

View File

@ -1,18 +1,13 @@
# $OpenBSD: Makefile,v 1.18 2000/06/28 07:08:28 brad Exp $
# $OpenBSD: Makefile,v 1.19 2000/07/20 01:17:09 brad Exp $
DISTNAME= squid-2.3.STABLE3
DISTNAME= squid-2.3.STABLE4
PKGNAME= squid-2.3
CATEGORIES= www
NEED_VERSION= 1.301
NEED_VERSION= 1.310
MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.3/
MASTER_SITES0= http://www.squid-cache.org/Versions/v2/2.3/bugs/
EXTRACT_SUFX= -src.tar.gz
DIST_SUBDIR= squid
PATCHFILES= squid-2.3.stable3-carp_compile.patch:0 \
squid-2.3.stable3-storeExpiredReferenceAge.patch:0 \
squid-2.3.stable3-zero-content-length.patch:0
HOMEPAGE= http://www.squid-cache.org/
MAINTAINER= brad@openbsd.org

View File

@ -1,12 +1,3 @@
MD5 (squid/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7
MD5 (squid/squid-2.3.stable3-carp_compile.patch) = 6bc79fd59484d7b4acc55d268a6e5081
MD5 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788
MD5 (squid/squid-2.3.stable3-zero-content-length.patch) = 8e885f8ae0c3c2fefda682133f26cc06
RMD160 (squid/squid-2.3.STABLE3-src.tar.gz) = f5a27b3d69a363afbf7bee8b725cec5053b21443
RMD160 (squid/squid-2.3.stable3-carp_compile.patch) = 55efcce592bda061a14f57eab75d5c1d7a3e5a5e
RMD160 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = 350a234ca5fa3fd55d8f109a7b33e842fc8f3347
RMD160 (squid/squid-2.3.stable3-zero-content-length.patch) = b43f966c254444a99ff5f8e0f22e54ac40fe0ebf
SHA1 (squid/squid-2.3.STABLE3-src.tar.gz) = 1a043657be3adbd41b93e341a53f02685834e046
SHA1 (squid/squid-2.3.stable3-carp_compile.patch) = 2e463e0c904548f59b20cf15e4b059b7e7a1d858
SHA1 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = 40098a26c3723a9df6357ad46b2ec6e65d40508c
SHA1 (squid/squid-2.3.stable3-zero-content-length.patch) = b704bf7dda98e46d15e6d54ed20171ba69ad69e8
MD5 (squid/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
RMD160 (squid/squid-2.3.STABLE4-src.tar.gz) = 0719f8e916b7f4cd011abcd17faf3ec68339c9b2
SHA1 (squid/squid-2.3.STABLE4-src.tar.gz) = 69fba1c0c14ff7b40837ab6357eed706ad55b3ae

View File

@ -1,27 +1,6 @@
--- configure.orig Fri Apr 28 16:17:12 2000
+++ configure Sun Jul 9 19:32:00 2000
@@ -673,12 +673,6 @@
REGEXLIB='' # -lregex
LIBREGEX='' # libregex.a
-if test "$libexecdir" = '${exec_prefix}/libexec'; then
- libexecdir='${bindir}'
- localstatedir='${prefix}'
-
-fi
-
case "$host_os" in
cygwin32|os2)
exec_suffix=".exe"
@@ -2301,6 +2295,7 @@
netinet/tcp.h \
netinet/ip_compat.h \
netinet/ip_fil.h \
+ netinet/ip_fil_compat.h \
netinet/ip_nat.h \
poll.h \
pwd.h \
@@ -4064,18 +4059,6 @@
--- configure.orig Wed Jul 19 20:38:22 2000
+++ configure Wed Jul 19 20:41:03 2000
@@ -4191,18 +4191,6 @@
;;
esac
@ -40,18 +19,3 @@
# Recommended by Balint Nagy Endre <bne@CareNet.hu>
case "$host" in
*-univel-sysv4.2MP)
@@ -4338,6 +4321,14 @@
EOF
elif test "$ac_cv_header_netinet_ip_compat_h" = "yes" &&
+ test "$ac_cv_header_netinet_ip_fil_h" = "yes" &&
+ test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then
+ IPF_TRANSPARENT="yes"
+ cat >> confdefs.h <<\EOF
+#define IPF_TRANSPARENT 1
+EOF
+
+ elif test "$ac_cv_header_netinet_ip_fil_compat_h" = "yes" &&
test "$ac_cv_header_netinet_ip_fil_h" = "yes" &&
test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then
IPF_TRANSPARENT="yes"

View File

@ -1,12 +0,0 @@
--- include/autoconf.h.in.orig Wed Feb 23 01:19:06 2000
+++ include/autoconf.h.in Sun Jul 9 19:36:00 2000
@@ -502,6 +502,9 @@
/* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
+/* Define if you have the <netinet/ip_fil_compat.h> header file. */
+#undef HAVE_NETINET_IP_FIL_COMPAT_H
+
/* Define if you have the <netinet/ip_compat.h> header file. */
#undef HAVE_NETINET_IP_COMPAT_H

View File

@ -1,11 +0,0 @@
--- src/client_side.c.orig Sun Jul 9 19:29:45 2000
+++ src/client_side.c Sun Jul 9 19:30:25 2000
@@ -43,6 +43,8 @@
#include <net/if.h>
#if HAVE_IP_COMPAT_H
#include <ip_compat.h>
+#elif HAVE_NETINET_IP_FIL_COMPAT_H
+#include <netinet/ip_fil_compat.h>
#elif HAVE_NETINET_IP_COMPAT_H
#include <netinet/ip_compat.h>
#endif