From 538836357a66a113477632b0e9757fcadf200000fe68de43385247d7d701b8b6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 May 2022 20:11:26 +0000 Subject: [PATCH 1/4] - Update to release 7.1.0 [boo#1195188] OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=109 --- varnish-6.6.1.tgz | 3 --- varnish-7.1.0.tgz | 3 +++ varnish.changes | 9 +++++++++ varnish.spec | 7 +++---- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 varnish-6.6.1.tgz create mode 100644 varnish-7.1.0.tgz diff --git a/varnish-6.6.1.tgz b/varnish-6.6.1.tgz deleted file mode 100644 index a65815f..0000000 --- a/varnish-6.6.1.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab1a6884332731f983c8dab675c636deb3883a206c8a0127a7c663af2422e628 -size 3518308 diff --git a/varnish-7.1.0.tgz b/varnish-7.1.0.tgz new file mode 100644 index 0000000..73edc8d --- /dev/null +++ b/varnish-7.1.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f54ab88685667664e5b3c39eb56ac8c624b6c1093436a7f8c555491144c69eba +size 3787588 diff --git a/varnish.changes b/varnish.changes index 6f83ad3..4774092 100644 --- a/varnish.changes +++ b/varnish.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 16 20:10:21 UTC 2022 - Jan Engelhardt + +- Update to release 7.1.0 [boo#1195188] + * VCL: It is now possible to assign a BLOB value to a BODY + variable, in addition to STRING as before. + * VMOD: New STRING strftime(TIME time, STRING format) function + for UTC formatting. + ------------------------------------------------------------------- Wed Dec 1 10:27:19 UTC 2021 - Johannes Segitz diff --git a/varnish.spec b/varnish.spec index 4f81eb7..bb05701 100644 --- a/varnish.spec +++ b/varnish.spec @@ -25,7 +25,7 @@ %define _fillupdir %_localstatedir/adm/fillup-templates %endif Name: varnish -Version: 6.6.1 +Version: 7.1.0 Release: 0 Summary: Accelerator for HTTP services License: BSD-2-Clause @@ -39,10 +39,9 @@ Source7: varnish.service Source8: varnishlog.service Patch1: varnish-5.1.2-add-fallthrough-comments.patch Patch2: uninit.patch -BuildRequires: libxslt +BuildRequires: libxslt-devel BuildRequires: ncurses-devel -BuildRequires: pcre-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig(libpcre2-8) BuildRequires: python3-Sphinx BuildRequires: python3-docutils BuildRequires: readline-devel From 4d5fced11488644a2ed4b7d865fb56dafdd4e94ba77626e6b888267083ea1942 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 May 2022 20:19:45 +0000 Subject: [PATCH 2/4] disable this stupid -Werror crap OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=110 --- varnish.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/varnish.spec b/varnish.spec index bb05701..6ba36a2 100644 --- a/varnish.spec +++ b/varnish.spec @@ -94,8 +94,10 @@ This package holds the development files for varnish. %autosetup -p1 %build +perl -i -lpe 's{-Werror\b}{}' configure.ac +autoreconf -fi %define _lto_cflags %nil -export CFLAGS="%optflags -fcommon -fstack-protector -Wno-error=clobbered -Werror=maybe-uninitialized" +export CFLAGS="%optflags -fcommon -fstack-protector" %ifarch %ix86 export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard" %endif From fac46bdf5ba177d595e5b8f088d1389b66a37ac602ef1060712f6d9dc8f6f8cf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 May 2022 20:23:07 +0000 Subject: [PATCH 3/4] enable verbose OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=111 --- varnish.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/varnish.spec b/varnish.spec index 6ba36a2..6c9ea50 100644 --- a/varnish.spec +++ b/varnish.spec @@ -94,17 +94,14 @@ This package holds the development files for varnish. %autosetup -p1 %build -perl -i -lpe 's{-Werror\b}{}' configure.ac -autoreconf -fi %define _lto_cflags %nil export CFLAGS="%optflags -fcommon -fstack-protector" %ifarch %ix86 export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard" %endif %configure --disable-static --docdir="%_docdir/%name" \ - --localstatedir="%_localstatedir/cache/" \ - --enable-developer-warnings -%make_build + --localstatedir="%_localstatedir/cache/" +%make_build V=1 %install b="%buildroot" From b3552e1294a23348074bf1931ab7a17e06736830e79d8519c605dd26423c2b61 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 May 2022 20:30:08 +0000 Subject: [PATCH 4/4] - Update to release 7.1.0 [boo#1195188] [CVE-2022-23959] OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=112 --- varnish.changes | 2 +- varnish.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/varnish.changes b/varnish.changes index 4774092..d342172 100644 --- a/varnish.changes +++ b/varnish.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon May 16 20:10:21 UTC 2022 - Jan Engelhardt -- Update to release 7.1.0 [boo#1195188] +- Update to release 7.1.0 [boo#1195188] [CVE-2022-23959] * VCL: It is now possible to assign a BLOB value to a BODY variable, in addition to STRING as before. * VMOD: New STRING strftime(TIME time, STRING format) function diff --git a/varnish.spec b/varnish.spec index 6c9ea50..af44c44 100644 --- a/varnish.spec +++ b/varnish.spec @@ -16,7 +16,7 @@ # -%define library_name libvarnishapi2 +%define library_name libvarnishapi3 %define pkg_home %_localstatedir/lib/%name %define pkg_logdir %_localstatedir/log/%name %define pkg_cachedir %_localstatedir/cache/%name @@ -178,7 +178,7 @@ fi %_fillupdir/sysconfig.%name %files -n %library_name -%_libdir/libvarnishapi.so.2* +%_libdir/libvarnishapi.so.3* %files devel %_includedir/varnish/