packages: varnish/varnish-build.patch, varnish/varnish.spec - up to 2.1.4

[glen]

Author: glen                         Date: Sat Aug 13 22:26:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.1.4

---- Files affected:
packages/varnish:
   varnish-build.patch (1.2 -> 1.3) , varnish.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: packages/varnish/varnish-build.patch
diff -u packages/varnish/varnish-build.patch:1.2 packages/varnish/varnish-build.patch:1.3
--- packages/varnish/varnish-build.patch:1.2	Sun Nov 16 14:32:58 2008
+++ packages/varnish/varnish-build.patch	Sun Aug 14 00:26:35 2011
@@ -1,27 +1,12 @@
-diff -ru varnish-2.0.2.org/lib/libvarnish/Makefile.am varnish-2.0.2/lib/libvarnish/Makefile.am
---- varnish-2.0.2.org/lib/libvarnish/Makefile.am	2008-11-14 13:24:08.000000000 +0100
-+++ varnish-2.0.2/lib/libvarnish/Makefile.am	2008-11-16 14:30:30.479883978 +0100
-@@ -26,7 +26,8 @@
+--- varnish-2.1.4/lib/libvarnish/Makefile.am~	2010-12-03 14:20:32.000000000 +0200
++++ varnish-2.1.4/lib/libvarnish/Makefile.am	2010-12-03 14:21:04.038837288 +0200
+@@ -31,7 +31,8 @@
  	vss.c \
  	vtmpfile.c
  
--libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
-+libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} \
-+		        $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la
- 
- 
- if ENABLE_TESTS
-diff -ru varnish-2.0.2.org/lib/Makefile.am varnish-2.0.2/lib/Makefile.am
---- varnish-2.0.2.org/lib/Makefile.am	2008-11-14 13:24:08.000000000 +0100
-+++ varnish-2.0.2/lib/Makefile.am	2008-11-16 14:30:50.736859278 +0100
-@@ -1,9 +1,9 @@
- # $Id$
- 
- SUBDIRS = \
-+	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
--	libvarnishcompat \
- 	libvcl \
- 	@JEMALLOC_SUBDIR@
+-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@
++libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@ \
++	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la
  
+ DISTCLEANFILES = svn_version.c
+ svn_version.c: FORCE

================================================================
Index: packages/varnish/varnish.spec
diff -u packages/varnish/varnish.spec:1.59 packages/varnish/varnish.spec:1.60
--- packages/varnish/varnish.spec:1.59	Thu Sep 30 16:00:47 2010
+++ packages/varnish/varnish.spec	Sun Aug 14 00:26:35 2011
@@ -10,19 +10,19 @@
 Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
-Version:	2.0.6
-Release:	5
+Version:	2.1.4
+Release:	0.1
 License:	BSD
 Group:		Networking/Daemons/HTTP
-Source0:	http://downloads.sourceforge.net/varnish/%{name}-%{version}.tar.gz
-# Source0-md5:	d91dc21c636db61c69b5e8f061c5bb95
+Source0:	http://www.varnish-software.com/sites/default/files/%{name}-%{version}.tar.gz
+# Source0-md5:	e794a37b6fbb786a083c0946103ae103
 Source1:	%{name}.init
 Source3:	%{name}ncsa.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}ncsa.sysconfig
 Source6:	%{name}.logrotate
 Source7:	%{name}.conf
-Patch100:	branch.diff
+#Patch100:	branch.diff
 Patch0:		%{name}-build.patch
 URL:		http://www.varnish-cache.org/
 BuildRequires:	autoconf
@@ -95,10 +95,9 @@
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch0 -p1
 
-
 %build
 export CPPFLAGS="-I/usr/include/ncurses"
 %{__aclocal}
@@ -213,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2011/08/13 22:26:35  glen
+- up to 2.1.4
+
 Revision 1.59  2010/09/30 14:00:47  glen
 - quick -ltinfo fix; rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish-build.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.spec?r1=1.59&r2=1.60&f=u