From 73c685e86c051e788bf2df94f4d444993fa7f370 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 25 Feb 2019 23:54:17 +0100 Subject: [PATCH 1/4] Rebuilt for varnish-6.0.3 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index a2f3e5b..5c82326 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,6 +1,6 @@ Name: varnish-modules Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL Group: System Environment/Daemons @@ -61,6 +61,9 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog +* Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 +- Rebuilt for varnish-6.0.3 + * Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 - Update to 0.15.0 - Drop EPEL and older Fedora releases support From 920d026852f7409ffbde19988612b56ab468d8aa Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 26 Feb 2019 08:49:19 +0100 Subject: [PATCH 2/4] Added small format patch for 32bit --- varnish-modules-0.15.0_format_fix.patch | 11 +++++++++++ varnish-modules.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 varnish-modules-0.15.0_format_fix.patch diff --git a/varnish-modules-0.15.0_format_fix.patch b/varnish-modules-0.15.0_format_fix.patch new file mode 100644 index 0000000..87ad7cb --- /dev/null +++ b/varnish-modules-0.15.0_format_fix.patch @@ -0,0 +1,11 @@ +--- src/vmod_tcp.c.orig 2018-10-10 20:21:14.324704356 +0200 ++++ src/vmod_tcp.c 2018-10-10 20:21:44.329466200 +0200 +@@ -174,7 +174,7 @@ + sizeof(pacerate)) != 0) + VSLb(ctx->vsl, SLT_VCL_Error, "set_socket_pace(): Error setting pace rate."); + else +- VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %lu KB/s.", rate); ++ VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %jd KB/s.", (intmax_t)rate); + + # ifndef NDEBUG + int retval; diff --git a/varnish-modules.spec b/varnish-modules.spec index 5c82326..7323499 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -8,6 +8,9 @@ License: BSD URL: https://github.com/varnish/%{name} Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz +# Upstream issue #122 +Patch1: varnish-modules-0.15.0_format_fix.patch + BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(varnishapi) @@ -36,6 +39,7 @@ tcp, var, xkey %prep %setup -q +%patch1 -p0 %build @@ -44,7 +48,7 @@ tcp, var, xkey %install -%make_install +%make_install docdir=%{_pkgdocdir} find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' @@ -63,6 +67,7 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 +- Added small format patch for 32bit * Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 - Update to 0.15.0 From 0ee40a83ebb3d5693f65ece555141b3f987a8bd4 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 18 Sep 2019 21:53:19 +0200 Subject: [PATCH 3/4] - Merge from rawhide - Rebuilt against varnish-6.0.4 --- varnish-modules.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 2c3d647..a0ed43d 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -11,8 +11,6 @@ URL: https://github.com/varnish/%{name} Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz # Upstream issue #122 -Patch1: varnish-modules-0.15.0_format_fix.patch - Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch BuildRequires: gcc @@ -42,9 +40,7 @@ tcp, var, xkey %prep %setup -q -%patch1 -p0 - -%if "%varnishver" >= "6.1" +%if "%varnishver" >= "6.1" %patch10 -p1 %endif %patch11 -p1 @@ -55,7 +51,7 @@ tcp, var, xkey %install -%make_install docdir=%{_pkgdocdir} +%make_install docdir=%_pkgdocdir find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro @@ -71,13 +67,16 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Wed Sep 18 2019 Ingvar Hagelund - 0.15.0-7 +- Rebuilt for varnish-6.0.4 + * Sat Jul 27 2019 Fedora Release Engineering - 0.15.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 - - Added small format patch for 32bit + * Fri Feb 15 2019 Ingvar Hagelund - 0.15.0-5 - Install docs in correct docdir From dda591d8c4ad77eed7919ad575e96dc6d3cf212f Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Fri, 15 Nov 2019 13:52:50 +0100 Subject: [PATCH 4/4] Rebuilt for varnish-6.0.5 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 7323499..936e730 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,6 +1,6 @@ Name: varnish-modules Version: 0.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL Group: System Environment/Daemons @@ -65,6 +65,9 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog +* Fri Nov 15 2019 Ingvar Hagelund 0.15.0-3 +- Rebuilt for varnish-6.0.5 + * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 - Added small format patch for 32bit