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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.