From c8ee9aaee404fc7ffae9e22099169b324621150a1c97bcc2c8ca51a6119339da Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 13 Aug 2018 12:44:10 +0000
Subject: [PATCH] Accepting request 628925 from
 home:adamm:branches:server:proxy

- New upstream stable version 4.2:
  + fix HTTPMSGLOCK missing pointer safety
  + gcc-8 fixes
  + fix milliseconds logformats prepend 0s instead of spaces
  + fix %>ru logging of huge URLs

OBS-URL: https://build.opensuse.org/request/show/628925
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=163
---
 squid-4.1.tar.xz     |  3 ---
 squid-4.1.tar.xz.asc | 25 -------------------------
 squid-4.2.tar.xz     |  3 +++
 squid-4.2.tar.xz.asc | 25 +++++++++++++++++++++++++
 squid.changes        |  9 +++++++++
 squid.spec           |  2 +-
 6 files changed, 38 insertions(+), 29 deletions(-)
 delete mode 100644 squid-4.1.tar.xz
 delete mode 100644 squid-4.1.tar.xz.asc
 create mode 100644 squid-4.2.tar.xz
 create mode 100644 squid-4.2.tar.xz.asc

diff --git a/squid-4.1.tar.xz b/squid-4.1.tar.xz
deleted file mode 100644
index 80e1ef0..0000000
--- a/squid-4.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b61e486fe1ba1f5c918a48d5ae3929d3f604e347c3c7dceb1105a9f0e5ee9eb5
-size 2425892
diff --git a/squid-4.1.tar.xz.asc b/squid-4.1.tar.xz.asc
deleted file mode 100644
index 6a2771f..0000000
--- a/squid-4.1.tar.xz.asc
+++ /dev/null
@@ -1,25 +0,0 @@
-File: squid-4.1.tar.xz
-Date: Mon Jul  2 03:56:22 UTC 2018
-Size: 2425892
-MD5 : 9c6356352f25cac9fd0586344f349fbf
-SHA1: 591828f9524a6250b3d3926eb589ea598bc43d98
-Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
-            B068 84ED B779 C89B 044E  64E3 CD6D BF8E F3B1 7D3E
-      keyring = http://www.squid-cache.org/pgp.asc
-      keyserver = pool.sks-keyservers.net
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAls5om0ACgkQzW2/jvOx
-fT5kFA//fwkwm4I2FkEnyY5klJEdyofYHIFTA9t4XG146VRksGXd8DRgRj2u+QTg
-87v7pyaqurI41flHLtH+pnaCy2WdFU+fBwILSX6SPqpOAQULrNPbrjNLExVliYE0
-Y7XqnEDvJnngo07SYYC3er53bur/EL5yI5Tf4btlDGbWQTcHQqFP6q/IzGOK/xQ4
-pDD6vv2V5Olr+w3k4relDMtBrY43tVDF3J4pdl9zXHV8if2Pzni5UFXtMXMlHOqN
-z96iaerHcPxLO4BmGiHngXXREGWCin8gKiAhPXaaTkdir2P09KX+h02LyB5JbNz8
-nuwvapmQcCJ4l4nti+e3i23zEm7p0Oc8eIDiz64O9zmafBmVs/omYrOFfOj7HoLP
-Oe8Lxg4lrhmAUml3H5RHsJyBmmtMqNQxJqFI1rUXLCBYfxFyaW6c8xTRtaixTXip
-HfFsDbUOYQ/uKzMXMgUKU4+BixV5fJEDM3ZwSTsTkCLfzvG5/OwJ04fechhciGJL
-A2HDn3Aj+8m3JkKwT0n1GO95Q+rxuWm6gX2Fx9/uve8RhSu4Yq4sLQ+IsUna9RuJ
-fV9aCYY0ge27VpxXPcPIMKx/n9MbVaEcHyFvhNmGUsYTb3T7taXJ54dDQ97wVn3N
-uue0MKEqLy+WibwpKXaMXVM4qX/bO3ZYEauNxk8CELXD6yonu5Y=
-=WX3y
------END PGP SIGNATURE-----
diff --git a/squid-4.2.tar.xz b/squid-4.2.tar.xz
new file mode 100644
index 0000000..6860d93
--- /dev/null
+++ b/squid-4.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:994807762c59991b32449caf29418fd0ec9d2329746b18eb19bd930b6806d208
+size 2426856
diff --git a/squid-4.2.tar.xz.asc b/squid-4.2.tar.xz.asc
new file mode 100644
index 0000000..3cdcd2b
--- /dev/null
+++ b/squid-4.2.tar.xz.asc
@@ -0,0 +1,25 @@
+File: squid-4.2.tar.xz
+Date: Sun Aug  5 15:04:50 UTC 2018
+Size: 2426856
+MD5 : 2cf3f5f183d04322d798f98ea5ead43f
+SHA1: 77fd6f06e6028780faf85ba7e7e9aef0922e9dc0
+Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
+            B068 84ED B779 C89B 044E  64E3 CD6D BF8E F3B1 7D3E
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = pool.sks-keyservers.net
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAltnEhsACgkQzW2/jvOx
+fT5elRAAvdmTD1kxfE4CZEmp2SJ1KgfMaCXehFFtFYRbdi8oNYoN5u75mwgo2VO1
+WmBedYJ3c9UKyaqu5AIc60WRIE+boFBy0vvaJO5T+wl3Ay1SKkuS5253dllxg6RT
+r+1Kh9j72rchyBTerWClAydH5PRc9r5fNOzufJGTV8s/SCoAD+dxZHFZT6kad9U1
+n0+vcOM1I8dJCVNDakTXqY0zou/gURLfl7EJW/PYkHatJitXazoRVPROF0G1U4Xh
++/wDGj+1+bUEj7K4YIJ2/LfftnVY+c85UiG7URFZ32uNJx8aM7zevfSePdgN6U7c
+DUBvtIScI/b2NOgp3scNKuDFs61aLIx8qOjXa603xQs2xbsufCaTv8vFnEz/oO0F
++924pcT3Fbh3vYe3iWP9MejaFf2dDF+1OAGt2sY/LX10VO68bEGpF0fAWGbyDEOC
+HGk5cNdfUIK3TISbTOGzG7X3ysZ+5/UxtX4Q1y7x9vBVXGfdZrixfWG9BZkcYyxz
+SvykpFe9WvNw1zoIUED/8Sf1FgK0f+WGrpyCnDSDnUrJ26NZOtTkXkJgf239yNBH
+KUNgaTxH20Ix8mPGDohT5QgmvpULz0r5ZecHkeoYzyxvF8c6EFOdVt6Iq4jdOT3v
+QpcZhfxQhg8yklE+cQjbD0Qywc0QIu19Uzh5URDu4UrarsVVpKM=
+=I3Em
+-----END PGP SIGNATURE-----
diff --git a/squid.changes b/squid.changes
index ddb3da2..c4d2307 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 13 07:30:05 UTC 2018 - adam.majer@suse.de
+
+- New upstream stable version 4.2:
+  + fix HTTPMSGLOCK missing pointer safety
+  + gcc-8 fixes
+  + fix milliseconds logformats prepend 0s instead of spaces
+  + fix %>ru logging of huge URLs
+
 -------------------------------------------------------------------
 Thu Jul  5 15:30:07 UTC 2018 - adam.majer@suse.de
 
diff --git a/squid.spec b/squid.spec
index 2df110e..bd18a3e 100644
--- a/squid.spec
+++ b/squid.spec
@@ -19,7 +19,7 @@
 %define         squidlibdir %{_libdir}/squid
 %define         squidconfdir %{_sysconfdir}/squid
 Name:           squid
-Version:        4.1
+Version:        4.2
 Release:        0
 Summary:        Caching and forwarding HTTP web proxy
 License:        GPL-2.0-or-later