[csw-devel] SF.net SVN: gar:[18425] csw/mgar/pkg/squid/branches

[dmichelsen at users.sourceforge.net]

Revision: 18425
          http://gar.svn.sourceforge.net/gar/?rev=18425&view=rev
Author:   dmichelsen
Date:     2012-06-15 13:00:46 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
squid3-dam: Make private branch, update to 3.1.20

Modified Paths:
--------------
    csw/mgar/pkg/squid/branches/squid3-dam/Makefile
    csw/mgar/pkg/squid/branches/squid3-dam/checksums

Added Paths:
-----------
    csw/mgar/pkg/squid/branches/squid3-dam/

Modified: csw/mgar/pkg/squid/branches/squid3-dam/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2012-06-14 14:50:28 UTC (rev 18406)
+++ csw/mgar/pkg/squid/branches/squid3-dam/Makefile	2012-06-15 13:00:46 UTC (rev 18425)
@@ -4,7 +4,7 @@
 NAME = squid
 VERSION = 3.1
 CATEGORIES = server
-RELEASE = 19
+RELEASE = 20
 DISTVERSION = $(VERSION).$(RELEASE)
 DISTNAME = squid-$(DISTVERSION)
 RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/')
@@ -44,13 +44,16 @@
 MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/
 DISTFILES = squid-$(DISTVERSION).tar.bz2
 
-PATCHFILES =  0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
-PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch
-PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
+#PATCHFILES =  0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
+#PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch
+#PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
 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 += 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
+
+# Use patch until this is fixed:
+#   http://bugs.squid-cache.org/show_bug.cgi?id=3572
 PATCHFILES += 0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch
 
 sysconfdir = /etc/$(prefix)/$(NAME)
@@ -85,11 +88,29 @@
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-default-user=$(NAME)
 
+# Allowed values (see configure --help):
+#   POSIX_V6_ILP32_OFF32   32 bits
+#   POSIX_V6_ILP32_OFFBIG  32 bits with large file support
+#   POSIX_V6_LP64_OFF64    64 bits
+#   POSIX_V6_LPBIG_OFFBIG  large pointers and files
+#   XBS5_ILP32_OFF32       32 bits (legacy)
+#   XBS5_ILP32_OFFBIG      32 bits with large file support (legacy)
+#   XBS5_LP64_OFF64        64 bits (legacy)
+#   XBS5_LPBIG_OFFBIG      large pointers and files (legacy)
+#   default                The default for your OS
+
+BUILD_ENVIRONMENT-32 = POSIX_V6_ILP32_OFFBIG
+BUILD_ENVIRONMENT-64 = POSIX_V6_LPBIG_OFFBIG
+
+CONFIGURE_ARGS += --with-build-environment=$(BUILD_ENVIRONMENT-$(MEMORYMODEL))
+
 GARCOMPILER = GNU
-EXTRA_LDFLAGS += -L$(prefix)/bdb48/lib -R$(prefix)/bdb48/lib
+
+EXTRA_LIB += $(prefix)/bdb48/lib
 EXTRA_INC += $(prefix)/bdb48/include
 
-TEST_TARGET = 
+# The testsuite requires cppunit
+TEST_SCRIPTS =
 
 SAMPLECONF = squid.conf
 SAMPLECONF += cachemgr.conf
@@ -110,10 +131,14 @@
 
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE)
 
-pre-configure-modulated:
-	cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh
-	@$(MAKECOOKIE)
+post-extract-modulated:
+	-echo "#!/bin/sh\nexit 0" > $(WORKSRC)/helpers/negotiate_auth/squid_kerb_auth/config.test
+	-chmod 755 $(WORKSRC)/helpers/negotiate_auth/squid_kerb_auth/config.test
 
+#pre-configure-modulated:
+#	cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh
+#	@$(MAKECOOKIE)
+
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs

Modified: csw/mgar/pkg/squid/branches/squid3-dam/checksums
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/checksums	2012-06-14 14:50:28 UTC (rev 18406)
+++ csw/mgar/pkg/squid/branches/squid3-dam/checksums	2012-06-15 13:00:46 UTC (rev 18425)
@@ -1 +1 @@
-9b6ffaf96bee8f05f0085bc6361d7c94  squid-3.1.19.tar.bz2
+c4d733a383c0508fd0746d64a2d7278a  squid-3.1.20.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.