From 5c0620bda3eeb777bc3c820bd4ce3701fb5e2b9ad9535100e5e96d7a7217fdef Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 10 Apr 2017 11:26:28 +0000
Subject: [PATCH] Accepting request 487025 from server:proxy:Test

1

OBS-URL: https://build.opensuse.org/request/show/487025
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=119
---
 squid-3.5.24.tar.xz     |  3 ---
 squid-3.5.24.tar.xz.asc | 20 --------------------
 squid-3.5.25.tar.xz     |  3 +++
 squid-3.5.25.tar.xz.asc | 20 ++++++++++++++++++++
 squid.changes           | 11 +++++++++++
 squid.spec              |  2 +-
 6 files changed, 35 insertions(+), 24 deletions(-)
 delete mode 100644 squid-3.5.24.tar.xz
 delete mode 100644 squid-3.5.24.tar.xz.asc
 create mode 100644 squid-3.5.25.tar.xz
 create mode 100644 squid-3.5.25.tar.xz.asc

diff --git a/squid-3.5.24.tar.xz b/squid-3.5.24.tar.xz
deleted file mode 100644
index e484220..0000000
--- a/squid-3.5.24.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fe29f582eef357faa541a53835b6885e24e6f28b80a3abcdf3b57f5393bbdb2
-size 2326424
diff --git a/squid-3.5.24.tar.xz.asc b/squid-3.5.24.tar.xz.asc
deleted file mode 100644
index 0c0fc10..0000000
--- a/squid-3.5.24.tar.xz.asc
+++ /dev/null
@@ -1,20 +0,0 @@
-File: squid-3.5.24.tar.xz
-Date: Sat Jan 28 08:22:04 UTC 2017
-Size: 2326424
-MD5 : 3fae511e16b6379b61c011914673973d
-SHA1: f203637783301a4b86e554b6dd226de721762ae5
-Key : 0xFF5CF463 <squid3@treenet.co.nz>
-            EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
-      keyring = http://www.squid-cache.org/pgp.asc
-      keyserver = subkeys.pgp.net
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE6jHMXpSI5RaNLcxesmjnBv9c9GMFAliMVWgACgkQsmjnBv9c
-9GP0QwgAwRR2s/Y3gZu+iI1teUmPx31vuJZsQqtmEaF9aG+/Yv0slTzET2M43W6w
-EPWPhV1MvEGExQNFE1UN+tpCtaS3JnGYihOuaUGIRyrtqxs5ksvzGTCXp2fb8J+b
-hEbbgMvEAf8ijQ7ExaBsE7fUazdzAIZtzRXsuGP/fQy91CQ6C5ZOnBKHHe81uIRz
-5eCHo2ro23Can2KEwQpLG4XsGxnII6SqVK3Vx83790q8jZP/qbTp1KcR6NxEyBNl
-+0SNyzjvdqMi2uXPBOzA0H2RXCdEOJdMdQGSQrgHaiPvg2jf1737zqYtMEYaeYgf
-+Z7IgU0kdiq/jwGHgVPJLdRZasXi+g==
-=hZv8
------END PGP SIGNATURE-----
diff --git a/squid-3.5.25.tar.xz b/squid-3.5.25.tar.xz
new file mode 100644
index 0000000..3b3c5a1
--- /dev/null
+++ b/squid-3.5.25.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585
+size 2327316
diff --git a/squid-3.5.25.tar.xz.asc b/squid-3.5.25.tar.xz.asc
new file mode 100644
index 0000000..01969f9
--- /dev/null
+++ b/squid-3.5.25.tar.xz.asc
@@ -0,0 +1,20 @@
+File: squid-3.5.25.tar.xz
+Date: Sun Apr  2 20:29:16 UTC 2017
+Size: 2327316
+MD5 : 6b7dd7b42b1adacf08f3155640ea2782
+SHA1: 63ea00cb918e3106fd91b286ec907f1681e0f0e8
+Key : 0xFF5CF463 <squid3@treenet.co.nz>
+            EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = subkeys.pgp.net
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEE6jHMXpSI5RaNLcxesmjnBv9c9GMFAljhX8EACgkQsmjnBv9c
+9GMjFgf9ED5brd68IQQ1YNx5ecX5ni5A8rggShgE2h2EtBnBicj4c8CRwX82VXwm
+0yIGHe/reWzppkDGcBaflgyAWGdmUkQR5EixlkBAmwtLAAlJauxeUBxSunxbzn96
+ysFNmV0GEmzL7ZWJHjFQj4Bd2HnnDRFUbpdK37/lUVJVt2NZ7xtZm+Tcf7cm59Pn
+OwKsjrGXui+/DoK3lktvn/U4JYsITjVRIc/OcuBW2CM2GlPYSfmTfswIAOVWfb6+
+btP4pyHSaDaxzw616CSm6HXebL0SHt2CUGrcuCENkSGWj8KiTYBzXpXYDdcblmVp
+1VFdZQcBMPkD3LVVoKA/HahRSjQgxw==
+=yE6f
+-----END PGP SIGNATURE-----
diff --git a/squid.changes b/squid.changes
index 95218e4..5b7f89e 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr 10 09:50:21 UTC 2017 - adam.majer@suse.de
+
+- Update Squid to 3.5.25
+  * Fix host forgery stalls intercepted being-spliced connections
+  * Native FTP relay fixes, now able to cope with active-mode
+    FTP DATA connections when intercepting FTP traffic.
+  * SSL Bump client fixes. Error responses for issues encountered
+    early in the TLS/SSL handling being sent to clients unencrypted
+    when Squid should have bumped and delivered them encrypted.
+
 -------------------------------------------------------------------
 Wed Mar 22 14:28:05 UTC 2017 - adam.majer@suse.de
 
diff --git a/squid.spec b/squid.spec
index a62819b..0203256 100644
--- a/squid.spec
+++ b/squid.spec
@@ -20,7 +20,7 @@
 %define         squidconfdir %{_sysconfdir}/squid
 
 Name:           squid
-Version:        3.5.24
+Version:        3.5.25
 Release:        0
 Summary:        A fully featured HTTP/1.0 proxy
 License:        GPL-2.0+