Attachment 159481 Details for Bug 202053 – port update

[patch] port update

squid-3.5.7.patch (text/plain), 2.73 KB, created by Pavel Timofeev on 2015-08-03 07:19:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-08-03 07:19:26 UTC

Size: 2.73 KB

patch

obsolete

>diff -ruN /usr/home/timp/squid.orig/Makefile squid/Makefile
>--- /usr/home/timp/squid.orig/Makefile	2015-08-02 10:02:48.269952000 +0300
>+++ squid/Makefile	2015-08-02 09:58:27.078956000 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/www/squid/Makefile 391555 2015-07-08 09:30:17Z marino $
> 
> PORTNAME=	squid
>-PORTVERSION=	3.5.6
>+PORTVERSION=	3.5.7
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
> 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
>diff -ruN /usr/home/timp/squid.orig/distinfo squid/distinfo
>--- /usr/home/timp/squid.orig/distinfo	2015-08-02 10:02:48.270025000 +0300
>+++ squid/distinfo	2015-08-02 09:59:50.317738000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (squid3.5/squid-3.5.6.tar.xz) = cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5
>-SIZE (squid3.5/squid-3.5.6.tar.xz) = 2291152
>+SHA256 (squid3.5/squid-3.5.7.tar.xz) = ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699
>+SIZE (squid3.5/squid-3.5.7.tar.xz) = 2294580
>diff -ruN /usr/home/timp/squid.orig/files/patch-bug4190 squid/files/patch-bug4190
>--- /usr/home/timp/squid.orig/files/patch-bug4190	2015-08-02 10:02:48.270272000 +0300
>+++ squid/files/patch-bug4190	1970-01-01 03:00:00.000000000 +0300
>@@ -1,41 +0,0 @@
>---- src/auth/User.cc.orig	2015-03-18 13:22:42.134592000 +0300
>-+++ src/auth/User.cc	2015-03-18 13:26:48.850592000 +0300
>-@@ -309,10 +309,7 @@
>- Auth::User::BuildUserKey(const char *username, const char *realm)
>- {
>-     SBuf key;
>--    if (realm)
>--        key.Printf("%s:%s", username, realm);
>--    else
>--        key.append(username, strlen(username));
>-+    key.Printf("%s:%s", username, realm);
>-     return key;
>- }
>- 
>-@@ -368,11 +365,11 @@
>-     if (aString) {
>-         assert(!username_);
>-         username_ = xstrdup(aString);
>--        // NP: param #2 is working around a c_str() data-copy performance regression
>--        userKey_ = BuildUserKey(username_, (!requestRealm_.isEmpty() ? requestRealm_.c_str() : NULL));
>-+        if (!requestRealm_.isEmpty())
>-+            userKey_ = BuildUserKey(username_, requestRealm_.c_str());
>-+
>-     } else {
>-         safe_free(username_);
>--        userKey_.clear();
>-     }
>- }
>- 
>---- src/auth/User.h.orig	2015-03-18 13:27:30.809059000 +0300
>-+++ src/auth/User.h	2015-03-18 13:28:22.078121000 +0300
>-@@ -65,8 +65,7 @@
>-     char const *username() const { return username_; }
>-     void username(char const *); ///< set stored username and userKey
>- 
>--    // NP: key is set at the same time as username_. Until then both are empty/NULL.
>--    const char *userKey() {return !userKey_.isEmpty() ? userKey_.c_str() : NULL;}
>-+    const char *userKey() {return !userKey_.isEmpty() ? userKey_.c_str() : username_;}
>- 
>-     /**
>-      * How long these credentials are still valid for.

Actions: View | Diff

Attachments on bug 202053: 159481 | 159482 | 159565 | 159566