From 019b48b75930b5919bdac96f4486c5583dc3e70e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 11 2019 09:28:55 +0000 Subject: import rh-varnish6-varnish-6.0.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 80f8b8e..493bf29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/pkg-varnish-cache-5b97619.tar.gz -SOURCES/varnish-6.0.0.tgz +SOURCES/varnish-6.0.2.tgz diff --git a/.rh-varnish6-varnish.metadata b/.rh-varnish6-varnish.metadata index 121d4d3..f72050a 100644 --- a/.rh-varnish6-varnish.metadata +++ b/.rh-varnish6-varnish.metadata @@ -1,2 +1,2 @@ 91352a70dcc046774a2d5cc8c1b778021dd3d58e SOURCES/pkg-varnish-cache-5b97619.tar.gz -d64425c0142f36cfba60cd05c5fe4f55a5b8555b SOURCES/varnish-6.0.0.tgz +468e4f24a7d8f7d0536da14e476169fe568b770b SOURCES/varnish-6.0.2.tgz diff --git a/SOURCES/varnish-5.1.1.fix_ld_library_path_in_doc_build.patch b/SOURCES/varnish-5.1.1.fix_ld_library_path_in_doc_build.patch deleted file mode 100644 index 1721d09..0000000 --- a/SOURCES/varnish-5.1.1.fix_ld_library_path_in_doc_build.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- doc/sphinx/Makefile.in.orig 2017-03-16 16:01:18.440999286 +0100 -+++ doc/sphinx/Makefile.in 2017-03-16 16:02:38.557728852 +0100 -@@ -626,28 +626,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/SOURCES/varnish-6.0.2.fix_ld_library_path_in_doc_build.patch b/SOURCES/varnish-6.0.2.fix_ld_library_path_in_doc_build.patch new file mode 100644 index 0000000..5a98fa4 --- /dev/null +++ b/SOURCES/varnish-6.0.2.fix_ld_library_path_in_doc_build.patch @@ -0,0 +1,52 @@ +diff --git a/doc/sphinx/Makefile.in b/doc/sphinx/Makefile.in +index 0819064..11e4ba2 100644 +--- a/doc/sphinx/Makefile.in ++++ b/doc/sphinx/Makefile.in +@@ -659,37 +659,47 @@ include/counters.rst: $(top_srcdir)/lib/libvcc/vsctool.py $(COUNTERS) + # 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 > ${@}_ + mv ${@}_ ${@} + include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishncsa/varnishncsa --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --options > ${@}_ + mv ${@}_ ${@} + include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishlog/varnishlog --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --options > ${@}_ + mv ${@}_ ${@} + include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishtop/varnishtop --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --options > ${@}_ + mv ${@}_ ${@} + include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishhist/varnishhist --synopsis > ${@}_ + mv ${@}_ ${@} + + include/varnishstat_options.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --options > ${@}_ + mv ${@}_ ${@} + include/varnishstat_synopsis.rst: $(top_builddir)/bin/varnishstat/varnishstat ++ LD_LIBRARY_PATH=$(top_builddir)/lib/libvarnishapi/.libs \ + $(top_builddir)/bin/varnishstat/varnishstat --synopsis > ${@}_ + mv ${@}_ ${@} + diff --git a/SPECS/varnish.spec b/SPECS/varnish.spec index f64354c..6a71b6b 100644 --- a/SPECS/varnish.spec +++ b/SPECS/varnish.spec @@ -20,8 +20,8 @@ Summary: High-performance HTTP accelerator Name: %{?scl:%scl_prefix}varnish -Version: 6.0.0 -Release: 2%{?dist} +Version: 6.0.2 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -31,7 +31,7 @@ Source2: scl-register-helper.sh Source3: varnish.tmpfiles Patch0: varnish.scl.patch Patch1: varnish-4.1.0.fix_find-provides.patch -Patch2: varnish-5.1.1.fix_ld_library_path_in_doc_build.patch +Patch2: varnish-6.0.2.fix_ld_library_path_in_doc_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -139,7 +139,7 @@ ln -s pkg-varnish-cache-%{commit1}/debian debian %patch0 -p1 -b .scl %patch1 -p0 -%patch2 -p0 +%patch2 -p1 for f in configure configure.ac; do sed -i 's|ljemalloc|l%{scl}jemalloc|g' $f @@ -484,6 +484,10 @@ fi %endif %changelog +* Thu Jan 03 2019 Lubos Uhliarik - 6.0.2-1 +- Resolves: #1658671 - RFE: updated collection for Varnish 6 +- update to Varnish 6.0.2 + * Wed Jul 18 2018 Luboš Uhliarik - 6.0.0-2 - update to Varnish 6.0.0