- sysctl is not needed on linux and breaks build on x32

- rel 3

diff --git a/no-sysctl.patch b/no-sysctl.patch
new file mode 100644 (file)
index 0000000..68aa933
--- /dev/null
+++ b/no-sysctl.patch
@@ -0,0 +1,10 @@
+--- varnish-3.0.5/lib/libjemalloc/jemalloc_linux.c~    2013-12-02 08:47:57.000000000 +0100
++++ varnish-3.0.5/lib/libjemalloc/jemalloc_linux.c     2015-12-21 19:43:26.891965305 +0100
+@@ -177,7 +177,6 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #include <sys/uio.h>
+ 
+ #include <errno.h>

diff --git a/varnish.spec b/varnish.spec
index b0d621f70166453fa548f33f9b7b2e791562f23a..a8fa29288fca0886e3a9f24c7282a17e2163ea5e 100644 (file)
--- a/varnish.spec
+++ b/varnish.spec
@@ -11,7 +11,7 @@ Summary:      Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):     Varnish - wydajny akcelerator HTTP
 Name:          varnish
 Version:       3.0.5
-Release:       2
+Release:       3
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@ Source6:      %{name}.logrotate
 Source8:       %{name}.tmpfiles
 #Patch100:     branch.diff
 Patch0:                no-ccache.patch
+Patch1:                no-sysctl.patch
 URL:           http://www.varnish-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -113,6 +114,7 @@ Source code of Varnish for building VMODs.
 %setup -q
 #%patch100 -p0
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 #%{__sed} -i -e 's,$(srcdir)/,,' bin/varnishtest/Makefile.am