The package rpms/varnish.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/varnish.git/commit/?id=d6c7fa1e82....
Change:
+%ifarch %arm
Thanks.
Full change:
============
commit d6c7fa1e8282b18cfafb2c9b689408bf77f5ea33
Author: Ingvar Hagelund <ingvar(a)redpill-linpro.com>
Date: Fri Jul 28 15:40:42 2017 +0200
New upstream release
Added patches for overflow tests on 32bit, courtesy of fgsch
test u00000 now runs fine on ppc64, so readded it
diff --git a/.gitignore b/.gitignore
index b9cfdbc..0d17e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ varnish-2.1.3.tar.gz
/pkg-varnish-cache-4e27994.tar.gz
/varnish-4.1.4.tar.gz
/varnish-4.1.6.tar.gz
+/varnish-4.1.7.tar.gz
diff --git a/sources b/sources
index fac48ee..a7f4cd0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (varnish-4.1.6.tar.gz) =
c97b6245d467472dc61d1471cbfbefc1cca0839abbca73940efb800e7751437a64437a0c68e2c65e6f4dc039f25bb51ef4d9f3da4e50ccb854646457fb147927
+SHA512 (varnish-4.1.7.tar.gz) =
668e69430163600fad34031593d6144a52b113f9aea01d5ba51c7dac0ecf10606610a1d96393f07329e4f6af9a71b4ce668284f7c49b2c5871817707326036fd
SHA512 (pkg-varnish-cache-4e27994.tar.gz) =
86ffd0ebb444b78842ef83a96f275ca0de6dcb434867a18b8b227aede032c12e496f96c3e699cf64d083f3aed7b8cc98595c8a7a980657c6797fffef6fbb70c0
diff --git a/varnish-4.1.7.fix_tests_32bit.patch b/varnish-4.1.7.fix_tests_32bit.patch
new file mode 100644
index 0000000..6ffd25f
--- /dev/null
+++ b/varnish-4.1.7.fix_tests_32bit.patch
@@ -0,0 +1,104 @@
+diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
+index 71ef79b8a..1224fcf43 100644
+--- a/bin/varnishncsa/varnishncsa.c
++++ b/bin/varnishncsa/varnishncsa.c
+@@ -637,16 +637,11 @@ parse_x_format(char *buf)
+ i = strtol(r + 1, &s, 10);
+ if (s != e - 1)
+ VUT_Error(1, "Syntax error: VSL:%s]", buf);
+- if (i <= 0)
++ if (i <= 0 || i > 255) {
+ VUT_Error(1,
+ "Syntax error. Field specifier must be"
+- " positive: %s]",
++ " between 1 and 255: %s]",
+ buf);
+- if (i > INT_MAX) {
+- VUT_Error(1,
+- "Field specifier %ld for the tag VSL:%s]"
+- " is probably too high",
+- i, buf);
+ }
+ *r = '\0';
+ } else
+diff --git a/bin/varnishtest/tests/c00071.vtc b/bin/varnishtest/tests/c00071.vtc
+index b6c994731..107835cff 100644
+--- a/bin/varnishtest/tests/c00071.vtc
++++ b/bin/varnishtest/tests/c00071.vtc
+@@ -14,7 +14,7 @@ server s1 {
+ varnish v1 -vcl+backend {
+ import ${vmod_debug};
+ sub vcl_deliver {
+- debug.workspace_allocate(client, debug.workspace_free(client) - 208);
++ debug.workspace_allocate(client, debug.workspace_free(client) - 192);
+
+ if (req.url ~ "/bar") {
+ set resp.http.x-foo =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+diff --git a/bin/varnishtest/tests/r02233.vtc b/bin/varnishtest/tests/r02233.vtc
+index 87ab8ad0f..efac2bb8d 100644
+--- a/bin/varnishtest/tests/r02233.vtc
++++ b/bin/varnishtest/tests/r02233.vtc
+@@ -5,20 +5,26 @@ server s1 {
+ txresp
+ } -start
+
+-varnish v1 -arg "-p workspace_client=9k" -vcl+backend {
++varnish v1 -vcl+backend {
++ import ${vmod_debug};
+ import ${vmod_std};
+
+ sub vcl_recv {
+- set req.url = std.querysort(req.url);
++ debug.workspace_allocate(client, debug.workspace_free(client) - 92);
++ if (std.querysort(req.url) == req.url) {
++ std.log("querysort failed");
++ }
+ }
+ } -start
+
++logexpect l1 -v v1 {
++ expect * * VCL_Log "querysort failed"
++} -start
++
+ client c1 {
+- send "GET
/?a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1"
+- send
"&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1"
+- send
"&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1"
+- send " HTTP/1.1\r\n"
+- send "Host: foo\r\n\r\n"
++ txreq -url
/?a=2&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1&a=1
+ rxresp
+ expect resp.status == 500
+ } -run
++
++logexpect l1 -wait
+diff --git a/bin/varnishtest/tests/u00003.vtc b/bin/varnishtest/tests/u00003.vtc
+index 9c43f6229..13b8cba24 100644
+--- a/bin/varnishtest/tests/u00003.vtc
++++ b/bin/varnishtest/tests/u00003.vtc
+@@ -61,9 +61,9 @@ shell -err -expect "Unknown log tag: Begin[a" \
+ {varnishncsa -F "%{VSL:Begin[a}x"}
+ shell -err -expect "Syntax error: VSL:Begin[a]" \
+ {varnishncsa -F "%{VSL:Begin[a]}x"}
+-shell -err -expect "Syntax error. Field specifier must be positive: Begin[0]"
\
++shell -err -expect "Syntax error. Field specifier must be between 1 and 255:
Begin[0]" \
+ {varnishncsa -F "%{VSL:Begin[0]}x"}
+-shell -err -expect "Field specifier 999999999999 for the tag
VSL:Begin[999999999999] is probably too high" \
++shell -err -expect "Syntax error. Field specifier must be between 1 and 255:
Begin[999999999999]" \
+ {varnishncsa -F "%{VSL:Begin[999999999999]}x"}
+ shell -err -expect "Can't open format file (No such file or directory)" \
+ {varnishncsa -f /nonexistent/file}
+diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
+index 708989d37..4de94bfad 100644
+--- a/doc/sphinx/reference/varnishncsa.rst
++++ b/doc/sphinx/reference/varnishncsa.rst
+@@ -184,7 +184,8 @@ Supported formatters are:
+
+ The field will, if present, treat the log record as a white
+ space separated list of fields, and only the nth part of the
+- record will be matched against. Fields start counting at 1.
++ record will be matched against. Fields start counting at 1 and
++ run up to 255.
+
+ Defaults to '-' when the tag is not seen, the record prefix
+ does not match or the field is out of bounds. If a tag appears
diff --git a/varnish.spec b/varnish.spec
index db7445f..71e9f77 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -15,7 +15,7 @@
Summary: High-performance HTTP accelerator
Name: varnish
-Version: 4.1.6
+Version: 4.1.7
Release: 1%{?v_rc}%{?dist}
License: BSD
Group: System Environment/Daemons
@@ -27,6 +27,9 @@ Patch2: varnish-4.1.3_fix_Werror_el6.patch
Patch3: varnish-4.1.2_fix_python24.el5.patch
Patch4: varnish-4.0.3_fix_varnish4_selinux.el6.patch
Patch6: varnish-4.1.0.fix_find-provides.patch
+# Updated tests with more correct values from upstream
+Patch7: varnish-4.1.7.fix_tests_32bit.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} > 5
@@ -139,6 +142,7 @@ ln -s pkg-varnish-cache-%{commit1}/debian debian
%patch4 -p0
%endif
%patch6 -p0
+%patch7 -p1
%build
%if 0%{?rhel} == 6
@@ -192,10 +196,19 @@ rm -f doc/sphinx/Makefile.in.orig
# Replace bogus RPM_BUILD_ROOT variable with the contents of the actual buildroot macro
sed -i
"s,\${RPM_BUILD_ROOT}/../../BUILD/varnish\*,%{buildroot}%{_includedir}/%{name},"
redhat/find-provides
-%check
-%ifarch ppc ppc64
-rm bin/varnishtest/tests/u00000.vtc
+# Fix a 32bit bug, upstream issue 2344
+#ifarch i386 i686 ppc %arm
+#sed -i "s,-expect \"Field specifier 999999999999,-expect \"Field
specifier $(getconf INT_MAX),g;" bin/varnishtest/tests/u00003.vtc
+#endif
+
+# This test breaks on busy arm hosts, and completes fine given fast enough
+# hardware. It s not arch specific, so should be safe to skip, according
+# to upstream.
+%ifarch %arm
+rm bin/varnishtest/tests/r02035.vtc
%endif
+
+%check
make -j4 check
LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/%{name}"
TESTS_PARALLELISM=4 VERBOSE=1
%install
@@ -403,6 +416,11 @@ fi
%endif
%changelog
+* Thu Jul 27 2017 Ingvar Hagelund <ingvar(a)redpill-linpro.com> 4.1.7-1
+- New upstream release
+- Added patches for overflow tests on 32bit, courtesy of fgsch
+- test u00000 now runs fine on ppc64, so readded it
+
* Mon Jun 12 2017 Ingvar Hagelund <ingvar(a)redpill-linpro.com> 4.1.6-1
- New upstream release