SF.net SVN: gar:[26345] csw/mgar/pkg/squid/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jan 29 10:54:25 CET 2018


Revision: 26345
          http://sourceforge.net/p/gar/code/26345
Author:   dmichelsen
Date:     2018-01-29 09:54:25 +0000 (Mon, 29 Jan 2018)
Log Message:
-----------
squid/trunk: Update to 3.5.27

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/Makefile
    csw/mgar/pkg/squid/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/squid/trunk/files/0001-Solaris-requires-at-least-one-symbol.patch

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2018-01-29 08:37:24 UTC (rev 26344)
+++ csw/mgar/pkg/squid/trunk/Makefile	2018-01-29 09:54:25 UTC (rev 26345)
@@ -2,7 +2,7 @@
 # $Id$
 #
 NAME = squid
-VERSION = 3.5.26
+VERSION = 3.5.27
 GARTYPE = v2
 
 DESCRIPTION = High performance Web proxy cache
@@ -19,7 +19,9 @@
 DISTFILES += CSWsquid3.cswusergroup
 DISTFILES += cswsquid.xml
 
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# Apply patch, this will probably not be fixed upstream:
+#   https://bugs.launchpad.net/percona-server/+bug/699896
+PATCHFILES += 0001-Solaris-requires-at-least-one-symbol.patch
 
 PACKAGES = CSWsquid
 RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2
@@ -30,7 +32,6 @@
 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
@@ -148,9 +149,6 @@
 GARCOMPILER = GNU
 # GARCOMPILER = SOS12U4
 
-#EXTRA_LIB += $(prefix)/bdb48/lib
-#EXTRA_INC += $(prefix)/bdb48/include
-
 # The testsuite requires cppunit
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2018-01-29 08:37:24 UTC (rev 26344)
+++ csw/mgar/pkg/squid/trunk/checksums	2018-01-29 09:54:25 UTC (rev 26345)
@@ -1 +1 @@
-dc1830cd361e077814aa39bcc3691d8b  squid-3.5.26.tar.bz2
+c17a3ed3a40cd59c23f48b8539dafcd8  squid-3.5.27.tar.bz2

Added: csw/mgar/pkg/squid/trunk/files/0001-Solaris-requires-at-least-one-symbol.patch
===================================================================
--- csw/mgar/pkg/squid/trunk/files/0001-Solaris-requires-at-least-one-symbol.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/trunk/files/0001-Solaris-requires-at-least-one-symbol.patch	2018-01-29 09:54:25 UTC (rev 26345)
@@ -0,0 +1,25 @@
+From e37b6ca3a94c4a1d1c542c91f86f26942a9df2a4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 29 Jan 2018 10:03:57 +0100
+Subject: [PATCH] Solaris requires at least one symbol
+
+---
+ src/ident/AclIdent.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ident/AclIdent.cc b/src/ident/AclIdent.cc
+index d3348f5..b62fe5b 100644
+--- a/src/ident/AclIdent.cc
++++ b/src/ident/AclIdent.cc
+@@ -136,6 +136,7 @@ IdentLookup::LookupDone(const char *ident, void *data)
+ 
+     checklist->resumeNonBlockingCheck(IdentLookup::Instance());
+ }
+-
++#else
++  int Solaris_requires_a_symbol_here= 0;
+ #endif /* USE_IDENT */
+ 
+-- 
+2.4.0
+

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