Changeset 22420


Ignore:
Timestamp:
2010-07-31T00:56:47+02:00 (8 years ago)
Author:
florian
Message:

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

Location:
packages/net/squid
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • packages/net/squid/Makefile

    r18516 r22420  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=squid 
    11 PKG_VERSION:=2.6.STABLE23 
     11PKG_VERSION:=2.7.STABLE9 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    15 PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.6/ 
    16 PKG_MD5SUM:=71aa24580f8a538ad84037bf2ac6f078 
     15PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.7/ 
     16PKG_MD5SUM:=3c6642c85470b1079207d43bba25a819 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
     
    3232 
    3333define Package/squid/description 
    34         Squid is a high-performance proxy caching server for web clients,  
    35         supporting FTP, gopher, and HTTP data objects. Unlike traditional  
    36         caching software, Squid handles all requests in a single,  
     34        Squid is a high-performance proxy caching server for web clients, 
     35        supporting FTP, gopher, and HTTP data objects. Unlike traditional 
     36        caching software, Squid handles all requests in a single, 
    3737        non-blocking, I/O-driven process. 
    3838endef 
     
    161161        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/ 
    162162        $(INSTALL_DIR) $(1)/usr/lib/squid 
    163         $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger} $(1)/usr/lib/squid/ 
     163        $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger,logfile-daemon} $(1)/usr/lib/squid/ 
    164164endef 
    165165 
  • packages/net/squid/patches/001-cross_compile.patch

    r18373 r22420  
    1 Index: squid-2.6.STABLE23/src/ctype.c 
    2 =================================================================== 
    3 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4 +++ squid-2.6.STABLE23/src/ctype.c      2009-11-11 14:01:34.000000000 +0100 
     1--- /dev/null 
     2+++ b/src/ctype.c 
    53@@ -0,0 +1,546 @@ 
    64+/* 
     
    550548+const uint32_t *__ctype32_toupper = b (uint32_t, toupper, 128); 
    551549+ 
    552 Index: squid-2.6.STABLE23/src/Makefile.in 
    553 =================================================================== 
    554 --- squid-2.6.STABLE23.orig/src/Makefile.in     2009-09-17 01:33:37.000000000 +0200 
    555 +++ squid-2.6.STABLE23/src/Makefile.in  2009-11-11 14:02:33.000000000 +0100 
    556 @@ -1191,6 +1191,9 @@ 
     550--- a/src/Makefile.in 
     551+++ b/src/Makefile.in 
     552@@ -1234,6 +1234,9 @@ squid.conf.default: cf_parser.h 
    557553        true 
    558554  
  • packages/net/squid/patches/002-no_sslv2.patch

    r8164 r22420  
    1 Index: squid-2.6.STABLE14/src/ssl_support.c 
    2 =================================================================== 
    3 --- squid-2.6.STABLE14.orig/src/ssl_support.c   2007-07-25 16:04:15.000000000 -0500 
    4 +++ squid-2.6.STABLE14/src/ssl_support.c        2007-07-25 16:04:15.000000000 -0500 
    5 @@ -442,10 +442,12 @@ 
     1--- a/src/ssl_support.c 
     2+++ b/src/ssl_support.c 
     3@@ -446,10 +446,12 @@ sslCreateServerContext(const char *certf 
    64     ERR_clear_error(); 
    75     debug(83, 1) ("Initialising SSL.\n"); 
  • packages/net/squid/patches/003-configure.patch

    r18373 r22420  
    1 Index: squid-2.6.STABLE23/configure 
    2 =================================================================== 
    3 --- squid-2.6.STABLE23.orig/configure   2009-09-17 01:35:13.000000000 +0200 
    4 +++ squid-2.6.STABLE23/configure        2009-11-11 14:19:11.000000000 +0100 
    5 @@ -5053,10 +5053,6 @@ 
     1--- a/configure 
     2+++ b/configure 
     3@@ -5059,10 +5059,6 @@ _ACEOF 
    64   if test -z "$SSLLIB"; then 
    75     SSLLIB="-lcrypto" # for MD5 routines 
     
    1412 fi 
    1513  
    16 @@ -26292,7 +26288,7 @@ 
     14@@ -27318,7 +27314,7 @@ else 
    1715 See \`config.log' for more details." >&5 
    1816 $as_echo "$as_me: error: cannot run test program while cross compiling 
     
    2321   cat >conftest.$ac_ext <<_ACEOF 
    2422 /* confdefs.h.  */ 
    25 @@ -26455,8 +26451,7 @@ 
     23@@ -27481,8 +27477,7 @@ else 
    2624   { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling 
    2725 See \`config.log' for more details." >&5 
     
    3331   cat >conftest.$ac_ext <<_ACEOF 
    3432 /* confdefs.h.  */ 
    35 @@ -26707,7 +26702,7 @@ 
     33@@ -27733,7 +27728,7 @@ else 
    3634 See \`config.log' for more details." >&5 
    3735 $as_echo "$as_me: error: cannot run test program while cross compiling 
     
    4240   cat >conftest.$ac_ext <<_ACEOF 
    4341 /* confdefs.h.  */ 
    44 @@ -26789,7 +26784,7 @@ 
     42@@ -27815,7 +27810,7 @@ else 
    4543 See \`config.log' for more details." >&5 
    4644 $as_echo "$as_me: error: cannot run test program while cross compiling 
  • packages/net/squid/patches/004-include-autoconf.patch

    r8164 r22420  
    1 Index: squid-2.6.STABLE14/include/autoconf.h.in 
    2 =================================================================== 
    3 --- squid-2.6.STABLE14.orig/include/autoconf.h.in       2007-07-25 16:04:15.000000000 -0500 
    4 +++ squid-2.6.STABLE14/include/autoconf.h.in    2007-07-25 16:04:16.000000000 -0500 
    5 @@ -319,10 +319,10 @@ 
     1--- a/include/autoconf.h.in 
     2+++ b/include/autoconf.h.in 
     3@@ -313,10 +313,10 @@ 
    64 #undef HAVE_OPENSSL_ERR_H 
    75  
  • packages/net/squid/patches/005-lib-makefile.patch

    r18373 r22420  
    1 Index: squid-2.6.STABLE23/lib/Makefile.in 
    2 =================================================================== 
    3 --- squid-2.6.STABLE23.orig/lib/Makefile.in     2009-09-17 01:33:17.000000000 +0200 
    4 +++ squid-2.6.STABLE23/lib/Makefile.in  2009-11-11 14:16:09.000000000 +0100 
    5 @@ -61,7 +61,9 @@ 
     1--- a/lib/Makefile.in 
     2+++ b/lib/Makefile.in 
     3@@ -60,8 +60,10 @@ am__libmiscutil_a_SOURCES_DIST = Array.c 
     4        rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \ 
    65        splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \ 
    76        win32lib.c 
    8  @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT) 
    97+@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT) 
    10  @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT) 
     8 @NEED_OWN_SNPRINTF_TRUE@am__objects_1 = snprintf.$(OBJEXT) 
     9 @NEED_OWN_STRSEP_TRUE@am__objects_2 = strsep.$(OBJEXT) 
    1110+@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT) 
    12  @NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT) 
    13  @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT) 
     11 @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_3 = win32lib.$(OBJEXT) 
    1412 am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \ 
    15 @@ -72,7 +74,19 @@ 
    16         $(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \ 
    17         $(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \ 
    18         uudecode.$(OBJEXT) $(am__objects_4) 
     13        getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \ 
     14@@ -71,7 +73,19 @@ am_libmiscutil_a_OBJECTS = Array.$(OBJEX 
     15        $(am__objects_1) splay.$(OBJEXT) Stack.$(OBJEXT) \ 
     16        $(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \ 
     17        uudecode.$(OBJEXT) $(am__objects_3) 
    1918+am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \ 
    20 +                       base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \ 
    21 +                       hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \ 
    22 +                       html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \ 
    23 +                       $(am__host_objects_1) radix.$(HOST_OBJEXT) \ 
    24 +                       rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \ 
    25 +                       rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \ 
    26 +                       safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \ 
    27 +                       splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \ 
    28 +                       stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \ 
    29 +                       uudecode.$(HOST_OBJEXT) 
     19+       base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \ 
     20+       hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \ 
     21+       html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \ 
     22+       $(am__host_objects_1) radix.$(HOST_OBJEXT) \ 
     23+       rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \ 
     24+       rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \ 
     25+       safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \ 
     26+       splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \ 
     27+       stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \ 
     28+       uudecode.$(HOST_OBJEXT) 
    3029 libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) 
    3130+libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS) 
     
    3332 libntlmauth_a_DEPENDENCIES = @LIBOBJS@ 
    3433 am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT) 
    35 @@ -90,15 +104,19 @@ 
     34@@ -89,15 +103,19 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/ 
    3635 am__depfiles_maybe = depfiles 
    3736 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
     
    5554 CTAGS = ctags 
    5655 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    57 @@ -106,6 +124,7 @@ 
     56@@ -105,6 +123,7 @@ ACLOCAL = @ACLOCAL@ 
    5857 ALLOCA = @ALLOCA@ 
    5958 AMTAR = @AMTAR@ 
     
    6362 AUTH_LIBS = @AUTH_LIBS@ 
    6463 AUTH_MODULES = @AUTH_MODULES@ 
    65 @@ -118,6 +137,7 @@ 
     64@@ -117,6 +136,7 @@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS 
    6665 CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ 
    6766 CACHE_ICP_PORT = @CACHE_ICP_PORT@ 
     
    7170 CFLAGS = @CFLAGS@ 
    7271 CGIEXT = @CGIEXT@ 
    73 @@ -165,6 +185,8 @@ 
    74  NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ 
     72@@ -164,6 +184,8 @@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH 
     73 NIS_LIBS = @NIS_LIBS@ 
    7574 NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ 
    7675 OBJEXT = @OBJEXT@ 
     
    8079 PACKAGE = @PACKAGE@ 
    8180 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ 
    82 @@ -264,6 +286,7 @@ 
     81@@ -261,6 +283,7 @@ EXTRA_LIBRARIES = \ 
    8382 noinst_LIBRARIES = \ 
    8483        @LIBDLMALLOC@ \ 
     
    8887        @LIBREGEX@ \ 
    8988        $(LIBSSPWIN32) 
    90 @@ -298,9 +321,34 @@ 
     89@@ -300,9 +323,34 @@ libmiscutil_a_SOURCES = \ 
    9190        uudecode.c \ 
    9291        $(WIN32SRC) 
     
    123122 libregex_a_SOURCES = \ 
    124123        GNUregex.c 
    125 @@ -321,7 +369,7 @@ 
     124@@ -323,7 +371,7 @@ INCLUDES = -I$(top_builddir)/include -I$ 
    126125 all: all-am 
    127126  
     
    132131        @for dep in $?; do \ 
    133132          case '$(am__configure_deps)' in \ 
    134 @@ -358,10 +406,13 @@ 
     133@@ -360,10 +408,13 @@ libdlmalloc.a: $(libdlmalloc_a_OBJECTS) 
    135134        -rm -f libdlmalloc.a 
    136135        $(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD) 
     
    147146        -rm -f libntlmauth.a 
    148147        $(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD) 
    149 @@ -412,6 +463,21 @@ 
     148@@ -417,6 +468,21 @@ distclean-compile: 
    150149 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ 
    151150 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.Po@am__quote@ 
     
    169168 .c.o: 
    170169 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    171 @@ -420,6 +486,9 @@ 
     170@@ -425,6 +491,9 @@ distclean-compile: 
    172171 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    173172 @am__fastdepCC_FALSE@  $(COMPILE) -c $< 
Note: See TracChangeset for help on using the changeset viewer.