From e874f84fdb6eb83d905a72b35d87398374594b97 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 5 Jun 2009 19:58:50 +0200
Subject: more regressions found at runtime on alic1c

---
 package/squid/patches/patch-configure_in    | 13 +++++++++++++
 package/squid/patches/patch-lib_util_c      | 12 ++++++++++++
 package/squid/patches/patch-src_Makefile_am | 23 +++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 package/squid/patches/patch-configure_in
 create mode 100644 package/squid/patches/patch-lib_util_c
 create mode 100644 package/squid/patches/patch-src_Makefile_am

(limited to 'package/squid/patches')

diff --git a/package/squid/patches/patch-configure_in b/package/squid/patches/patch-configure_in
new file mode 100644
index 000000000..eb4c83428
--- /dev/null
+++ b/package/squid/patches/patch-configure_in
@@ -0,0 +1,13 @@
+--- 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
+ 	;;
+ esac
+ 
++dnl Define HOSTCXX
++HOSTCXX="g++"
++AC_SUBST(HOSTCXX)
++
+ dnl Check for programs
+ AC_PROG_CPP
+ AC_PROG_INSTALL
diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c
new file mode 100644
index 000000000..562be88fc
--- /dev/null
+++ b/package/squid/patches/patch-lib_util_c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000..d8cd72aa9
--- /dev/null
+++ b/package/squid/patches/patch-src_Makefile_am
@@ -0,0 +1,23 @@
+--- 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@
+ 
+ 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
+ squid.conf.default: cf_parser.h
+ 	true
+ 
++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
++	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
++		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
++		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
++
+ cf_parser.h: cf.data cf_gen$(EXEEXT)
+ 	./cf_gen cf.data $(srcdir)/cf.data.depend
+ 
-- 
cgit v1.2.3