#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=squid
-PKG_VERSION:=2.6.STABLE23
+PKG_VERSION:=2.7.STABLE9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.6/
-PKG_MD5SUM:=71aa24580f8a538ad84037bf2ac6f078
+PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.7/
+PKG_MD5SUM:=3c6642c85470b1079207d43bba25a819
include $(INCLUDE_DIR)/package.mk
endef
define Package/squid/description
- Squid is a high-performance proxy caching server for web clients,
- supporting FTP, gopher, and HTTP data objects. Unlike traditional
- caching software, Squid handles all requests in a single,
+ Squid is a high-performance proxy caching server for web clients,
+ supporting FTP, gopher, and HTTP data objects. Unlike traditional
+ caching software, Squid handles all requests in a single,
non-blocking, I/O-driven process.
endef
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib/squid
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger} $(1)/usr/lib/squid/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger,logfile-daemon} $(1)/usr/lib/squid/
endef
define Package/squid-mod-cachemgr/install
-Index: squid-2.6.STABLE23/configure
-===================================================================
---- squid-2.6.STABLE23.orig/configure 2009-09-17 01:35:13.000000000 +0200
-+++ squid-2.6.STABLE23/configure 2009-11-11 14:19:11.000000000 +0100
-@@ -5053,10 +5053,6 @@
+--- a/configure
++++ b/configure
+@@ -5059,10 +5059,6 @@ _ACEOF
if test -z "$SSLLIB"; then
SSLLIB="-lcrypto" # for MD5 routines
fi
CPPFLAGS="${SSLFLAGS} $CPPFLAGS"
fi
-@@ -26292,7 +26288,7 @@
+@@ -27318,7 +27314,7 @@ else
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26455,8 +26451,7 @@
+@@ -27481,8 +27477,7 @@ else
{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26707,7 +26702,7 @@
+@@ -27733,7 +27728,7 @@ else
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26789,7 +26784,7 @@
+@@ -27815,7 +27810,7 @@ else
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
-Index: squid-2.6.STABLE23/lib/Makefile.in
-===================================================================
---- squid-2.6.STABLE23.orig/lib/Makefile.in 2009-09-17 01:33:17.000000000 +0200
-+++ squid-2.6.STABLE23/lib/Makefile.in 2009-11-11 14:16:09.000000000 +0100
-@@ -61,7 +61,9 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -60,8 +60,10 @@ am__libmiscutil_a_SOURCES_DIST = Array.c
+ rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \
splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \
win32lib.c
- @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT)
+@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT)
- @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT)
+ @NEED_OWN_SNPRINTF_TRUE@am__objects_1 = snprintf.$(OBJEXT)
+ @NEED_OWN_STRSEP_TRUE@am__objects_2 = strsep.$(OBJEXT)
+@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT)
- @NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT)
- @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT)
+ @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_3 = win32lib.$(OBJEXT)
am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
-@@ -72,7 +74,19 @@
- $(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \
- $(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
- uudecode.$(OBJEXT) $(am__objects_4)
+ getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
+@@ -71,7 +73,19 @@ am_libmiscutil_a_OBJECTS = Array.$(OBJEX
+ $(am__objects_1) splay.$(OBJEXT) Stack.$(OBJEXT) \
+ $(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
+ uudecode.$(OBJEXT) $(am__objects_3)
+am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \
-+ base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \
-+ hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \
-+ html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \
-+ $(am__host_objects_1) radix.$(HOST_OBJEXT) \
-+ rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \
-+ rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \
-+ safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \
-+ splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \
-+ stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \
-+ uudecode.$(HOST_OBJEXT)
++ base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \
++ hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \
++ html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \
++ $(am__host_objects_1) radix.$(HOST_OBJEXT) \
++ rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \
++ rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \
++ safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \
++ splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \
++ stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \
++ uudecode.$(HOST_OBJEXT)
libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
+libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS)
libntlmauth_a_AR = $(AR) $(ARFLAGS)
libntlmauth_a_DEPENDENCIES = @LIBOBJS@
am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT)
-@@ -90,15 +104,19 @@
+@@ -89,15 +103,19 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -106,6 +124,7 @@
+@@ -105,6 +123,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AR_R = @AR_R@
AUTH_LIBS = @AUTH_LIBS@
AUTH_MODULES = @AUTH_MODULES@
-@@ -118,6 +137,7 @@
+@@ -117,6 +136,7 @@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS
CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
CACHE_ICP_PORT = @CACHE_ICP_PORT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CGIEXT = @CGIEXT@
-@@ -165,6 +185,8 @@
- NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
+@@ -164,6 +184,8 @@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH
+ NIS_LIBS = @NIS_LIBS@
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
OBJEXT = @OBJEXT@
+HOST_OBJEXT = @OBJEXT@.$(shell uname -m)
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -264,6 +286,7 @@
+@@ -261,6 +283,7 @@ EXTRA_LIBRARIES = \
noinst_LIBRARIES = \
@LIBDLMALLOC@ \
libmiscutil.a \
libntlmauth.a \
@LIBREGEX@ \
$(LIBSSPWIN32)
-@@ -298,9 +321,34 @@
+@@ -300,9 +323,34 @@ libmiscutil_a_SOURCES = \
uudecode.c \
$(WIN32SRC)
# $(top_srcdir)/include/version.h should be a dependency
libregex_a_SOURCES = \
GNUregex.c
-@@ -321,7 +369,7 @@
+@@ -323,7 +371,7 @@ INCLUDES = -I$(top_builddir)/include -I$
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
-@@ -358,10 +406,13 @@
+@@ -360,10 +408,13 @@ libdlmalloc.a: $(libdlmalloc_a_OBJECTS)
-rm -f libdlmalloc.a
$(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD)
$(RANLIB) libdlmalloc.a
libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES)
-rm -f libntlmauth.a
$(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD)
-@@ -412,6 +463,21 @@
+@@ -417,6 +468,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32lib.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -420,6 +486,9 @@
+@@ -425,6 +491,9 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<