fix cross-compile of basic_auth_ldap, fileuser_ip

4 files changed, 28 insertions, 7 deletions

diff --git a/package/squid/Makefile b/package/squid/Makefile
index 50751442f..f2f906a50 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -85,7 +85,7 @@ $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-
 $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,${PKG_NAME}-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,${PKG_NAME}-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,${PKG_NAME}-mod-external-acl-file-userip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,${PKG_NAME}-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -93,11 +93,11 @@ $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,basic_getpwnam_auth
 $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,basic_ldap_auth))
 $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,basic_ncsa_auth))
 $(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,basic_smb_auth))
-$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_pw_file))
-$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,file_userip))
+$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_file_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,ext_file_userip_acl))
 $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth))
 $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl))
-$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,fake_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth))
 
 TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
diff --git a/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test b/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test
new file mode 100644
index 000000000..7bcdcb33b
--- /dev/null
+++ b/package/squid/patches/patch-helpers_basic_auth_LDAP_config_test
@@ -0,0 +1,12 @@
+--- squid-3.2.3.orig/helpers/basic_auth/LDAP/config.test	2012-10-20 14:39:49.000000000 +0200
++++ squid-3.2.3/helpers/basic_auth/LDAP/config.test	2013-07-18 11:45:46.000000000 +0200
+@@ -1,8 +1,2 @@
+ #!/bin/sh
+-if [ -f /usr/include/ldap.h ]; then
+-	exit 0
+-fi
+-if [ -f /usr/include/winldap.h ]; then
+-	exit 0
+-fi
+-exit 1
++exit 0
diff --git a/package/squid/patches/patch-helpers_external_acl_file_userip_config_test b/package/squid/patches/patch-helpers_external_acl_file_userip_config_test
new file mode 100644
index 000000000..6b9d5aaa3
--- /dev/null
+++ b/package/squid/patches/patch-helpers_external_acl_file_userip_config_test
@@ -0,0 +1,9 @@
+--- squid-3.2.3.orig/helpers/external_acl/file_userip/config.test	2012-10-20 14:39:49.000000000 +0200
++++ squid-3.2.3/helpers/external_acl/file_userip/config.test	2013-07-18 11:50:54.000000000 +0200
+@@ -1,5 +1,2 @@
+ #!/bin/sh
+-if [ -f /usr/include/sys/socket.h ]; then
+-    exit 0
+-fi
+-exit 1
++exit 0
diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in
index f9b01dcb6..64ae13836 100644
--- a/package/squid/patches/patch-src_Makefile_in
+++ b/package/squid/patches/patch-src_Makefile_in
@@ -1,6 +1,6 @@
---- squid-3.1.16.orig/src/Makefile.in	2011-10-13 10:35:44.000000000 +0200
-+++ squid-3.1.16/src/Makefile.in	2011-11-10 14:36:55.421109832 +0100
-@@ -4815,7 +4815,7 @@ cache_cf.o: cf_parser.cci
+--- squid-3.2.3.orig/src/Makefile.in	2012-10-20 14:40:18.000000000 +0200
++++ squid-3.2.3/src/Makefile.in	2013-07-18 11:37:59.000000000 +0200
+@@ -6573,7 +6573,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
  cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)