pkg/41118: Update www/varnish from 1.0.2 to 2.0.4

[michael+netbsd%stapelberg.de@localhost]

>Number:         41118
>Category:       pkg
>Synopsis:       Update www/varnish from 1.0.2 to 2.0.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 01 14:30:01 +0000 2009
>Originator:     Michael Stapelberg
>Release:        5.99.8
>Organization:
>Environment:
NetBSD ms 5.99.8 NetBSD 5.99.8 (GENERIC) #10: Sun Mar 15 08:56:03 CET 2009 
>Description:
varnish version 2 is strongly recommended because of some serious security 
fixes.

Furthermore, version 2.0.4 does not require so much patches anymore, as I sent 
most of the patches upstream and they were merged.

So, please upgrade varnish to 2.0.4 in pkgsrc, patches are attached
>How-To-Repeat:

>Fix:
diff -u -r1.3 Makefile
--- Makefile    20 Jun 2008 01:09:43 -0000      1.3
+++ Makefile    1 Apr 2009 14:25:29 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
 #
 
-DISTNAME=      varnish-1.0.2
+DISTNAME=      varnish-2.0.4
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=varnish/}
 

diff -u -r1.1.1.1 PLIST
--- PLIST       4 Dec 2006 16:04:54 -0000       1.1.1.1
+++ PLIST       1 Apr 2009 14:25:29 -0000
@@ -1,17 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $
+@comment $NetBSD$
+bin/varnishadm
 bin/varnishhist
 bin/varnishlog
 bin/varnishncsa
+bin/varnishreplay
 bin/varnishstat
+bin/varnishtest
 bin/varnishtop
+etc/varnish/default.vcl
+include/varnish/shmlog.h
+include/varnish/shmlog_tags.h
+include/varnish/stat_field.h
+include/varnish/stats.h
+include/varnish/varnishapi.h
 lib/libvarnish.la
 lib/libvarnishapi.la
+lib/libvarnishcompat.la
 lib/libvcl.la
+lib/pkgconfig/varnishapi.pc
+man/man1/varnishadm.1
 man/man1/varnishd.1
 man/man1/varnishhist.1
 man/man1/varnishlog.1
 man/man1/varnishncsa.1
+man/man1/varnishreplay.1
 man/man1/varnishstat.1
+man/man1/varnishtest.1
 man/man1/varnishtop.1
 man/man7/vcl.7
 sbin/varnishd
+@dirrm include/varnish
+@dirrm etc/varnish

diff -u -r1.2 distinfo
--- distinfo    18 Dec 2006 11:35:37 -0000      1.2
+++ distinfo    1 Apr 2009 14:25:29 -0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2006/12/18 11:35:37 joerg Exp $
+$NetBSD$
 
-SHA1 (varnish-1.0.2.tar.gz) = 88fa343be907088ac29be6fc9d899b352c91bf83
-RMD160 (varnish-1.0.2.tar.gz) = 28aac4f266369c2a3ffb4233b1cd3fd0b3f6ade2
-Size (varnish-1.0.2.tar.gz) = 539059 bytes
-SHA1 (patch-aa) = f49672e842cf01c58e2154a56271ce896a639161
-SHA1 (patch-ab) = ef32cee26f2542a44f2ab117154b58bc69931237
-SHA1 (patch-ac) = f537e46216a67fdf68afe8f9451bdf2aaff89958
-SHA1 (patch-ad) = 5523cd5cbcc29f4f6c85014870356c44c462b8ef
+SHA1 (varnish-2.0.4.tar.gz) = 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2
+RMD160 (varnish-2.0.4.tar.gz) = 93f94555f42205ff5f324e76acb121c8da71f6e9
+Size (varnish-2.0.4.tar.gz) = 786945 bytes
+SHA1 (patch-aa) = d9527d1cf2724515c6f74a6533755cd7df8a3525
+SHA1 (patch-ab) = 22f0928180dd65016fe5e1bdad95f4dcdd0727b5

--- /dev/null   2009-04-01 16:25:10.000000000 +0200
+++ patches/patch-aa    2009-04-01 16:08:39.000000000 +0200
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- configure.ac.orig  2009-04-01 15:35:15.000000000 +0200
++++ configure.ac
+@@ -53,8 +53,7 @@ fi
+ AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
+ 
+ save_LIBS="${LIBS}"
+-LIBS=""
+-AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ PTHREAD_LIBS="${LIBS}"
+ LIBS="${save_LIBS}"
+ AC_SUBST(PTHREAD_LIBS)

diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab    4 Dec 2006 16:04:54 -0000       1.1.1.1
+++ patches/patch-ab    1 Apr 2009 14:25:29 -0000
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $
+$NetBSD$
 
---- bin/varnishd/storage_file.c.orig   2006-12-04 16:49:47.000000000 +0100
-+++ bin/varnishd/storage_file.c        2006-12-04 16:54:44.000000000 +0100
-@@ -37,6 +37,11 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
+--- configure.ac.orig  2009-02-12 12:15:25.000000000 +0100
++++ configure.ac
+@@ -190,7 +190,7 @@ AC_ARG_ENABLE(kqueue,
  
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#define statfs        statvfs
-+#endif
-+
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
+ if test "$enable_kqueue" = yes; then
+       case $target in
+-      *-*-freebsd* | *-*-darwin9* )
++      *-*-freebsd* | *-*-darwin9* | *-*-netbsd* )
+               AC_CHECK_FUNCS([kqueue])
+               ;;
+       *-*-bsd*)