SF.net SVN: gar:[23215] csw/mgar/pkg/squid/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Mar 14 12:10:25 CET 2014
Revision: 23215
http://sourceforge.net/p/gar/code/23215
Author: dmichelsen
Date: 2014-03-14 11:10:24 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
squid/trunk: Update to 3.4.4
Modified Paths:
--------------
csw/mgar/pkg/squid/trunk/Makefile
csw/mgar/pkg/squid/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/squid/trunk/files/0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
Property Changed:
----------------
csw/mgar/pkg/squid/trunk/
Index: csw/mgar/pkg/squid/trunk
===================================================================
--- csw/mgar/pkg/squid/trunk 2014-03-14 10:17:22 UTC (rev 23214)
+++ csw/mgar/pkg/squid/trunk 2014-03-14 11:10:24 UTC (rev 23215)
Property changes on: csw/mgar/pkg/squid/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1 ##
-cookies
-download
work
Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile 2014-03-14 10:17:22 UTC (rev 23214)
+++ csw/mgar/pkg/squid/trunk/Makefile 2014-03-14 11:10:24 UTC (rev 23215)
@@ -2,11 +2,7 @@
# $Id$
#
NAME = squid
-VERSION = 3.1
-RELEASE = 20
-DISTVERSION = $(VERSION).$(RELEASE)
-DISTNAME = squid-$(DISTVERSION)
-RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/')
+VERSION = 3.4.4
GARTYPE = v2
DESCRIPTION = High performance Web proxy cache
@@ -16,23 +12,35 @@
bandwith usage. Squid runs on all popular Unix and Windows platforms.
endef
+V1 = $(shell echo $(VERSION) | cut -d. -f1)
+V12 = $(shell echo $(VERSION) | cut -d. -f1,2)
+MASTER_SITES = http://www.squid-cache.org/Versions/v$(V1)/$(V12)/
+DISTFILES += $(DISTNAME).tar.bz2
+
PACKAGES = CSWsquid
-RUNTIME_DEP_PKGS += CSWliblber2-4-2
-RUNTIME_DEP_PKGS += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS += CSWlibsasl2-2
-RUNTIME_DEP_PKGS += CSWlibltdl7
-RUNTIME_DEP_PKGS += CSWperl
-RUNTIME_DEP_PKGS += CSWlibgcc-s1
-RUNTIME_DEP_PKGS += CSWlibstdc++6
-RUNTIME_DEP_PKGS += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS += CSWbdb48
+RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWsquid += CSWperl
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWsquid += CSWbdb48
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWsquid += CSWlibcom-err3
+# Linker anomaly
+CHECKPKG_OVERRIDES_CSWsquid += surplus-dependency|CSWlibintl8
+
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-INITSMF = /etc/opt/csw/init.d/csw$(NAME)
-PRESERVECONF = /etc/opt/csw/$(NAME)/cachemgr.conf
-PRESERVECONF = /etc/opt/csw/$(NAME)/squid.conf
-PRESERVECONF = /etc/opt/csw/$(NAME)/mime.conf
+INITSMF += /etc/opt/csw/init.d/csw$(NAME)
+PRESERVECONF += /etc/opt/csw/$(NAME)/cachemgr.conf
+PRESERVECONF += /etc/opt/csw/$(NAME)/squid.conf
+PRESERVECONF += /etc/opt/csw/$(NAME)/mime.conf
+PRESERVECONF += /etc/opt/csw/$(NAME)/msntauth.conf
MIGRATE_SOURCE_DIR = /opt/csw/etc
MIGRATE_DEST_DIR = /etc/opt/csw/$(NAME)
@@ -40,31 +48,26 @@
MIGRATE_FILES += mime.conf
MIGRATE_FILES += squid.conf
-MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/
-DISTFILES = squid-$(DISTVERSION).tar.bz2
+##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 += 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
-#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 += 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)
-
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --sysconfdir=${sysconfdir}
+CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/$(NAME)
CONFIGURE_ARGS += --datadir=$(datadir)/$(NAME)
CONFIGURE_ARGS += --docdir=$(datadir)/$(NAME)
CONFIGURE_ARGS += --localstatedir=/var/$(prefix)/$(NAME)
CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/$(NAME)
CONFIGURE_ARGS += --enable-arp-acl
-CONFIGURE_ARGS += --enable-auth=basic,ntlm,digest,negotiate
+#CONFIGURE_ARGS += --enable-auth=basic,ntlm,digest,negotiate
+CONFIGURE_ARGS += --enable-auth
CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA
CONFIGURE_ARGS += --enable-cache-digests
CONFIGURE_ARGS += --enable-carp
@@ -103,6 +106,17 @@
CONFIGURE_ARGS += --with-build-environment=$(BUILD_ENVIRONMENT-$(MEMORYMODEL))
+EXTRA_CPPFLAGS += -DDEFAULT_SQUID_CONF=\\\"$(sysconfdir)/$(NAME)/squid.conf\\\"
+
+# /opt/csw/bdb48/include/db_185.h needs slightly different type names than from sys/types.h
+EXTRA_CPPFLAGS += -Du_int32_t=uint32_t -Du_int16_t=uint16_t
+
+# Expose deprecated krb5 API as krb5_get_in_tkt_with_keytab is used in helpers/external_acl/kerberos_ldap_group/support_krb5.cc
+# Add #define until this is fixed:
+# http://bugs.squid-cache.org/show_bug.cgi?id=4025
+EXTRA_CPPFLAGS += -DKRB5_DEPRECATED=1
+CONFIGURE_ARGS += --disable-strict-error-checking
+
GARCOMPILER = GNU
EXTRA_LIB += $(prefix)/bdb48/lib
@@ -126,18 +140,15 @@
REINPLACE_USRLOCAL = $(mandir)/man8/squid_session.8
REINPLACE_WHEN_USRLOCAL = postinstall
-include gar/category.mk
+REINPLACEMENTS += conf
+REINPLACE_MATCH_conf = /usr/local/squid/etc/
+REINPLACE_WITH_conf = $(sysconfdir)/$(NAME)/
+REINPLACE_FILES_conf += helpers/basic_auth/MSNT/msntauth.conf.default
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE)
+EXTRA_MERGE_EXCLUDE_FILES += .*/msntauth\.conf\.default
-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
+include gar/category.mk
-#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/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums 2014-03-14 10:17:22 UTC (rev 23214)
+++ csw/mgar/pkg/squid/trunk/checksums 2014-03-14 11:10:24 UTC (rev 23215)
@@ -1 +1 @@
-c4d733a383c0508fd0746d64a2d7278a squid-3.1.20.tar.bz2
+f9c7dd495e45042cc162d89cfbb97cc0 squid-3.4.4.tar.bz2
Deleted: csw/mgar/pkg/squid/trunk/files/0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
===================================================================
--- csw/mgar/pkg/squid/trunk/files/0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch 2014-03-14 10:17:22 UTC (rev 23214)
+++ csw/mgar/pkg/squid/trunk/files/0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch 2014-03-14 11:10:24 UTC (rev 23215)
@@ -1,22 +0,0 @@
-From 9577cd3a6ec5cf5075419ebc99425236d2a61d3e Mon Sep 17 00:00:00 2001
-From: builder user <builder at opencsw.org>
-Date: Mon, 19 Sep 2011 15:53:13 +0200
-Subject: [PATCH 0/1] Use /opt/csw/bin/bash for bootstrap.sh
-
----
- bootstrap.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bootstrap.sh b/bootstrap.sh
-index b41b147..e079783 100755
---- a/bootstrap.sh
-+++ b/bootstrap.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/opt/csw/bin/bash
- # Used to setup the configure.ac, autoheader and Makefile.in's if configure
- # has not been generated. This script is only needed for developers when
- # configure has not been run, or if a Makefile.am in a non-configured directory
---
-1.7.6
-
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