Accepting request 689081 from server:http

6.2.0

OBS-URL: https://build.opensuse.org/request/show/689081
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/varnish?expand=0&rev=25

varnish-5.1.2-add-fallthrough-comments.patch

@@ -1,3 +1,6 @@
+From: antoine.belvire@opensuse.org
+Date: Fri Jun 23 19:42:07 UTC 2017
+
 GCC 7 introduces new warnings, including implicit fallthrough in switch blocks;
 see https://gcc.gnu.org/gcc-7/changes.html#c-family. This warnings are turned
 into errors in our case (-Werror).
@@ -9,18 +12,16 @@ Note that most of these warnings are located in lib/libvgz, which will be
 upgraded in a future release (see commit 5fae561 on master branch at
 https://github.com/varnishcache/varnish-cache/commit/5fae561).
 
---
 ---
  bin/varnishadm/varnishadm.c |    1 +
- lib/libvgz/infback.c        |    1 +
  lib/libvgz/inflate.c        |   18 ++++++++++++++++++
- 3 files changed, 20 insertions(+)
+ 2 files changed, 19 insertions(+)
 
-Index: varnish-6.0.0/bin/varnishadm/varnishadm.c
+Index: varnish-6.2.0/bin/varnishadm/varnishadm.c
 ===================================================================
---- varnish-6.0.0.orig/bin/varnishadm/varnishadm.c
+--- varnish-6.2.0.orig/bin/varnishadm/varnishadm.c
-+++ varnish-6.0.0/bin/varnishadm/varnishadm.c
++++ varnish-6.2.0/bin/varnishadm/varnishadm.c
-@@ -452,6 +452,7 @@ main(int argc, char * const *argv)
+@@ -439,6 +439,7 @@ main(int argc, char * const *argv)
  		case 'h':
  			/* Usage help */
  			usage(0);
@@ -28,22 +29,10 @@ Index: varnish-6.0.0/bin/varnishadm/varnishadm.c
  		case 'n':
  			n_arg = optarg;
  			break;
-Index: varnish-6.0.0/lib/libvgz/infback.c
+Index: varnish-6.2.0/lib/libvgz/inflate.c
 ===================================================================
---- varnish-6.0.0.orig/lib/libvgz/infback.c
+--- varnish-6.2.0.orig/lib/libvgz/inflate.c
-+++ varnish-6.0.0/lib/libvgz/infback.c
++++ varnish-6.2.0/lib/libvgz/inflate.c
-@@ -477,6 +477,7 @@ void FAR *out_desc;
-             }
-             Tracev((stderr, "inflate:       codes ok\n"));
-             state->mode = LEN;
-+            /* FALLTHROUGH */
- 
-         case LEN:
-             /* use inflate_fast() if we have enough input and output */
-Index: varnish-6.0.0/lib/libvgz/inflate.c
-===================================================================
---- varnish-6.0.0.orig/lib/libvgz/inflate.c
-+++ varnish-6.0.0/lib/libvgz/inflate.c
 @@ -747,6 +747,7 @@ int flush;
                  CRC2(state->check, hold);
              INITBITS();

varnish-6.0.0.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7b2839c95b2bf1f336abc20b5d8b149c3aa72deff142f2379d1d431206b0bee
-size 3033621

varnish-6.2.0.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c37af353aca25a83d22f9c5ce0ae800fe433e4d02e1457e02886a5849f988e53
+size 3207400

varnish.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Mar 27 10:01:08 UTC 2019 - Samu Voutilainen <smar@smar.fi>
+
+- Updated to 6.2.0
+  * Added a thread pool watchdog which will restart the worker
+    process if scheduling tasks onto worker threads appears
+    stuck. The new parameter "thread_pool_watchdog" configures
+    it.
+- Disabled error for clobbering, which caused bogus
+  error in varnishtest
+
 -------------------------------------------------------------------
 Wed May  2 06:47:32 UTC 2018 - jengelh@inai.de
 

varnish.spec

@@ -21,12 +21,12 @@
 %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%define library_name libvarnishapi1
+%define library_name libvarnishapi2
 %define pkg_home     %_localstatedir/lib/%name
 %define pkg_logdir   %_localstatedir/log/%name
 %define pkg_cachedir %_localstatedir/cache/%name
 Name:           varnish
-Version:        6.0.0
+Version:        6.2.0
 Release:        0
 Summary:        Accelerator for HTTP services
 License:        BSD-2-Clause
@@ -39,9 +39,9 @@ Source3:        varnish.sysconfig
 Source5:        varnish.logrotate
 Source7:        varnish.service
 Source8:        varnishlog.service
-# PATCH-FIX-UPSTREAM varnish-5.1.2-add-fallthrough-comments.patch -- Fix build with GCC 7
+Patch1:         varnish-5.1.2-add-fallthrough-comments.patch
-Patch:          varnish-5.1.2-add-fallthrough-comments.patch
 BuildRequires:  python3-docutils
+BuildRequires:  python3-Sphinx
 BuildRequires:  libxslt
 BuildRequires:  ncurses-devel
 BuildRequires:  pcre-devel
@@ -95,11 +95,10 @@ over the HTTP protocol.
 This package holds the development files for varnish.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch -p1
 
 %build
-export CFLAGS="%optflags -fstack-protector"
+export CFLAGS="%optflags -fstack-protector -Wno-error=clobbered"
 %ifarch %ix86
 export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard"
 %endif
@@ -186,7 +185,7 @@ fi
 
 %files -n %library_name
 %defattr(-,root,root,-)
-%_libdir/libvarnishapi.so.1*
+%_libdir/libvarnishapi.so.2*
 
 %files devel
 %defattr(-,root,root,-)