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

[dmichelsen at users.sourceforge.net]

Revision: 26734
          http://sourceforge.net/p/gar/code/26734
Author:   dmichelsen
Date:     2021-02-10 18:02:44 +0000 (Wed, 10 Feb 2021)
Log Message:
-----------
squid/trunk: Update to 4.14

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

Removed Paths:
-------------
    csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2021-02-09 09:39:30 UTC (rev 26733)
+++ csw/mgar/pkg/squid/trunk/Makefile	2021-02-10 18:02:44 UTC (rev 26734)
@@ -2,7 +2,7 @@
 # $Id$
 #
 NAME = squid
-VERSION = 4.13
+VERSION = 4.14
 GARTYPE = v2
 
 DESCRIPTION = High performance Web proxy cache
@@ -19,7 +19,6 @@
 # Add workaround until this is fixed:
 #   https://bugs.squid-cache.org/show_bug.cgi?id=5073
 PATCHFILES += 0001-Add-include-for-index.patch
-PATCHFILES += 0001-Replace-index-with-strchr.patch
 
 PACKAGES = CSWsquid
 RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2021-02-09 09:39:30 UTC (rev 26733)
+++ csw/mgar/pkg/squid/trunk/checksums	2021-02-10 18:02:44 UTC (rev 26734)
@@ -1 +1 @@
-492e54afc15821141ff1d1d9903854d6  squid-4.13.tar.xz
+7d9ba82703cd770b2ede169a0c1de94a  squid-4.14.tar.xz

Deleted: csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch
===================================================================
--- csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch	2021-02-09 09:39:30 UTC (rev 26733)
+++ csw/mgar/pkg/squid/trunk/files/0001-Replace-index-with-strchr.patch	2021-02-10 18:02:44 UTC (rev 26734)
@@ -1,40 +0,0 @@
-From 69cb6c1e72e45a8142667b37f6601710005e37a4 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 24 Aug 2020 08:04:31 +0200
-Subject: [PATCH] Replace 'index' with 'strchr'
-
----
- src/esi/VarState.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc
-index c98b285..41fe535 100644
---- a/src/esi/VarState.cc
-+++ b/src/esi/VarState.cc
-@@ -150,7 +150,7 @@ ESIVariableUserAgent::getProductVersion (char const *s)
- {
-     char const *t;
-     int len;
--    t = index(s,'/');
-+    t = strchr(s,'/');
- 
-     if (!t || !*(++t))
-         return xstrdup("");
-@@ -328,12 +328,12 @@ ESIVariableUserAgent::ESIVariableUserAgent(ESIVarState &state)
- 
-         if ((t = strstr (s, "MSIE"))) {
-             browser = ESI_BROWSER_MSIE;
--            t = index (t, ' ');
-+            t = strchr (t, ' ');
- 
-             if (!t)
-                 browserversion = xstrdup("");
-             else {
--                t1 = index(t, ';');
-+                t1 = strchr(t, ';');
- 
-                 if (!t1)
-                     browserversion = xstrdup(t + 1);
--- 
-2.4.0
-

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