Accepting request 689064 from home:Smar:varnish

- Disabled error for clobbering, which caused bogus
  error in varnishtest
- bundle correct libvarnish SO 
- Updated to 6.2.0

OBS-URL: https://build.opensuse.org/request/show/689064
OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=91
This commit is contained in:
Jan Engelhardt 2019-03-27 10:41:34 +00:00 committed by Git OBS Bridge
parent 86028201c9
commit 9ef97c1795
5 changed files with 30 additions and 30 deletions

View File

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

View File

@ -12,15 +12,14 @@ 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.0.0/bin/varnishadm/varnishadm.c
@@ -452,6 +452,7 @@ main(int argc, char * const *argv)
--- varnish-6.2.0.orig/bin/varnishadm/varnishadm.c
+++ varnish-6.2.0/bin/varnishadm/varnishadm.c
@@ -439,6 +439,7 @@ main(int argc, char * const *argv)
case 'h':
/* Usage help */
usage(0);
@ -28,22 +27,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.0.0/lib/libvgz/infback.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
--- varnish-6.2.0.orig/lib/libvgz/inflate.c
+++ varnish-6.2.0/lib/libvgz/inflate.c
@@ -747,6 +747,7 @@ int flush;
CRC2(state->check, hold);
INITBITS();

3
varnish-6.2.0.tgz Normal file
View File

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

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 27 10:01:08 UTC 2019 - Samu Voutilainen <smar@smar.fi>
- Disabled error for clobbering, which caused bogus
error in varnishtest
- bundle correct libvarnish SO
-------------------------------------------------------------------
Wed Mar 27 09:22:11 UTC 2019 - Samu Voutilainen <smar@smar.fi>
- Updated to 6.2.0
-------------------------------------------------------------------
Wed May 2 06:47:32 UTC 2018 - jengelh@inai.de

View File

@ -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,10 @@ 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
Patch: varnish-5.1.2-add-fallthrough-comments.patch
# PATCH-FIX-UPSTREAM varnish-6.2.0-add-fallthrough-comments.patch -- Fix build with GCC 7
Patch: varnish-6.2.0-add-fallthrough-comments.patch
BuildRequires: python3-docutils
BuildRequires: python3-Sphinx
BuildRequires: libxslt
BuildRequires: ncurses-devel
BuildRequires: pcre-devel
@ -99,7 +100,7 @@ This package holds the development files for varnish.
%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 +187,7 @@ fi
%files -n %library_name
%defattr(-,root,root,-)
%_libdir/libvarnishapi.so.1*
%_libdir/libvarnishapi.so.2*
%files devel
%defattr(-,root,root,-)