more regressions found at runtime on alic1c

4 files changed, 55 insertions, 6 deletions

diff --git a/package/squid/Makefile b/package/squid/Makefile
index 2a63e19f8..5924a7f42 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -46,11 +46,9 @@ define PKG_mod_template
 INSTALL_MODS_$${ADK_PACKAGE_${1}}+=	${2}-install
 
 ${2}-install:
-	if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
-		${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \
-		${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \
-		
-	fi
+	${INSTALL_DIR} $${IDIR_${1}}/usr/lib/squid
+	${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} \
+		$${IDIR_${1}}/usr/lib/squid/
 endef
 
 $(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -74,7 +72,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_grou
 $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth))
 $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth))
 
-CONFIGURE_STYLE:=	gnu
+CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_sizeof_short=2 \
 			ac_cv_sizeof_int=4 \
@@ -94,6 +92,7 @@ CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_func_va_copy=no \
 			ac_cv_func___va_copy=no \
 			ac_cv_epoll_works=yes \
+			ac_cv_lib_nsl_main=no \
 			ac_cv_func_strnstr=no
 CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--libexecdir=/usr/lib/squid \
@@ -117,6 +116,8 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--enable-cache-digests \
 			--enable-referer-log \
 			--enable-delay-pools \
+			--disable-wccp \
+			--disable-wccpv2 \
 			--enable-useragent-log \
 			--with-openssl=${STAGING_DIR}/usr \
 			--enable-auth="${AUTH_MODULES}" \
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
+