fix squid compile, cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/packages@13979 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
70ad04384e
commit
125d5f74b1
@ -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
|
||||
|
20
net/squid/patches/006-netfilter_missing_linux_types_h.patch
Normal file
20
net/squid/patches/006-netfilter_missing_linux_types_h.patch
Normal file
@ -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
|
Loading…
x
Reference in New Issue
Block a user