main/squid: upgrade to 3.5.2

MSNT auth module was renamed to SMB_LM, so update that.
remove upstreamed and unneeded patches.

3 files changed, 5 insertions, 167 deletions

diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 27571e077a..6073de5cd4 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=squid
-pkgver=3.4.12
+pkgver=3.5.2
 pkgrel=0
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
@@ -19,8 +19,6 @@ linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ko lt
 langdir="/usr/share/squid/errors"
 
 source="http://www.squid-cache.org/Versions/v3/${pkgver%.*}/squid-${pkgver}.tar.xz
-	urlgroup.patch
-	cf_gen-pthread.patch
 	bug-3679.patch
 	squid.initd
 	squid.confd
@@ -56,7 +54,7 @@ build() {
 		--disable-strict-error-checking \
 		--enable-removal-policies="lru,heap" \
 		--enable-auth-digest \
-		--enable-auth-basic="getpwnam,NCSA,SMB,MSNT,RADIUS" \
+		--enable-auth-basic="getpwnam,NCSA,SMB,SMB_LM,RADIUS" \
 		--enable-epoll \
 		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
 		--enable-auth-ntlm="SSPI,fake,smb_lm" \
@@ -107,23 +105,17 @@ squid_kerb_auth() {
 	mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
 }
 
-md5sums="632b4dfc3d40b419cb4c060e01d547bf  squid-3.4.12.tar.xz
-aaa90395f61377c5d0efc6c662cbd643  urlgroup.patch
-473f8f6dabaec2bd73134d8288deea3d  cf_gen-pthread.patch
+md5sums="0330ec9f69e333c2a81fa4502ba96a22  squid-3.5.2.tar.xz
 9e71076799d334faba6f4954594e7b4a  bug-3679.patch
 947b668332a205626c854d0aece0f3e0  squid.initd
 73db59e6c1c242dbc748feeb116650e0  squid.confd
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
-sha256sums="a3f4f18fa17e81a8d8e1a2ec059cdbe3211a90ccd1717c3d9e092c0afdde2864  squid-3.4.12.tar.xz
-c08ffe0bba9b9964540bdc9bbfa2eca233dbb78a55a21537cb257d25070d8a21  urlgroup.patch
-3b05ebd2d4baeb0e01437de768c8fbe76ff446f126d107b73fad6bd0d1968f0c  cf_gen-pthread.patch
+sha256sums="5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f  squid-3.5.2.tar.xz
 6b08cd129ea5fef019c78f1818c628e1070fe767e362da14844396b671f5a18d  bug-3679.patch
 29eb267e6ebf9b409836b35ba37f263924f40c30cd0c24b91b1ddce380f2163b  squid.initd
 4012fc97d7ab653c8a73c4dac09751de80c847a90ee2483ddd41a04168cdeb2b  squid.confd
 b6efdb3261c2e4b5074ef49160af8b96e65f934c7fd64b8954df48aa41cd9b67  squid.logrotate"
-sha512sums="7745e1a8ba7f458eae9b9017c16a13c3e724d54be48fc592fda9715d047db6f13a7b59dd9b6bd80e2f450373f30f7307a34d7d3cb3ff192a10abd8eb30da8b0a  squid-3.4.12.tar.xz
-88004f016431f2d73b308f925c90914f49ad5c2e2f20e8ae1578ed174ebf9f6e74e75c4398db2137fb3f3941c0edac6a78e2b1b9fbc603b3b242ff4601295042  urlgroup.patch
-c5a230fe1f4dda8a3ab064f07c2b93a6f6e3ebdf290cb45da262300d06ac28aa4470a80c8f14db5c9ff4dcc478933d9882bef638a566fe8ad66aec1f96f80be3  cf_gen-pthread.patch
+sha512sums="c6ce7a1dc19919f489b096a4cfb0c9a4787090168d6fadb9ec0519abe5ddb15388477af41cf21586e84027a89c41ac29b02872a014b29273e808cd9fd1f00c27  squid-3.5.2.tar.xz
 b477397f205ba207502a42aae674c85cad85eec831158ea0834361d98ef09a0f103d7a847e101bdd0ece73bbdda9b545960edd5385042bd593733810977e292a  bug-3679.patch
 3da7673cde48aac9d7f45b0c0208c2608dd66b3fa70f897b83cb3d0a4f9ba88f3e3706cbab65eb811e77a52643d8616350c84ab599d8e617212f934cb44ffc99  squid.initd
 7292661de344e8a87d855c83afce49511685d2680effab3afab110e45144c0117935f3bf73ab893c9e6d43f7fb5ba013635e24f6da6daf0eeb895ef2e9b5baa9  squid.confd
diff --git a/main/squid/cf_gen-pthread.patch b/main/squid/cf_gen-pthread.patch
deleted file mode 100644
index 6daaceb253..0000000000
--- a/main/squid/cf_gen-pthread.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/Makefile.in.orig	2013-05-20 11:50:04.000000000 +0000
-+++ ./src/Makefile.in	2013-05-23 07:37:34.364978371 +0000
-@@ -2362,7 +2362,7 @@
- noinst_LTLIBRARIES = libsquid.la
- cf_gen_SOURCES = cf_gen.cc
- nodist_cf_gen_HEADER = cf_gen_defines.cci
--cf_gen_LDADD = 
-+cf_gen_LDADD =  -lpthread
- ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
- DISKIO_SOURCE = \
- 	DiskIO/DiskIOModule.cc \
-@@ -7295,7 +7295,7 @@
- 
- # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
--	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
-+	$(HOSTCXX) $(cf_gen_LDADD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
- 
- # squid.conf.default is built by cf_gen when making cf_parser.cci
- squid.conf.default squid.conf.documented: cf_parser.cci
diff --git a/main/squid/urlgroup.patch b/main/squid/urlgroup.patch
deleted file mode 100644
index 0a3dd30493..0000000000
--- a/main/squid/urlgroup.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -ru squid-3.4.5.orig/src/HttpRequest.cc squid-3.4.5/src/HttpRequest.cc
---- squid-3.4.5.orig/src/HttpRequest.cc	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/HttpRequest.cc	2014-05-07 10:38:04.849927660 -0300
-@@ -116,6 +116,7 @@
-     peer_domain = NULL;		// not allocated/deallocated by this class
-     peer_host = NULL;
-     vary_headers = NULL;
-+    urlgroup = null_string;
-     myportname = null_string;
-     tag = null_string;
- #if USE_AUTH
-@@ -164,6 +165,7 @@
-         range = NULL;
-     }
- 
-+    urlgroup.clean();
-     myportname.clean();
- 
-     notes = NULL;
-@@ -228,6 +230,7 @@
-     copy->vary_headers = vary_headers ? xstrdup(vary_headers) : NULL;
-     // XXX: what to do with copy->peer_domain?
- 
-+    copy->urlgroup = urlgroup;
-     copy->tag = tag;
-     copy->extacl_log = extacl_log;
-     copy->extacl_message = extacl_message;
-diff -ru squid-3.4.5.orig/src/HttpRequest.h squid-3.4.5/src/HttpRequest.h
---- squid-3.4.5.orig/src/HttpRequest.h	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/HttpRequest.h	2014-05-07 10:38:04.853260996 -0300
-@@ -201,6 +201,8 @@
- 
-     char *peer_domain;		/* Configured peer forceddomain */
- 
-+    String urlgroup;
-+
-     String myportname; // Internal tag name= value from port this requests arrived in.
- 
-     NotePairs::Pointer notes; ///< annotations added by the note directive and helpers
-diff -ru squid-3.4.5.orig/src/client_side_request.cc squid-3.4.5/src/client_side_request.cc
---- squid-3.4.5.orig/src/client_side_request.cc	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/client_side_request.cc	2014-05-07 11:34:39.291538415 -0300
-@@ -1265,6 +1265,10 @@
-         // #2: redirect with a default status code     OK url="..."
-         // #3: re-write the URL                        OK rewrite-url="..."
- 
-+        const char *urlgroupNote = reply.notes.findFirst("urlgroup");
-+        if (urlgroupNote != NULL)
-+            old_request->urlgroup.reset(urlgroupNote);
-+
-         const char *statusNote = reply.notes.findFirst("status");
-         const char *urlNote = reply.notes.findFirst("url");
- 
-diff -ru squid-3.4.5.orig/src/format/ByteCode.h squid-3.4.5/src/format/ByteCode.h
---- squid-3.4.5.orig/src/format/ByteCode.h	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/format/ByteCode.h	2014-05-07 10:38:04.853260996 -0300
-@@ -69,6 +69,7 @@
-     /*LFT_REQUEST_QUERY, */
-     LFT_REQUEST_VERSION_OLD_2X,
-     LFT_REQUEST_VERSION,
-+    LFT_REQUEST_URLGROUP,
- 
-     /* request header details pre-adaptation */
-     LFT_REQUEST_HEADER,
-diff -ru squid-3.4.5.orig/src/format/Format.cc squid-3.4.5/src/format/Format.cc
---- squid-3.4.5.orig/src/format/Format.cc	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/format/Format.cc	2014-05-07 10:38:04.853260996 -0300
-@@ -951,6 +951,12 @@
-             out = tmp;
-             break;
- 
-+        case LFT_REQUEST_URLGROUP:
-+            if (al->request)
-+                out = al->request->urlgroup.termedBuf();
-+            quote = 1;
-+            break;
-+
-         case LFT_SERVER_REQ_METHOD:
-             if (al->adapted_request) {
-                 out = al->adapted_request->method.image();
-diff -ru squid-3.4.5.orig/src/format/Token.cc squid-3.4.5/src/format/Token.cc
---- squid-3.4.5.orig/src/format/Token.cc	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/format/Token.cc	2014-05-07 10:38:04.853260996 -0300
-@@ -89,6 +89,7 @@
-     {"rp", LFT_REQUEST_URLPATH_OLD_31},
-     /* { "rq", LFT_REQUEST_QUERY }, * /     / * the query-string, INCLUDING the leading ? */
-     {"rv", LFT_REQUEST_VERSION},
-+    {"rG", LFT_REQUEST_URLGROUP},
- 
-     {"<rm", LFT_SERVER_REQ_METHOD},
-     {"<ru", LFT_SERVER_REQ_URI},
-diff -ru squid-3.4.5.orig/src/redirect.cc squid-3.4.5/src/redirect.cc
---- squid-3.4.5.orig/src/redirect.cc	2014-05-02 15:09:05.000000000 -0300
-+++ squid-3.4.5/src/redirect.cc	2014-05-07 13:09:56.813897270 -0300
-@@ -112,8 +112,7 @@
-                  * At this point altering the helper buffer in that way is not harmful, but annoying.
-                  * When Bug 1961 is resolved and urlParse has a const API, this needs to die.
-                  */
--                const char * result = reply.other().content();
--                const Http::StatusCode status = static_cast<Http::StatusCode>(atoi(result));
-+                char * result = reply.modifiableOther().content();
- 
-                 HelperReply newReply;
-                 // BACKWARD COMPATIBILITY 2012-06-15:
-@@ -123,6 +122,18 @@
-                 newReply.result = HelperReply::Okay;
-                 newReply.notes.append(&reply.notes);
- 
-+                // check and parse for urlgroup=
-+                if (*result == '!') {
-+                   char *t = strchr(result+1, '!');
-+                   if (t != NULL) {
-+                       *t = 0;
-+                       newReply.notes.add("urlgroup", result+1);
-+                       result = t + 1;
-+                   }
-+                }
-+
-+                const Http::StatusCode status = static_cast<Http::StatusCode>(atoi(result));
-+
-                 if (status == Http::scMovedPermanently
-                         || status == Http::scFound
-                         || status == Http::scSeeOther
-@@ -143,7 +154,8 @@
-                     // status code is not a redirect code (or does not exist)
-                     // treat as a re-write URL request
-                     // TODO: validate the URL produced here is RFC 2616 compliant URI
--                    newReply.notes.add("rewrite-url", reply.other().content());
-+                    if (*result)
-+                        newReply.notes.add("rewrite-url", result);
-                 }
- 
-                 void *cbdata;
-