upgrade to 2.6.STABLE4
Squid 2.6 supports kqueue and hw accelerated SSL via OpenSSL, as well as many other improvements.
This commit is contained in:
parent
848191a380
commit
78924f0824
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.80 2006/06/19 11:49:26 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.81 2006/10/03 05:00:49 brad Exp $
|
||||
|
||||
COMMENT= "WWW and FTP proxy cache and accelerator"
|
||||
|
||||
DISTNAME= squid-2.5.STABLE13
|
||||
DISTNAME= squid-2.6.STABLE4
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${HOMEPAGE}Versions/v2/2.5/
|
||||
MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/
|
||||
DIST_SUBDIR= squid
|
||||
|
||||
HOMEPAGE= http://www.squid-cache.org/
|
||||
@ -34,17 +34,18 @@ PATCH_LIST= patch-* gcc-*
|
||||
.endif
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
AUTOCONF_VERSION=2.13
|
||||
AUTOCONF_VERSION= 2.59
|
||||
CONFIGURE_STYLE= autoconf
|
||||
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux
|
||||
CONFIGURE_ARGS+=--datadir="${PREFIX}/share/squid" \
|
||||
--enable-auth="basic digest" \
|
||||
--enable-arp-acl \
|
||||
--enable-basic-auth-helpers="NCSA YP" \
|
||||
--enable-digest-auth-helpers="password" \
|
||||
--enable-external-acl-helpers="ip_user unix_group" \
|
||||
--enable-removal-policies="lru heap" \
|
||||
--enable-ssl \
|
||||
--enable-storeio="ufs diskd" \
|
||||
--enable-storeio="ufs diskd null" \
|
||||
--localstatedir="${SQUIDDIR}"
|
||||
|
||||
.if ${FLAVOR:L:Mtransparent}
|
||||
|
@ -1,4 +1,4 @@
|
||||
MD5 (squid/squid-2.5.STABLE13.tar.gz) = a9427d8c21b27b1c6fd650315f1b7d2b
|
||||
RMD160 (squid/squid-2.5.STABLE13.tar.gz) = 5b66a9ef004f3fcb1225cd0378431f7ee4d005b6
|
||||
SHA1 (squid/squid-2.5.STABLE13.tar.gz) = af1e1c3d33cf87cacadb7916f41b972a7d6df55a
|
||||
SIZE (squid/squid-2.5.STABLE13.tar.gz) = 1399833
|
||||
MD5 (squid/squid-2.6.STABLE4.tar.gz) = b29affd7dd5b57ca4fdcfdb177c4e402
|
||||
RMD160 (squid/squid-2.6.STABLE4.tar.gz) = 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89
|
||||
SHA1 (squid/squid-2.6.STABLE4.tar.gz) = 82dea18e047c8f1192dde55e51b4537863f44a2c
|
||||
SIZE (squid/squid-2.6.STABLE4.tar.gz) = 1627562
|
||||
|
@ -1,17 +1,19 @@
|
||||
$OpenBSD: gcc-patch-lib_Makefile_in,v 1.2 2004/07/11 17:05:03 brad Exp $
|
||||
--- lib/Makefile.in.orig Tue Jun 8 07:37:22 2004
|
||||
+++ lib/Makefile.in Sun Jul 11 13:00:57 2004
|
||||
@@ -324,6 +324,13 @@ distclean-depend:
|
||||
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
$(COMPILE) -c `cygpath -w $<`
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
$OpenBSD: gcc-patch-lib_Makefile_in,v 1.3 2006/10/03 05:00:49 brad Exp $
|
||||
--- lib/Makefile.in.orig Mon Jun 12 02:10:08 2006
|
||||
+++ lib/Makefile.in Wed Aug 2 23:51:50 2006
|
||||
@@ -448,6 +448,15 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
+
|
||||
+rfc1035.$(OBJEXT):
|
||||
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
+ $(COMPILE) -O0 -c `test -f $< || echo '$(srcdir)/'`$<
|
||||
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -O0 -c -o $@ $<; \
|
||||
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
+@am__fastdepCC_FALSE@ $(COMPILE) -O0 -c $<
|
||||
+
|
||||
+
|
||||
uninstall-info-am:
|
||||
|
||||
tags: TAGS
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_in,v 1.20 2006/06/19 11:49:26 bernd Exp $
|
||||
--- configure.in.orig Sat Oct 22 05:56:01 2005
|
||||
+++ configure.in Tue Oct 25 21:27:31 2005
|
||||
@@ -1735,18 +1735,6 @@ dnl during compile.
|
||||
$OpenBSD: patch-configure_in,v 1.21 2006/10/03 05:00:49 brad Exp $
|
||||
--- configure.in.orig Sat Sep 23 13:49:33 2006
|
||||
+++ configure.in Tue Sep 26 19:32:47 2006
|
||||
@@ -2205,18 +2205,6 @@ dnl during compile.
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-errors_Makefile_in,v 1.7 2005/10/29 23:26:39 brad Exp $
|
||||
--- errors/Makefile.in.orig Wed Sep 28 16:57:16 2005
|
||||
+++ errors/Makefile.in Tue Oct 25 21:27:32 2005
|
||||
@@ -121,7 +121,7 @@ am__quote = @am__quote@
|
||||
install_sh = @install_sh@
|
||||
makesnmplib = @makesnmplib@
|
||||
|
||||
$OpenBSD: patch-errors_Makefile_in,v 1.8 2006/10/03 05:00:49 brad Exp $
|
||||
--- errors/Makefile.in.orig Fri Sep 22 05:09:37 2006
|
||||
+++ errors/Makefile.in Tue Sep 26 19:32:48 2006
|
||||
@@ -228,7 +228,7 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
-errordir = $(datadir)/errors
|
||||
+errordir = $(prefix)/share/examples/squid/errors
|
||||
|
||||
DEFAULT_ERROR_DIR = $(errordir)
|
||||
|
||||
INSTALL_LANGUAGES = @ERR_LANGUAGES@
|
||||
LANGUAGES = \
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.1 2002/08/23 14:10:20 brad Exp $
|
||||
--- helpers/basic_auth/MSNT/Makefile.in.orig Fri Aug 23 09:57:08 2002
|
||||
+++ helpers/basic_auth/MSNT/Makefile.in Fri Aug 23 09:57:36 2002
|
||||
@@ -33,7 +33,7 @@ bindir = @bindir@
|
||||
$OpenBSD: patch-helpers_basic_auth_MSNT_Makefile_in,v 1.2 2006/10/03 05:00:49 brad Exp $
|
||||
--- helpers/basic_auth/MSNT/Makefile.in.orig Fri Sep 22 05:09:39 2006
|
||||
+++ helpers/basic_auth/MSNT/Makefile.in Tue Sep 26 19:32:48 2006
|
||||
@@ -262,7 +262,7 @@ prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
-sysconfdir = @sysconfdir@
|
||||
+sysconfdir = @sysconfdir@/squid
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
target_alias = @target_alias@
|
||||
msnt_auth_SOURCES = md4.c rfcnb-io.c rfcnb-util.c session.c msntauth.c \
|
||||
msntauth.h smbdes.c smbencrypt.c smblib-util.c smblib.c \
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-icons_Makefile_in,v 1.7 2005/10/29 23:26:39 brad Exp $
|
||||
--- icons/Makefile.in.orig Wed Sep 28 16:57:20 2005
|
||||
+++ icons/Makefile.in Tue Oct 25 21:27:32 2005
|
||||
@@ -149,7 +149,7 @@ ICON2 = anthony-bomb.gif \
|
||||
$OpenBSD: patch-icons_Makefile_in,v 1.8 2006/10/03 05:00:49 brad Exp $
|
||||
--- icons/Makefile.in.orig Fri Sep 22 05:09:47 2006
|
||||
+++ icons/Makefile.in Tue Sep 26 19:32:48 2006
|
||||
@@ -265,7 +265,7 @@ ICON2 = anthony-bomb.gif \
|
||||
anthony-xbm.gif \
|
||||
anthony-xpm.gif
|
||||
|
||||
|
||||
-icondir = $(datadir)/icons
|
||||
+icondir = $(prefix)/share/examples/squid/icons
|
||||
icon_DATA = $(ICON1) $(ICON2)
|
||||
|
@ -1,104 +1,93 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.10 2005/10/29 23:26:39 brad Exp $
|
||||
--- src/Makefile.in.orig Wed Sep 28 16:57:21 2005
|
||||
+++ src/Makefile.in Wed Oct 26 21:42:47 2005
|
||||
@@ -33,7 +33,7 @@ bindir = @bindir@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.11 2006/10/03 05:00:49 brad Exp $
|
||||
--- src/Makefile.in.orig Fri Sep 22 05:09:48 2006
|
||||
+++ src/Makefile.in Tue Sep 26 19:32:48 2006
|
||||
@@ -223,7 +223,7 @@ CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CRYPTLIB = @CRYPTLIB@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
-DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
||||
+DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/squid.conf\"
|
||||
DEPDIR = @DEPDIR@
|
||||
DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
|
||||
ECHO_C = @ECHO_C@
|
||||
@@ -372,7 +372,7 @@ prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
-sysconfdir = @sysconfdir@
|
||||
+sysconfdir = @sysconfdir@/squid
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
@@ -380,9 +380,9 @@ EXTRA_DIST = \
|
||||
target_alias = @target_alias@
|
||||
@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.c
|
||||
@USE_DNSSERVER_TRUE@DNSSOURCE = dns.c
|
||||
@@ -601,8 +601,8 @@ EXTRA_DIST = \
|
||||
DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
|
||||
DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
|
||||
DEFAULT_PREFIX = $(prefix)
|
||||
-DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
||||
-DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
|
||||
-DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
||||
+DEFAULT_CONFIG_FILE = $(prefix)/share/examples/squid/squid.conf
|
||||
+DEFAULT_CACHEMGR_CONFIG = $(prefix)/share/examples/squid/cachemgr.conf
|
||||
+DEFAULT_MIME_TABLE = $(prefix)/share/examples/squid/mime.conf
|
||||
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
||||
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
|
||||
@@ -397,7 +397,7 @@ DEFAULT_ICON_DIR = $(datadir)/icons
|
||||
DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
||||
DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
||||
|
||||
-DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
||||
+DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/squid.conf\"
|
||||
|
||||
|
||||
# Don't automatically uninstall config files
|
||||
@@ -451,7 +451,7 @@ am_cachemgr__CGIEXT__OBJECTS = cachemgr_
|
||||
cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
|
||||
cachemgr__CGIEXT__LDADD = $(LDADD)
|
||||
cachemgr__CGIEXT__DEPENDENCIES =
|
||||
-cachemgr__CGIEXT__LDFLAGS =
|
||||
+cachemgr__CGIEXT__LDFLAGS = -static
|
||||
am_cf_gen_OBJECTS = cf_gen.$(OBJEXT)
|
||||
cf_gen_OBJECTS = $(am_cf_gen_OBJECTS)
|
||||
cf_gen_LDADD = $(LDADD)
|
||||
@@ -860,37 +860,37 @@ CCDEPMODE = @CCDEPMODE@
|
||||
@@ -861,37 +861,37 @@ distclean-compile:
|
||||
uninstall-info-am:
|
||||
install-dataDATA: $(data_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/squid
|
||||
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
|
||||
+ test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid"
|
||||
@list='$(data_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
|
||||
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
|
||||
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
||||
f=$(am__strip_dir) \
|
||||
- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
|
||||
+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
||||
+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-dataDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(data_DATA)'; for p in $$list; do \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
|
||||
- rm -f $(DESTDIR)$(datadir)/$$f; \
|
||||
+ echo " rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
+ rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
||||
f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
+ echo " rm -f '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
||||
+ rm -f "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
done
|
||||
install-sysconfDATA: $(sysconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/squid
|
||||
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
|
||||
+ test -z "$(DESTDIR)$(prefix)/share/examples/squid" || $(mkdir_p) "$(DESTDIR)$(prefix)/share/examples/squid"
|
||||
@list='$(sysconf_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
|
||||
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
||||
f=$(am__strip_dir) \
|
||||
- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
||||
+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-sysconfDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(sysconf_DATA)'; for p in $$list; do \
|
||||
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||
- echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/$$f; \
|
||||
+ echo " rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
+ rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
|
||||
f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
+ echo " rm -f '$(DESTDIR)$(prefix)/share/examples/squid/$$f'"; \
|
||||
+ rm -f "$(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
|
||||
done
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
@@ -1024,7 +1024,7 @@ check: check-recursive
|
||||
@@ -1074,7 +1074,7 @@ check: $(BUILT_SOURCES)
|
||||
all-am: Makefile $(PROGRAMS) $(DATA)
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir) $(DESTDIR)$(sysconfdir)
|
||||
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(prefix)/share/examples/squid
|
||||
|
||||
install: install-recursive
|
||||
install-exec: install-exec-recursive
|
||||
@@ -1150,7 +1150,7 @@ cf.data: cf.data.pre Makefile
|
||||
- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
|
||||
+ for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(DESTDIR)$(prefix)/share/examples/squid"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
@@ -1212,7 +1212,7 @@ cf.data: cf.data.pre Makefile
|
||||
sed "\
|
||||
s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
|
||||
s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_cf_data_pre,v 1.19 2005/10/29 23:26:39 brad Exp $
|
||||
--- src/cf.data.pre.orig Thu Oct 20 13:28:08 2005
|
||||
+++ src/cf.data.pre Tue Oct 25 21:27:32 2005
|
||||
@@ -2482,7 +2482,7 @@ DOC_END
|
||||
$OpenBSD: patch-src_cf_data_pre,v 1.20 2006/10/03 05:00:49 brad Exp $
|
||||
--- src/cf.data.pre.orig Fri Sep 22 02:36:51 2006
|
||||
+++ src/cf.data.pre Tue Sep 26 19:30:13 2006
|
||||
@@ -3280,7 +3280,7 @@ DOC_END
|
||||
|
||||
NAME: cache_effective_user
|
||||
TYPE: string
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_cf_data_pre,v 1.19 2005/10/29 23:26:39 brad Exp $
|
||||
LOC: Config.effectiveUser
|
||||
DOC_START
|
||||
If you start Squid as root, it will change its effective/real
|
||||
@@ -2497,7 +2497,7 @@ DOC_END
|
||||
@@ -3295,7 +3295,7 @@ DOC_END
|
||||
|
||||
NAME: cache_effective_group
|
||||
TYPE: string
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_client_side_c,v 1.7 2006/06/19 11:49:26 bernd Exp $
|
||||
--- src/client_side.c.orig Fri Mar 10 17:58:35 2006
|
||||
+++ src/client_side.c Thu Apr 13 19:21:21 2006
|
||||
@@ -2832,7 +2832,7 @@ parseHttpRequest(ConnStateData * conn, m
|
||||
#elif PF_TRANSPARENT
|
||||
static time_t last_reported = 0;
|
||||
if (pffd < 0)
|
||||
- pffd = open("/dev/pf", O_RDWR);
|
||||
+ pffd = open("/dev/pf", O_RDONLY);
|
||||
if (pffd < 0) {
|
||||
if (squid_curtime - last_reported > 60) {
|
||||
debug(50, 1) ("parseHttpRequest: PF open failed: %s\n", xstrerror());
|
||||
$OpenBSD: patch-src_client_side_c,v 1.8 2006/10/03 05:00:49 brad Exp $
|
||||
--- src/client_side.c.orig Fri Sep 22 05:47:55 2006
|
||||
+++ src/client_side.c Tue Sep 26 19:30:13 2006
|
||||
@@ -4434,7 +4434,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);
|
||||
}
|
||||
|
11
www/squid/patches/patch-tools_Makefile_in
Normal file
11
www/squid/patches/patch-tools_Makefile_in
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.1 2006/10/03 05:00:49 brad Exp $
|
||||
--- tools/Makefile.in.orig Fri Sep 22 05:09:50 2006
|
||||
+++ tools/Makefile.in Tue Sep 26 19:32:49 2006
|
||||
@@ -65,6 +65,7 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO
|
||||
am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT)
|
||||
cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
|
||||
cachemgr__CGIEXT__LDADD = $(LDADD)
|
||||
+cachemgr__CGIEXT__LDFLAGS = -static
|
||||
am__DEPENDENCIES_1 =
|
||||
cachemgr__CGIEXT__DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am_cossdump_OBJECTS = cossdump.$(OBJEXT)
|
@ -1,25 +1,23 @@
|
||||
@comment $OpenBSD: PLIST,v 1.24 2006/04/13 23:46:56 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.25 2006/10/03 05:00:49 brad Exp $
|
||||
@newgroup _squid:515
|
||||
@newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin
|
||||
bin/RunAccel
|
||||
bin/RunCache
|
||||
bin/squidclient
|
||||
libexec/cachemgr.cgi
|
||||
libexec/digest_pw_auth
|
||||
libexec/diskd
|
||||
libexec/diskd-daemon
|
||||
libexec/ip_user_check
|
||||
libexec/ncsa_auth
|
||||
libexec/squid_unix_group
|
||||
libexec/unlinkd
|
||||
libexec/yp_auth
|
||||
@man man/man8/cachemgr.cgi.8
|
||||
@man man/man8/ncsa_auth.8
|
||||
@man man/man8/squid.8
|
||||
@man man/man8/squid_unix_group.8
|
||||
sbin/squid
|
||||
share/examples/squid/
|
||||
@sample ${SYSCONFDIR}/squid/
|
||||
share/examples/squid/cachemgr.conf
|
||||
@sample ${SYSCONFDIR}/squid/cachemgr.conf
|
||||
share/examples/squid/errors/
|
||||
@sample share/squid/errors/
|
||||
share/examples/squid/errors/Azerbaijani/
|
||||
|
Loading…
Reference in New Issue
Block a user