[csw-devel] SF.net SVN: gar:[18086] csw/mgar/pkg/squid/branches/squid3
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Wed May 23 13:17:00 CEST 2012
Revision: 18086
http://gar.svn.sourceforge.net/gar/?rev=18086&view=rev
Author: wilbury
Date: 2012-05-23 11:17:00 +0000 (Wed, 23 May 2012)
Log Message:
-----------
squid/branches/squid3: Use OpenCSW specific paths for various tests.
Modified Paths:
--------------
csw/mgar/pkg/squid/branches/squid3/Makefile
Added Paths:
-----------
csw/mgar/pkg/squid/branches/squid3/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch
Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-05-23 10:39:57 UTC (rev 18085)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-05-23 11:17:00 UTC (rev 18086)
@@ -22,8 +22,9 @@
RUNTIME_DEP_PKGS += CSWlibldap2-4-2
RUNTIME_DEP_PKGS += CSWlibssl0-9-8
RUNTIME_DEP_PKGS += CSWlibsasl2-2
+RUNTIME_DEP_PKGS += CSWlibltdl7
RUNTIME_DEP_PKGS += CSWperl
-RUNTIME_DEP_PKGS += CSWlibltdl7
+RUNTIME_DEP_PKGS += CSWbdb48
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -47,6 +48,7 @@
PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
PATCHFILES += 0006-Use-default-cache_dir.patch
PATCHFILES += 0006-Use-usr-xpg4-bin-egrep.patch
+PATCHFILES += 0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch
sysconfdir = /etc/opt/csw/$(NAME)
@@ -78,6 +80,8 @@
CONFIGURE_ARGS += --with-default-user=$(NAME)
GARCOMPILER = GNU
+EXTRA_LDFLAGS += $(prefix)/bdb48/lib
+EXTRA_INC += $(prefix)/bdb48/include
TEST_TARGET =
Added: csw/mgar/pkg/squid/branches/squid3/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch 2012-05-23 11:17:00 UTC (rev 18086)
@@ -0,0 +1,127 @@
+From 53850c51d38b55e7fb0180a04d5ffb9cb99108ca Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 23 May 2012 13:13:09 +0200
+Subject: [PATCH] Use OpenCSW-specific paths for various helper tests.
+
+---
+ helpers/basic_auth/LDAP/config.test | 6 ++----
+ helpers/basic_auth/SASL/config.test | 5 +----
+ helpers/digest_auth/eDirectory/config.test | 5 +----
+ helpers/digest_auth/ldap/config.test | 5 +----
+ helpers/external_acl/ldap_group/config.test | 5 +----
+ helpers/external_acl/session/config.test | 4 ++--
+ helpers/external_acl/wbinfo_group/config.test | 4 ++--
+ 7 files changed, 10 insertions(+), 24 deletions(-)
+
+diff --git a/helpers/basic_auth/LDAP/config.test b/helpers/basic_auth/LDAP/config.test
+index 5c354f8..f22847e 100755
+--- a/helpers/basic_auth/LDAP/config.test
++++ b/helpers/basic_auth/LDAP/config.test
+@@ -1,8 +1,6 @@
+ #!/bin/sh
+-if [ -f /usr/include/ldap.h ]; then
+- exit 0
+-fi
+-if [ -f /usr/include/winldap.h ]; then
++# Use ldap.h from OpenLDAP
++if [ -f /opt/csw/include/ldap.h ]; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/basic_auth/SASL/config.test b/helpers/basic_auth/SASL/config.test
+index 8054c95..64fe038 100755
+--- a/helpers/basic_auth/SASL/config.test
++++ b/helpers/basic_auth/SASL/config.test
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+-if [ -f /usr/include/sasl.h ]; then
+- exit 0
+-fi
+-if [ -f /usr/include/sasl/sasl.h ]; then
++if [ -f /opt/csw/include/sasl/sasl.h ]; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/digest_auth/eDirectory/config.test b/helpers/digest_auth/eDirectory/config.test
+index 5c354f8..b3a8960 100755
+--- a/helpers/digest_auth/eDirectory/config.test
++++ b/helpers/digest_auth/eDirectory/config.test
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+-if [ -f /usr/include/ldap.h ]; then
+- exit 0
+-fi
+-if [ -f /usr/include/winldap.h ]; then
++if [ -f /opt/csw/include/ldap.h ]; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/digest_auth/ldap/config.test b/helpers/digest_auth/ldap/config.test
+index 5c354f8..b3a8960 100755
+--- a/helpers/digest_auth/ldap/config.test
++++ b/helpers/digest_auth/ldap/config.test
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+-if [ -f /usr/include/ldap.h ]; then
+- exit 0
+-fi
+-if [ -f /usr/include/winldap.h ]; then
++if [ -f /opt/csw/include/ldap.h ]; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/external_acl/ldap_group/config.test b/helpers/external_acl/ldap_group/config.test
+index 5c354f8..b3a8960 100755
+--- a/helpers/external_acl/ldap_group/config.test
++++ b/helpers/external_acl/ldap_group/config.test
+@@ -1,8 +1,5 @@
+ #!/bin/sh
+-if [ -f /usr/include/ldap.h ]; then
+- exit 0
+-fi
+-if [ -f /usr/include/winldap.h ]; then
++if [ -f /opt/csw/include/ldap.h ]; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/external_acl/session/config.test b/helpers/external_acl/session/config.test
+index 83b0f99..f41a6d8 100755
+--- a/helpers/external_acl/session/config.test
++++ b/helpers/external_acl/session/config.test
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+
+ # Actual intended test
+-if [ -f /usr/include/db_185.h ]; then
++if [ -f /opt/csw/bdb48/include/db_185.h ]; then
+ exit 0
+ fi
+-if [ -f /usr/include/db.h ] && grep dbopen /usr/include/db.h; then
++if [ -f /opt/csw/bdb48/include/db.h ] && grep dbopen /opt/csw/bdb48/include/db.h; then
+ exit 0
+ fi
+ exit 1
+diff --git a/helpers/external_acl/wbinfo_group/config.test b/helpers/external_acl/wbinfo_group/config.test
+index d361121..6f60f8f 100755
+--- a/helpers/external_acl/wbinfo_group/config.test
++++ b/helpers/external_acl/wbinfo_group/config.test
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ samba_found="no"
+-for sambaprefix in /usr/local /opt /opt/samba /usr/local/samba /usr
++for sambaprefix in /opt/csw /usr/local /opt /opt/samba /usr/local/samba /usr
+ do
+ if [ -x $sambaprefix/bin/wbinfo ]; then
+ samba_found="yes"
+@@ -9,7 +9,7 @@ done
+ if test "$samba_found" = "no"; then
+ echo "WARNING: Samba wbinfo not found in default location. wbinfo_group.pl may not work on this machine"
+ fi
+-for perlprefix in /usr /usr/local /opt /opt/perl
++for perlprefix in /opt/csw /usr /usr/local /opt /opt/perl
+ do
+ if [ -x $perlprefix/bin/perl ]; then
+ exit 0
+--
+1.7.10
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list