diff options
Diffstat (limited to 'package/squid/patches')
| -rw-r--r-- | package/squid/patches/patch-configure_in | 6 | ||||
| -rw-r--r-- | package/squid/patches/patch-lib_util_c | 12 | ||||
| -rw-r--r-- | package/squid/patches/patch-src_Makefile_am | 13 |
3 files changed, 9 insertions, 22 deletions
diff --git a/package/squid/patches/patch-configure_in b/package/squid/patches/patch-configure_in index eb4c83428..1033d265e 100644 --- a/package/squid/patches/patch-configure_in +++ b/package/squid/patches/patch-configure_in @@ -1,6 +1,6 @@ ---- squid-3.0.STABLE15.orig/configure.in 2009-05-06 13:11:43.000000000 +0200 -+++ squid-3.0.STABLE15/configure.in 2009-06-04 20:20:15.000000000 +0200 -@@ -1820,6 +1820,10 @@ case "$host" in +--- squid-3.0.STABLE18.orig/configure.in 2009-08-04 13:57:50.000000000 +0200 ++++ squid-3.0.STABLE18/configure.in 2009-08-23 18:00:46.944417936 +0200 +@@ -1895,6 +1895,10 @@ case "$host" in ;; esac diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c deleted file mode 100644 index 562be88fc..000000000 --- a/package/squid/patches/patch-lib_util_c +++ /dev/null @@ -1,12 +0,0 @@ ---- squid-3.0.STABLE15.orig/lib/util.c 2009-05-06 13:11:38.000000000 +0200 -+++ squid-3.0.STABLE15/lib/util.c 2009-06-04 21:05:19.000000000 +0200 -@@ -751,7 +751,8 @@ xstrdup(const char *s) - /* copy string, including terminating character */ - sz = strlen(s) + 1; - -- p = memcpy((char *)xmalloc(sz), s, sz); -+ p = (char *)xmalloc(sz); -+ memcpy(p, s, sz); - - PROF_stop(xstrdup); - diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am index d8cd72aa9..0f1e322b5 100644 --- a/package/squid/patches/patch-src_Makefile_am +++ b/package/squid/patches/patch-src_Makefile_am @@ -1,15 +1,14 @@ ---- squid-3.0.STABLE15.orig/src/Makefile.am 2009-05-06 13:11:40.000000000 +0200 -+++ squid-3.0.STABLE15/src/Makefile.am 2009-06-04 20:21:37.000000000 +0200 -@@ -1007,6 +1007,8 @@ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ +--- squid-3.0.STABLE18.orig/src/Makefile.am 2009-08-04 13:57:48.000000000 +0200 ++++ squid-3.0.STABLE18/src/Makefile.am 2009-08-23 18:12:19.744829620 +0200 +@@ -1010,6 +1010,7 @@ DEFAULT_MIB_PATH = $(datadir)/mib.txt + DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" - +HOSTCXX ?= @HOSTCXX@ -+ + $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h - snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h -@@ -1030,6 +1032,11 @@ cache_cf.o: cf_parser.h +@@ -1034,6 +1035,11 @@ cache_cf.o: cf_parser.h squid.conf.default: cf_parser.h true |