]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Author: Francesco Chemolli <kinkie@squid-cache.org>
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 22 Apr 2010 12:44:23 +0000 (00:44 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 22 Apr 2010 12:44:23 +0000 (00:44 +1200)
Improved helper configlets for wider compatibility.

 * Add configlet tests for building the DB basic auth helper
 * Improved detection of samba prefix for wbinfo_group and SMB
 * Also check for SASL shared libraries in SASL helper
 * Distribute the config.test files to enable auto-build properly

33 files changed:
helpers/basic_auth/DB/Makefile.am
helpers/basic_auth/DB/config.test [new file with mode: 0644]
helpers/basic_auth/LDAP/Makefile.am
helpers/basic_auth/MSNT/Makefile.am
helpers/basic_auth/NCSA/Makefile.am
helpers/basic_auth/PAM/Makefile.am
helpers/basic_auth/POP3/Makefile.am
helpers/basic_auth/SASL/Makefile.am
helpers/basic_auth/SASL/config.test
helpers/basic_auth/SMB/Makefile.am
helpers/basic_auth/SMB/config.test
helpers/basic_auth/YP/Makefile.am
helpers/basic_auth/getpwnam/Makefile.am
helpers/basic_auth/mswin_sspi/Makefile.am
helpers/basic_auth/multi-domain-NTLM/Makefile.am
helpers/basic_auth/squid_radius_auth/Makefile.am
helpers/basic_auth/squid_radius_auth/config.test [changed mode: 0644->0755]
helpers/digest_auth/eDirectory/Makefile.am
helpers/digest_auth/ldap/Makefile.am
helpers/digest_auth/password/Makefile.am
helpers/external_acl/ip_user/Makefile.am
helpers/external_acl/ldap_group/Makefile.am
helpers/external_acl/mswin_ad_group/Makefile.am
helpers/external_acl/mswin_lm_group/Makefile.am
helpers/external_acl/session/Makefile.am
helpers/external_acl/unix_group/Makefile.am
helpers/external_acl/wbinfo_group/Makefile.am
helpers/external_acl/wbinfo_group/config.test
helpers/negotiate_auth/mswin_sspi/Makefile.am
helpers/ntlm_auth/fakeauth/Makefile.am
helpers/ntlm_auth/mswin_sspi/Makefile.am
helpers/ntlm_auth/no_check/Makefile.am
helpers/ntlm_auth/smb_lm/Makefile.am

index 0ac34f27d7265843d23aedf6f1231f273687e896..39344369d3c77049d0ddf81c7e2ffaf4659d8cd0 100644 (file)
@@ -11,7 +11,8 @@ CLEANFILES = squid_db_auth squid_db_auth.8
 do_subst = sed -e 's,[@]PERL[@],$(PERL),g'
 man_MANS       = squid_db_auth.8
 EXTRA_DIST     = passwd.sql \
-                 squid_db_auth.in
+                 squid_db_auth.in \
+                 config.test
 
 squid_db_auth.8: squid_db_auth
        pod2man squid_db_auth squid_db_auth.8
diff --git a/helpers/basic_auth/DB/config.test b/helpers/basic_auth/DB/config.test
new file mode 100644 (file)
index 0000000..387b7b1
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+## Test: do we have perl to build the helper scripts?
+## Test: do we have pod2man to build the manual?
+perl --version >/dev/null && echo | pod2man >/dev/null
+
+exit $?
index 11af8a29afa58d52ba3223c650ad9fa2fee4ef94..4167f4bd6fc1206b299b565e043072806813113c 100644 (file)
@@ -10,8 +10,8 @@ include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS       = squid_ldap_auth
 man_MANS               = squid_ldap_auth.8
-EXTRA_DIST             = squid_ldap_auth.8
 squid_ldap_auth_SOURCES        = squid_ldap_auth.c
+EXTRA_DIST             = basic_ldap_auth.8 config.test
 
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
index 6d76ddcc84b6def904f32844007e4c71fbf4f6bc..9e30ba9c267e345ffe3f81d415dda63349ac02a2 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 MSNTAUTH_CONF = $(sysconfdir)/msntauth.conf
@@ -25,7 +17,8 @@ EXTRA_DIST = \
        COPYING-2.0 \
        msntauth.conf.default \
        msntauth-v2.0.lsm \
-       README.html
+       README.html \
+       config.test
 
 sysconf_DATA = \
        msntauth.conf.default
index 08ef3d72de6f9ea3a3a8879449ec79d6a49327ee..3a3be1ebe3323cc62740ac237e9e77d8581e40fa 100644 (file)
@@ -11,7 +11,7 @@ include $(top_srcdir)/src/Common.am
 libexec_PROGRAMS       = ncsa_auth
 ncsa_auth_SOURCES      = ncsa_auth.c crypt_md5.c crypt_md5.h
 man_MANS               = ncsa_auth.8
-EXTRA_DIST             = ncsa_auth.8
+EXTRA_DIST             = ncsa_auth.8 config.test
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
index c6a65aec56aa88d25b2eae0a54f8904396375d96..053f11ac218665d139035d4de538eeb85358d391 100644 (file)
@@ -9,7 +9,7 @@
 include $(top_srcdir)/src/Common.am
 
 man_MANS               = pam_auth.8
-EXTRA_DIST             = pam_auth.8
+EXTRA_DIST             = pam_auth.8 config.test
 libexec_PROGRAMS       = pam_auth
 
 ## we need our local files too (but avoid -I. at all costs)
index a41a18128672a492ba7265adcad2232bc68446b2..20cf88ce78ba9e6bca66952c32e59736f83c8630 100644 (file)
@@ -10,4 +10,5 @@ libexec_SCRIPTS       = \
        pop3.pl
 
 EXTRA_DIST = \
-       pop3.pl
+       pop3.pl \
+       config.test
index d30bf67182eca81aa61291f75fb691922866a44a..1ff41e9fca140e0a0ff01029d76c8b5ee596c199 100644 (file)
@@ -19,4 +19,4 @@ LDADD = \
        $(LIBSASL) \
        $(XTRA_LIBS)
 
-EXTRA_DIST             = squid_sasl_auth squid_sasl_auth.conf
+EXTRA_DIST             = squid_sasl_auth squid_sasl_auth.conf config.test
index 7f4b817f3314cfa67c9906686aa648fdfca85eb8..34e5befe55a14d44bcf6f917fbbfc1857def45ed 100755 (executable)
@@ -6,5 +6,8 @@ if [ -f /usr/include/sasl.h -o -f /usr/include/sasl/sasl.h ]; then
        if [ -f /usr/lib/libsasl.la -o -f /usr/lib/libsasl2.la ]; then
                exit 0
        fi
+       if [ -f /usr/lib/libsasl.so -o -f /usr/lib/libsasl2.so ]; then
+               exit 0
+       fi
 fi
 exit 1
index 82aa4b42ea23ddfc8a3bb3995933ab9c2955cde2..acf5cc9b776574a1eac7ee3e84d84d47ded049d6 100644 (file)
@@ -22,7 +22,7 @@ SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 libexec_SCRIPTS        = $(SMB_AUTH_HELPER)
 libexec_PROGRAMS = smb_auth
 smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
-EXTRA_DIST = smb_auth.sh COPYING-2.0
+EXTRA_DIST = smb_auth.sh COPYING-2.0 config.test
 
 ## we need our local files too (but avoid -I. at all costs)
 INCLUDES += -I$(srcdir)
index 5b11788d17aab56f44f980b96b312de6131618c9..f41b21fd12ec709d7b79571bfcdd0f2c1cf9e8f3 100755 (executable)
@@ -1,5 +1,8 @@
 #!/bin/sh
-if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/smbclient ]; then
-       exit 0
-fi
+for prefix in ${SAMBAPREFIX} /usr/local /opt /opt/samba /usr/local/samba /usr
+do
+    if [ -x ${prefix}/bin/smbclient ]; then
+        exit 0
+    fi
+done
 exit 1
index 79f5561a69efc548aa921b2b393951f028a0a084..793db87559547f2779250bfb407d1c0b931a79d4 100644 (file)
@@ -18,3 +18,5 @@ LDADD = \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test
index c733abd628de1adbaff11e63d6325c7f2a5cd304..badab993648c68d4e67e000a40ec44a892576d75 100644 (file)
@@ -20,3 +20,5 @@ LDADD = \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test
index 4d915d5449ad12102395e8e3058a3600b7bdb3f8..14eeccbfcbf236925475bafefc7b482030f66569 100644 (file)
@@ -21,4 +21,4 @@ LDADD = \
 ## we need our local files too (but avoid -I. at all costs)
 INCLUDES += -I$(srcdir)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test
index 364248f0bba160aafa87f1869d4cc67b77d905bf..f0cf3305d72e122859707b9b97138b367e4c5490 100644 (file)
@@ -11,4 +11,5 @@ libexec_SCRIPTS       = \
 
 EXTRA_DIST = \
        smb_auth.pl \
-       README.txt
+       README.txt \
+       config.test
index 34be3078ad1c76dc35cf3af48d0a338ca86193b6..14e0d51e5cd75eb9595fc326023520b1c0ea70f5 100644 (file)
@@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS       = squid_radius_auth
 man_MANS               = squid_radius_auth.8
-EXTRA_DIST             = squid_radius_auth.8
+EXTRA_DIST             = squid_radius_auth.8 config.test
 squid_radius_auth_SOURCES = \
                        squid_rad_auth.c \
                        radius.h \
index 82af4fe4430ca1e070ba6a756e341d0c20d5412b..0e3f2529899427f5251b08d36eb698884063c086 100644 (file)
@@ -28,3 +28,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test
index 7d57e771dd959fdfd8b0e511b73709157260c258..c1db8bd36e0ceda2334cb37f0fe7c7e6c8fde839 100644 (file)
@@ -26,3 +26,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test
index a2312086a0c3297f5fa96f1808cf76b28f39bc20..681f0d677be8bbc805863d0520315cd39b130d01 100644 (file)
@@ -24,3 +24,5 @@ LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
+
+EXTRA_DIST = config.test
index 035056874a376fa09449afb06e206855c8ee3057..5e53d10893442d22f0706a7a94cc1abf5daefd4f 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the ip_user external_acl helper by Rodrigo Campos
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -24,7 +16,8 @@ EXTRA_DIST = \
        example.conf \
        example-deny_all_but.conf \
        license \
-       README
+       README \
+       config.test
 
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
index fcaf332802bbd940e9e9146fc3fd6fcd8c6cf079..b120502c63d5bde8e4522d7b89b9a52730810be7 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_ldap_group
 man_MANS                       = squid_ldap_group.8
-EXTRA_DIST                     = squid_ldap_group.8
+EXTRA_DIST                     = squid_ldap_group.8 config.test
 squid_ldap_group_SOURCES       = squid_ldap_group.c
 
 LDADD = \
index 049a00809084df1909bfac299c5e7a952643b598..8916aba8151d463907844e5ea3af036c1cb4d1ff 100644 (file)
@@ -1,12 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
-
 libexec_PROGRAMS = mswin_check_ad_group
 
 mswin_check_ad_group_SOURCES = mswin_check_ad_group.c mswin_check_ad_group.h
@@ -23,4 +14,4 @@ LDADD = \
        -lntdll \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test
index 414fc5833ce1a0f9280def95fdb444946b43b5db..478b6fa407cc8fa65d7e7189177765ad096803a5 100644 (file)
@@ -24,4 +24,4 @@ LDADD = \
        -lntdll \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test
index e725cff2e7dbc0aea00da28abb9f12ec21b74a65..36cc2872d49eb5174bef082dcb8f6a637d6eb501 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_session
 man_MANS                       = squid_session.8
-EXTRA_DIST                     = squid_session.8
+EXTRA_DIST                     = squid_session.8 config.test
 squid_session_SOURCES          = squid_session.c
 
 LDADD = \
index dbb612bb4f3d1adcd6a307460309c6c74d6c51c9..916a4ca9423a5419d00eef0aadea604e8aaac3f9 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
@@ -14,7 +6,7 @@ INCLUDES += -I$(srcdir)
 
 libexec_PROGRAMS               = squid_unix_group
 man_MANS                       = squid_unix_group.8
-EXTRA_DIST                     = squid_unix_group.8
+EXTRA_DIST                     = squid_unix_group.8 config.test
 squid_unix_group_SOURCES       = check_group.c
 
 LDADD = \
index 6de527bb953bbee765bf5276f17d4198447a7a83..3bcc752b6f8dc81795a64e41f1ee201e83355f97 100644 (file)
@@ -1,12 +1,4 @@
-#
-#  Makefile for the Squid LDAP authentication helper
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 libexec_SCRIPTS        = wbinfo_group.pl
 #man_MANS              = squid_wbinfo_group.8
 #EXTRA_DIST            = squid_wbinfo_group.8
-EXTRA_DIST             = wbinfo_group.pl
+EXTRA_DIST             = wbinfo_group.pl config.test
index b9af8921e51af7add3cb3c7339a2959809ee829d..fdaf038639ae1e918d170258b7d18808eb74697d 100755 (executable)
@@ -1,8 +1,12 @@
 #!/bin/sh
-if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/wbinfo -a -x /usr/bin/perl ]; then
-       exit 0
-fi
-if [ -x /usr/bin/wbinfo -a -x /usr/bin/perl ]; then
-       exit 0
-fi
+
+for sambaprefix in ${SAMBAPREFIX} /usr/local /opt /opt/samba /usr/local/samba /usr
+do
+    for perlprefix in /usr /usr/local /opt /opt/perl
+    do
+        if [ -x $sambaprefix/bin/wbinfo -a -x $perlprefix/bin/perl ]; then
+            exit 0
+        fi
+    done
+done
 exit 1
index e0025761c4c54926b1456acbfc9a24b8374e548d..0599adaddfbbf293e718253a48ee8559108bfd9f 100644 (file)
@@ -16,4 +16,4 @@ mswin_negotiate_auth_SOURCES = libnegotiatessp.c negotiate_auth.c negotiate.h
 
 LDADD          = -L$(top_builddir)/lib -lsspwin32 -ladvapi32 -lmiscutil $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test
index 8e8f102949c021e8d56c107009e45a643d929321..d9c85c7f5b59269ade130253e24a7c2125b8d78c 100644 (file)
@@ -1,11 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-#  Uncomment and customize the following to suit your needs:
-#
-
 include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = fakeauth_auth
@@ -19,3 +11,5 @@ LDADD = \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test
index 0e5b9e60133544626835b5244e8dd94009294eb6..86c0adfe15402e1be30f218fa0c9369028a7d247 100644 (file)
@@ -1,9 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  $Id$
-#
-
 include $(top_srcdir)/src/Common.am
 
 libexec_PROGRAMS = mswin_ntlm_auth
@@ -21,4 +15,4 @@ LDADD = \
        -ladvapi32 \
        $(XTRA_LIBS)
 
-EXTRA_DIST = readme.txt
+EXTRA_DIST = readme.txt config.test
index fdfc3147412abcda1c1c7bb5d396caad35556e2e..305888add33f7cffed56c1e73a1d05010986b4f7 100644 (file)
@@ -10,5 +10,5 @@ libexec_SCRIPTS       = no_check.pl
 
 EXTRA_DIST = \
        no_check.pl \
-       README.no_check_ntlm_auth
-
+       README.no_check_ntlm_auth \
+       config.test
index afeb4932c7d2180f8703dc4ced743c4a74fadfa6..1222348955a88515881dc6ef91046de00c4ea299 100644 (file)
@@ -1,7 +1,3 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-
 include $(top_srcdir)/src/Common.am
 
 SUBDIRS = smbval
@@ -20,3 +16,5 @@ LDADD = \
        smbval/libsmbvalid.a \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
+
+EXTRA_DIST = config.test