From eaeab2ccb1e00f7187da05542648f17508c2dfaf Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Mon, 10 Feb 2020 17:01:54 +0100
Subject: [PATCH] New upstream release, a security release. Includes fix for
 VSV00005 Added new checkout of pkg-varnish Temporarily disable haproxy unit
 tests, as haproxy seems broken in rawhide

---
 .gitignore   |  2 ++
 sources      |  4 ++--
 varnish.spec | 36 ++++++++++++++++++++++--------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7235f7c..0100644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@ varnish-2.1.3.tar.gz
 /varnish-6.2.1.tgz
 /varnish-6.3.0.tgz
 /varnish-6.3.1.tgz
+/pkg-varnish-cache-ec7ad9e.tar.gz
+/varnish-6.3.2.tgz
diff --git a/sources b/sources
index be05cbb..59b93c2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (varnish-6.3.1.tgz) = 2fee11bcd01f53464b53e8271c2aec08233af078f2e9a2600cd82efbf646b3fd48160ebb2add09e1fb4f43e18e61f21a2408e351eeb2a567179733a3efbc3ddc
-SHA512 (pkg-varnish-cache-114fcdd.tar.gz) = 06fef2beac511de3b28291b8a0978f7a2c4ecbc65bcfdea6df89e4aaeec23d096487dd0453cd45802985a010ffd151772e60bbc700d95a471bb57f5f70256b0e
+SHA512 (pkg-varnish-cache-ec7ad9e.tar.gz) = 146aacec76b2ca641bb8bc9dda49e82d28740dbcba034e73a8d39387696f10fa3108ab124a078e900865388217352d112f63f6fe9ef7b23e20bc699441aab4f2
+SHA512 (varnish-6.3.2.tgz) = 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
diff --git a/varnish.spec b/varnish.spec
index d23f1d3..8dc048c 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -13,18 +13,18 @@
 
 %global __provides_exclude_from ^%{_libdir}/varnish/vmods
 
-%global abi 6e96ff048692235e64565211a38c41432a26c055
+%global abi 6870fd661a2b42c2e8adad838b5d92a71f27dccd
 %global vrt 10.0
 
 # Package scripts are now external
 # https://github.com/varnishcache/pkg-varnish-cache
-%global commit1 114fcddfdbd9f1177f34605bb86faa78859ae56a
+%global commit1 ec7ad9e6c6dd7c9b4f4ba60c5b223376908c3ca6
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 6.3.1
-Release: 3%{?dist}
+Version: 6.3.2
+Release: 1%{?dist}
 License: BSD
 URL: https://www.varnish-cache.org/
 Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz
@@ -76,7 +76,7 @@ Provides: vmod(unix)%{_isa} = %{version}-%{release}
 Provides: vmod(vtc)%{_isa} = %{version}-%{release}
 %endif
 
-Obsoletes: varnish-libs
+Obsoletes: varnish-libs < %{version}-%{release}
 
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 BuildRequires: python34 python-sphinx python34-docutils
@@ -93,9 +93,11 @@ BuildRequires: make
 
 # Extra requirements for the build suite
 BuildRequires: nghttp2
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: haproxy
-%endif
+
+# haproxy is broken in rawhide now
+#if 0%{?fedora} || 0%{?rhel} >= 8
+#BuildRequires: haproxy
+#endif
 
 %if 0%{?rhel} == 6
 BuildRequires: selinux-policy
@@ -140,9 +142,10 @@ available on: https://www.varnish-cache.org/
 
 %package devel
 Summary: Development files for %{name}
-BuildRequires: ncurses-devel
+#BuildRequires: ncurses-devel
+Provides: varnish-libs-devel%{?isa} = %{version}-%{release}
 Provides: varnish-libs-devel = %{version}-%{release}
-Obsoletes: varnish-libs-devel
+Obsoletes: varnish-libs-devel < %{version}-%{release}
 
 %description devel
 Development files for %{name}
@@ -354,7 +357,7 @@ exit 0
 
 %post
 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-%systemd_post varnish.service
+%systemd_post varnish varnishncsa
 
 # Other distros: Use chkconfig
 %else
@@ -383,7 +386,7 @@ fi
 
 %postun
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%systemd_postun_with_restart varnish.service
+%systemd_postun_with_restart varnish varnishncsa
 %endif
 /sbin/ldconfig
 
@@ -397,8 +400,8 @@ fi
 
 %preun
 
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%systemd_preun varnish.service
+%if 0%{?fedora} >= 18 || 0%{?rhel}  >= 7
+%systemd_preun varnish varnishncsa
 %else
 
 if [ $1 -lt 1 ]; then
@@ -418,6 +421,11 @@ fi
 
 
 %changelog
+* Tue Feb 11 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.3.2-1
+- New upstream release, a security release. Includes fix for VSV00005
+- Added new checkout of pkg-varnish
+- Temporarily disable haproxy unit tests, as haproxy seems broken in rawhide
+
 * Mon Feb 10 2020 Joe Orton <jorton@redhat.com> - 6.3.1-3
 - drop buildreq on (retired) vttest (#1800232)