Signed-off-by: Tomasz Moń <deso...@gmail.com> diff --git a/net/squid/Makefile b/net/squid/Makefile index 5874d9d..5ec4f52 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -8,12 +8,12 @@ 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 @@ -160,7 +160,7 @@ define Package/squid/install $(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 diff --git a/net/squid/patches/005-lib-makefile.patch b/net/squid/patches/005-lib-makefile.patch index 1f094db..e748cd7 100644 --- a/net/squid/patches/005-lib-makefile.patch +++ b/net/squid/patches/005-lib-makefile.patch @@ -1,38 +1,35 @@ -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 +--- squid-2.7.STABLE9/lib/Makefile.in.orig 2010-03-14 21:27:25.000000000 +0100 ++++ squid-2.7.STABLE9/lib/Makefile.in 2010-07-30 17:53:45.635336664 +0200 @@ -61,7 +61,9 @@ splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \ win32lib.c - @need_own_md5_t...@am__objects_1 = md5.$(OBJEXT) -...@need_own_md5_true@am__host_objects_1 = md5.$(HOST_OBJEXT) - @need_own_snprintf_t...@am__objects_2 = snprintf.$(OBJEXT) -...@need_own_snprintf_true@am__host_objects_2 = snprintf.$(HOST_OBJEXT) - @need_own_strsep_t...@am__objects_3 = strsep.$(OBJEXT) - @enable_mingw32specific_t...@am__objects_4 = win32lib.$(OBJEXT) + @need_own_snprintf_t...@am__objects_1 = snprintf.$(OBJEXT) +...@need_own_snprintf_true@am__host_objects_1 = snprintf.$(HOST_OBJEXT) + @need_own_strsep_t...@am__objects_2 = strsep.$(OBJEXT) +...@need_own_strsep_true@am__host_objects_2 = strsep.$(HOST_OBJEXT) + @enable_mingw32specific_t...@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,18 @@ + $(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) \ ++ md5.$(HOST_OBJEXT) radix.$(HOST_OBJEXT) rfc1035.$(HOST_OBJEXT) \ ++ rfc1123.$(HOST_OBJEXT) rfc1738.$(HOST_OBJEXT) \ ++ rfc2617.$(HOST_OBJEXT) safe_inet_addr.$(HOST_OBJEXT) \ ++ $(am__host_objects_1) splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \ ++ $(am__host_objects_2) 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 +102,19 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -54,7 +51,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -106,6 +124,7 @@ +@@ -105,6 +122,7 @@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ AR = @AR@ @@ -62,7 +59,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in AR_R = @AR_R@ AUTH_LIBS = @AUTH_LIBS@ AUTH_MODULES = @AUTH_MODULES@ -@@ -118,6 +137,7 @@ +@@ -117,6 +135,7 @@ CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ @@ -70,8 +67,8 @@ Index: squid-2.6.STABLE23/lib/Makefile.in CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CGIEXT = @CGIEXT@ -@@ -165,6 +185,8 @@ - NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@ +@@ -164,6 +183,8 @@ + NIS_LIBS = @NIS_LIBS@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +HOST_OBJEXT = @obj...@.$(shell uname -m) @@ -79,7 +76,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -264,6 +286,7 @@ +@@ -261,6 +282,7 @@ noinst_LIBRARIES = \ @LIBDLMALLOC@ \ libmiscutil.a \ @@ -87,7 +84,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in libntlmauth.a \ @LIBREGEX@ \ $(LIBSSPWIN32) -@@ -298,9 +321,34 @@ +@@ -300,9 +322,34 @@ uudecode.c \ $(WIN32SRC) @@ -122,7 +119,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in # $(top_srcdir)/include/version.h should be a dependency libregex_a_SOURCES = \ GNUregex.c -@@ -321,7 +369,7 @@ +@@ -323,7 +370,7 @@ all: all-am .SUFFIXES: @@ -131,7 +128,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in $(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 +407,13 @@ -rm -f libdlmalloc.a $(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD) $(RANLIB) libdlmalloc.a @@ -146,7 +143,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in 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 +467,21 @@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/util...@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/uudecode...@am__quote@ @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/win32lib...@am__quote@ @@ -168,7 +165,7 @@ Index: squid-2.6.STABLE23/lib/Makefile.in .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -420,6 +486,9 @@ +@@ -425,6 +490,9 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
