bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] update squid to 2.7STABLE9, thanks to Tomasz Mon

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22420 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-07-30 22:56:47 +00:00
parent e13610f76e
commit 4bb74a232c
6 changed files with 59 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/squid/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=squid PKG_NAME:=squid
PKG_VERSION:=2.6.STABLE23 PKG_VERSION:=2.7.STABLE9
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.6/ PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.7/
PKG_MD5SUM:=71aa24580f8a538ad84037bf2ac6f078 PKG_MD5SUM:=3c6642c85470b1079207d43bba25a819
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -160,7 +160,7 @@ define Package/squid/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib/squid $(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 endef
define Package/squid-mod-cachemgr/install define Package/squid-mod-cachemgr/install

14
net/squid/patches/001-cross_compile.patch
View File

@ -1,7 +1,5 @@
Index: squid-2.6.STABLE23/src/ctype.c --- /dev/null
=================================================================== +++ b/src/ctype.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ squid-2.6.STABLE23/src/ctype.c 2009-11-11 14:01:34.000000000 +0100
@@ -0,0 +1,546 @@ @@ -0,0 +1,546 @@
+/* +/*
+ Static ctype data for IFC-7.1 / RedHat-9 workaround. + Static ctype data for IFC-7.1 / RedHat-9 workaround.
@ -549,11 +547,9 @@ Index: squid-2.6.STABLE23/src/ctype.c
+const uint32_t *__ctype32_tolower = b (uint32_t, tolower, 128); +const uint32_t *__ctype32_tolower = b (uint32_t, tolower, 128);
+const uint32_t *__ctype32_toupper = b (uint32_t, toupper, 128); +const uint32_t *__ctype32_toupper = b (uint32_t, toupper, 128);
+ +
Index: squid-2.6.STABLE23/src/Makefile.in --- a/src/Makefile.in
=================================================================== +++ b/src/Makefile.in
--- squid-2.6.STABLE23.orig/src/Makefile.in 2009-09-17 01:33:37.000000000 +0200 @@ -1234,6 +1234,9 @@ squid.conf.default: cf_parser.h
+++ squid-2.6.STABLE23/src/Makefile.in 2009-11-11 14:02:33.000000000 +0100
@@ -1191,6 +1191,9 @@
true true
cf_parser.h: cf.data cf_gen$(EXEEXT) cf_parser.h: cf.data cf_gen$(EXEEXT)

8
net/squid/patches/002-no_sslv2.patch
View File

@ -1,8 +1,6 @@
Index: squid-2.6.STABLE14/src/ssl_support.c --- a/src/ssl_support.c
=================================================================== +++ b/src/ssl_support.c
--- squid-2.6.STABLE14.orig/src/ssl_support.c 2007-07-25 16:04:15.000000000 -0500 @@ -446,10 +446,12 @@ sslCreateServerContext(const char *certf
+++ squid-2.6.STABLE14/src/ssl_support.c 2007-07-25 16:04:15.000000000 -0500
@@ -442,10 +442,12 @@
ERR_clear_error(); ERR_clear_error();
debug(83, 1) ("Initialising SSL.\n"); debug(83, 1) ("Initialising SSL.\n");
switch (version) { switch (version) {

16
net/squid/patches/003-configure.patch
View File

@ -1,8 +1,6 @@
Index: squid-2.6.STABLE23/configure --- a/configure
=================================================================== +++ b/configure
--- squid-2.6.STABLE23.orig/configure 2009-09-17 01:35:13.000000000 +0200 @@ -5059,10 +5059,6 @@ _ACEOF
+++ squid-2.6.STABLE23/configure 2009-11-11 14:19:11.000000000 +0100
@@ -5053,10 +5053,6 @@
if test -z "$SSLLIB"; then if test -z "$SSLLIB"; then
SSLLIB="-lcrypto" # for MD5 routines SSLLIB="-lcrypto" # for MD5 routines
fi fi
@ -13,7 +11,7 @@ Index: squid-2.6.STABLE23/configure
CPPFLAGS="${SSLFLAGS} $CPPFLAGS" CPPFLAGS="${SSLFLAGS} $CPPFLAGS"
fi fi
@@ -26292,7 +26288,7 @@ @@ -27318,7 +27314,7 @@ else
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling $as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;} See \`config.log' for more details." >&2;}
@ -22,7 +20,7 @@ Index: squid-2.6.STABLE23/configure
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@@ -26455,8 +26451,7 @@ @@ -27481,8 +27477,7 @@ else
{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling $as_echo "$as_me: error: cannot run test program while cross compiling
@ -32,7 +30,7 @@ Index: squid-2.6.STABLE23/configure
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@@ -26707,7 +26702,7 @@ @@ -27733,7 +27728,7 @@ else
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling $as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;} See \`config.log' for more details." >&2;}
@ -41,7 +39,7 @@ Index: squid-2.6.STABLE23/configure
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
@@ -26789,7 +26784,7 @@ @@ -27815,7 +27810,7 @@ else
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run test program while cross compiling $as_echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;} See \`config.log' for more details." >&2;}

8
net/squid/patches/004-include-autoconf.patch
View File

@ -1,8 +1,6 @@
Index: squid-2.6.STABLE14/include/autoconf.h.in --- a/include/autoconf.h.in
=================================================================== +++ b/include/autoconf.h.in
--- squid-2.6.STABLE14.orig/include/autoconf.h.in 2007-07-25 16:04:15.000000000 -0500 @@ -313,10 +313,10 @@
+++ squid-2.6.STABLE14/include/autoconf.h.in 2007-07-25 16:04:16.000000000 -0500
@@ -319,10 +319,10 @@
#undef HAVE_OPENSSL_ERR_H #undef HAVE_OPENSSL_ERR_H
/* Define to 1 if you have the <openssl/md5.h> header file. */ /* Define to 1 if you have the <openssl/md5.h> header file. */

67
net/squid/patches/005-lib-makefile.patch
View File

@ -1,38 +1,37 @@
Index: squid-2.6.STABLE23/lib/Makefile.in --- a/lib/Makefile.in
=================================================================== +++ b/lib/Makefile.in
--- squid-2.6.STABLE23.orig/lib/Makefile.in 2009-09-17 01:33:17.000000000 +0200 @@ -60,8 +60,10 @@ am__libmiscutil_a_SOURCES_DIST = Array.c
+++ squid-2.6.STABLE23/lib/Makefile.in 2009-11-11 14:16:09.000000000 +0100 rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \
@@ -61,7 +61,9 @@
splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \ splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \
win32lib.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_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_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT)
@NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT) @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_3 = win32lib.$(OBJEXT)
@ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT)
am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \ am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
@@ -72,7 +74,19 @@ getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
$(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \ @@ -71,7 +73,19 @@ am_libmiscutil_a_OBJECTS = Array.$(OBJEX
$(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \ $(am__objects_1) splay.$(OBJEXT) Stack.$(OBJEXT) \
uudecode.$(OBJEXT) $(am__objects_4) $(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
uudecode.$(OBJEXT) $(am__objects_3)
+am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \ +am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \
+ base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \ + base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \
+ hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \ + hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \
+ html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \ + html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \
+ $(am__host_objects_1) radix.$(HOST_OBJEXT) \ + $(am__host_objects_1) radix.$(HOST_OBJEXT) \
+ rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \ + rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \
+ rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \ + rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \
+ safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \ + safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \
+ splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \ + splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \
+ stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \ + stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \
+ uudecode.$(HOST_OBJEXT) + uudecode.$(HOST_OBJEXT)
libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
+libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS) +libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS)
libntlmauth_a_AR = $(AR) $(ARFLAGS) libntlmauth_a_AR = $(AR) $(ARFLAGS)
libntlmauth_a_DEPENDENCIES = @LIBOBJS@ libntlmauth_a_DEPENDENCIES = @LIBOBJS@
am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT) am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT)
@@ -90,15 +104,19 @@ @@ -89,15 +103,19 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -54,7 +53,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -106,6 +124,7 @@ @@ -105,6 +123,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@ ALLOCA = @ALLOCA@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AR = @AR@ AR = @AR@
@ -62,7 +61,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
AR_R = @AR_R@ AR_R = @AR_R@
AUTH_LIBS = @AUTH_LIBS@ AUTH_LIBS = @AUTH_LIBS@
AUTH_MODULES = @AUTH_MODULES@ 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_HTTP_PORT = @CACHE_HTTP_PORT@
CACHE_ICP_PORT = @CACHE_ICP_PORT@ CACHE_ICP_PORT = @CACHE_ICP_PORT@
CC = @CC@ CC = @CC@
@ -70,8 +69,8 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CGIEXT = @CGIEXT@ CGIEXT = @CGIEXT@
@@ -165,6 +185,8 @@ @@ -164,6 +184,8 @@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH
NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ NIS_LIBS = @NIS_LIBS@
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
+HOST_OBJEXT = @OBJEXT@.$(shell uname -m) +HOST_OBJEXT = @OBJEXT@.$(shell uname -m)
@ -79,7 +78,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -264,6 +286,7 @@ @@ -261,6 +283,7 @@ EXTRA_LIBRARIES = \
noinst_LIBRARIES = \ noinst_LIBRARIES = \
@LIBDLMALLOC@ \ @LIBDLMALLOC@ \
libmiscutil.a \ libmiscutil.a \
@ -87,7 +86,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
libntlmauth.a \ libntlmauth.a \
@LIBREGEX@ \ @LIBREGEX@ \
$(LIBSSPWIN32) $(LIBSSPWIN32)
@@ -298,9 +321,34 @@ @@ -300,9 +323,34 @@ libmiscutil_a_SOURCES = \
uudecode.c \ uudecode.c \
$(WIN32SRC) $(WIN32SRC)
@ -122,7 +121,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
# $(top_srcdir)/include/version.h should be a dependency # $(top_srcdir)/include/version.h should be a dependency
libregex_a_SOURCES = \ libregex_a_SOURCES = \
GNUregex.c GNUregex.c
@@ -321,7 +369,7 @@ @@ -323,7 +371,7 @@ INCLUDES = -I$(top_builddir)/include -I$
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -131,7 +130,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
@@ -358,10 +406,13 @@ @@ -360,10 +408,13 @@ libdlmalloc.a: $(libdlmalloc_a_OBJECTS)
-rm -f libdlmalloc.a -rm -f libdlmalloc.a
$(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD) $(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD)
$(RANLIB) libdlmalloc.a $(RANLIB) libdlmalloc.a
@ -146,7 +145,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES) libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES)
-rm -f libntlmauth.a -rm -f libntlmauth.a
$(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD) $(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)/util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32lib.Po@am__quote@
@ -168,7 +167,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -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@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $< @am__fastdepCC_FALSE@ $(COMPILE) -c $<