fix squid compile, cleanup

SVN-Revision: 13979

diff --git a/net/squid/Makefile b/net/squid/Makefile
index ca4f00f7e515093b6c256544d508cf45cccde33e..bd54e6e857a9df70c5c6c262bd0339c04d929b8f 100644 (file)
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -97,42 +97,42 @@ define Package/squid-mod-ntlm-auth-smb-auth
   TITLE:=Samba NTLM authentication helper
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --datadir=/usr/share/squid \
-               --libexecdir=/usr/lib/squid \
-               --sysconfdir=/etc/squid \
-               --enable-shared \
-               --enable-static \
-               --enable-x-accelerator-vary \
-               --with-pthreads \
-               --with-dl \
-               --enable-icmp \
-               --enable-kill-parent-hack \
-               --enable-arp-acl \
-               --enable-ssl \
-               --enable-htcp \
-               --enable-err-languages=English \
-               --enable-default-err-language=English \
-               --enable-linux-netfilter \
-               --enable-icmp \
-               --enable-external-acl-helpers="" \
-               --enable-underscores \
-               --enable-cache-digests \
-               --enable-referer-log \
-               --enable-delay-pools \
-               --enable-useragent-log \
-               --with-openssl=$(STAGING_DIR)/usr \
-               --enable-auth="basic digest ntlm" \
-               --enable-basic-auth-helpers="getpwnam NCSA SMB" \
-               --enable-ntlm-auth-helpers="fakeauth SMB" \
-               --enable-digest-auth-helpers="password" \
-               --enable-external-acl-helpers="ip_user unix_group" \
-               --enable-epoll \
-               --with-maxfd=4096 \
-       )
-endef
+CONFIGURE_ARGS += \
+       --datadir=/usr/share/squid \
+       --libexecdir=/usr/lib/squid \
+       --sysconfdir=/etc/squid \
+       --enable-shared \
+       --enable-static \
+       --enable-x-accelerator-vary \
+       --with-pthreads \
+       --with-dl \
+       --enable-icmp \
+       --enable-kill-parent-hack \
+       --enable-arp-acl \
+       --enable-ssl \
+       --enable-htcp \
+       --enable-err-languages=English \
+       --enable-default-err-language=English \
+       --enable-linux-netfilter \
+       --enable-icmp \
+       --enable-external-acl-helpers="" \
+       --enable-underscores \
+       --enable-cache-digests \
+       --enable-referer-log \
+       --enable-delay-pools \
+       --enable-useragent-log \
+       --with-openssl=$(STAGING_DIR)/usr \
+       --enable-auth="basic digest ntlm" \
+       --enable-basic-auth-helpers="getpwnam NCSA SMB" \
+       --enable-ntlm-auth-helpers="fakeauth SMB" \
+       --enable-digest-auth-helpers="password" \
+       --enable-external-acl-helpers="ip_user unix_group" \
+       --enable-epoll \
+       --with-maxfd=4096 \
        
+CONFIGURE_VARS += \
+       ac_cv_header_linux_netfilter_ipv4_h=yes \
+
 define Build/Compile
        # pass INCLUDES to compile host sources against our OpenSSL, not the host one
        $(MAKE) -C $(PKG_BUILD_DIR)/lib \
@@ -140,7 +140,7 @@ define Build/Compile
                all
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+               install
 endef
 
 define BuildPlugin

diff --git a/net/squid/patches/006-netfilter_missing_linux_types_h.patch b/net/squid/patches/006-netfilter_missing_linux_types_h.patch
new file mode 100644 (file)
index 0000000..56c15c8
--- /dev/null
+++ b/net/squid/patches/006-netfilter_missing_linux_types_h.patch
@@ -0,0 +1,20 @@
+--- a/src/client_side.c
++++ b/src/client_side.c
+@@ -92,6 +92,7 @@
+ #endif
+ 
+ #if LINUX_NETFILTER
++#include <linux/types.h>
+ #include <linux/netfilter_ipv4.h>
+ #endif
+ 
+--- a/src/forward.c
++++ b/src/forward.c
+@@ -37,6 +37,7 @@
+ #include "squid.h"
+ 
+ #if LINUX_NETFILTER
++#include <linux/types.h>
+ #include <linux/netfilter_ipv4.h>
+ #endif
+ #if LINUX_TPROXY