[packages/varnish/dev-5.1: 1/2] prepare for 5.1.3

[glen]

commit be5559d24d5f94fc22b0fac3237514799a43e64f
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Aug 18 10:37:27 2017 +0300

    prepare for 5.1.3

 ac.patch        |  9 ---------
 no-sysctl.patch | 10 ----------
 varnish.spec    | 23 ++++++++++-------------
 3 files changed, 10 insertions(+), 32 deletions(-)
---
diff --git a/varnish.spec b/varnish.spec
index 20019d4..5ecbb04 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -10,12 +10,12 @@
 Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
-Version:	3.0.7
-Release:	1
+Version:	5.1.3
+Release:	0.1
 License:	BSD
 Group:		Networking/Daemons/HTTP
-Source0:	http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	aa63a7808d775c005d020c41f152b7af
+Source0:	http://varnish-cache.org/_downloads/%{name}-%{version}.tgz
+# Source0-md5:	c35e4b634a75b36f5e2e75b2f0af5a39
 Source1:	%{name}.init
 Source3:	%{name}ncsa.init
 Source4:	%{name}.sysconfig
@@ -24,8 +24,6 @@ Source6:	%{name}.logrotate
 Source8:	%{name}.tmpfiles
 #Patch100:	branch.diff
 Patch0:		no-ccache.patch
-Patch1:		no-sysctl.patch
-Patch2:		ac.patch
 URL:		http://www.varnish-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -115,16 +113,15 @@ Source code of Varnish for building VMODs.
 %setup -q
 #%patch100 -p0
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-#%{__sed} -i -e 's,$(srcdir)/,,' bin/varnishtest/Makefile.am
-
-%{__sed} -i -e '1s,^#!.*python,#!%{__python},' lib/libvmod_std/vmod.py
+%{__sed} -i -e '1s,^#!.*python,#!%{__python},' \
+	lib/libvarnishapi/generate.py \
+	lib/libvcc/generate.py \
+	lib/libvcc/vmodtool.py
 
 %build
-export CPPFLAGS="-I/usr/include/ncurses"
-%{__aclocal} -I m4
+#export CPPFLAGS="-I/usr/include/ncurses"
+%{__aclocal} -I m4 -I varnish.m4
 %{__libtoolize}
 %{__autoheader}
 %{__automake}
diff --git a/ac.patch b/ac.patch
deleted file mode 100644
index 6c0e27c..0000000
--- a/ac.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- varnish-3.0.5/configure.ac	2017-04-20 12:10:13.927977904 +0300
-+++ varnish-3.0.7/configure.ac	2017-04-20 12:12:07.970236508 +0300
-@@ -4,5 +4,5 @@
- AC_CONFIG_SRCDIR(include/varnishapi.h)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
- OCFLAGS="$CFLAGS"
diff --git a/no-sysctl.patch b/no-sysctl.patch
deleted file mode 100644
index 68aa933..0000000
--- a/no-sysctl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/varnish.git/commitdiff/9a49bd18f62be97bcdff4dc5bf5f0c5e2867b93a