From ec04755b00d14c2bf4792f95769b12c4abeae30d Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Fri, 2 Nov 2018 16:26:05 +0100 Subject: [PATCH] New upstream release Respin patches for 6.1.0 Disable pcre-jit for now, ref upstream bug #2817 --- .gitignore | 1 + sources | 2 +- ...1.0_fix_ld_library_path_in_doc_build.patch | 53 +++++++++++++++++++ varnish.spec | 22 +++++--- 4 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 varnish-6.1.0_fix_ld_library_path_in_doc_build.patch diff --git a/.gitignore b/.gitignore index f4d899e..a413411 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ varnish-2.1.3.tar.gz /pkg-varnish-cache-0ad2f22.tar.gz /varnish-6.0.0.tgz /varnish-6.0.1.tgz +/varnish-6.1.0.tgz diff --git a/sources b/sources index 45b8c5a..db61ab3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (varnish-6.0.1.tgz) = 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138 +SHA512 (varnish-6.1.0.tgz) = 48584fc2d938cc0759fa5d795992a0c6d5d9fb49db5f3063dca8d3d88c6282dac971ed268edc07bec95b4f25e26562089b1b84abdd26099e12be9ea66557716d SHA512 (pkg-varnish-cache-0ad2f22.tar.gz) = b66c05f74f9bd62ddf16ab3e7904f4e74993bd1406aaebf20d4dca840198430da9f5e746af22778f1a73063113ac19b6f8127d77ff71c30c246fd5fab5ed78da diff --git a/varnish-6.1.0_fix_ld_library_path_in_doc_build.patch b/varnish-6.1.0_fix_ld_library_path_in_doc_build.patch new file mode 100644 index 0000000..d93c49a --- /dev/null +++ b/varnish-6.1.0_fix_ld_library_path_in_doc_build.patch @@ -0,0 +1,53 @@ +--- doc/sphinx/Makefile.in.orig 2018-11-02 14:53:14.812956915 +0100 ++++ doc/sphinx/Makefile.in 2018-11-02 14:54:31.575517733 +0100 +@@ -642,9 +642,11 @@ + rm -rf $(BUILDDIR) + + include/cli.rst: $(top_builddir)/bin/varnishd/varnishd ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishd/varnishd -x cli > $@ + + include/params.rst: $(top_builddir)/bin/varnishd/varnishd ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishd/varnishd -x parameter > $@ + + include/counters.rst: $(top_srcdir)/lib/libvcc/vsctool.py $(COUNTERS) +@@ -656,28 +658,38 @@ + # XXX add varnishstat here when it's been _opt2rst'ed + + include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishncsa/varnishncsa --options > $@ + include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishncsa/varnishncsa --synopsis > $@ + + include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --options > $@ + include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --synopsis > $@ + + include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --options > $@ + include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --synopsis > $@ + + include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --options > $@ + include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --synopsis > $@ + + include/varnishstat_options.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --options > $@ + include/varnishstat_synopsis.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --synopsis > $@ + + include/vsl-tags.rst: $(top_builddir)/lib/libvarnishapi/vsl2rst diff --git a/varnish.spec b/varnish.spec index 0a6842b..cf68289 100644 --- a/varnish.spec +++ b/varnish.spec @@ -11,20 +11,23 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 6.0.1 -Release: 3%{?dist} +Version: 6.1.0 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/%{commit1}.tar.gz#/pkg-varnish-cache-%{shortcommit1}.tar.gz -Patch1: varnish-5.1.1.fix_ld_library_path_in_doc_build.patch +Patch1: varnish-6.1.0_fix_ld_library_path_in_doc_build.patch Patch4: varnish-4.0.3_fix_varnish4_selinux.el6.patch Patch9: varnish-5.1.1.fix_python_version.patch # based on https://github.com/varnishcache/varnish-cache/commit/9bdc5f75d661a1659c4df60799612a7524a6caa7 Patch12: varnish-6.0.1_fix_bug2668.patch +# Just a simple formatting error +Patch13: varnish-6.1.0_fix_testu00008.patch + Obsoletes: varnish-libs %if 0%{?rhel} ==6 || 0%{?rhel} == 7 @@ -132,6 +135,7 @@ sed -i '8 i\RPM_BUILD_ROOT=%{buildroot}' find-provides %patch9 -p0 %endif %patch12 -p1 +%patch13 -p0 %build %if 0%{?rhel} == 6 @@ -159,10 +163,9 @@ export PYTHON=/usr/bin/python3 --with-jemalloc=no \ %endif --localstatedir=/var/lib \ - --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} -#ifarch x86_64 #arm -# --disable-pcre-jit \ -#endif + --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ + --disable-pcre-jit \ + # We have to remove rpath - not allowed in Fedora # (This problem only visible on 64 bit arches) @@ -373,6 +376,11 @@ fi %changelog +* Fri Nov 02 2018 Ingvar Hagelund - 6.1.0-1 +- New upstream release +- Respin patches for 6.1.0 +- Disable pcre-jit for now, ref upstream bug #2817 + * Tue Oct 09 2018 Ingvar Hagelund - 6.0.1-3 - Explicitly using utf8 under install on el6 and el7 for python quirks