diff options
| -rw-r--r-- | www/varnish/Makefile | 6 | ||||
| -rw-r--r-- | www/varnish/distinfo | 9 | ||||
| -rw-r--r-- | www/varnish/patches/patch-bin__varnishd__cache_dir_random.c | 50 |
3 files changed, 7 insertions, 58 deletions
diff --git a/www/varnish/Makefile b/www/varnish/Makefile index 76c4e507059..1bb20eee79a 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2012/10/28 06:31:07 asau Exp $ +# $NetBSD: Makefile,v 1.17 2013/04/21 03:14:15 mspo Exp $ # -DISTNAME= varnish-3.0.2 -PKGREVISION= 4 +DISTNAME= varnish-3.0.3 +#PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ diff --git a/www/varnish/distinfo b/www/varnish/distinfo index d3ca3608cae..12134acfc0e 100644 --- a/www/varnish/distinfo +++ b/www/varnish/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.9 2011/11/12 20:40:16 mspo Exp $ +$NetBSD: distinfo,v 1.10 2013/04/21 03:14:15 mspo Exp $ -SHA1 (varnish-3.0.2.tar.gz) = 906f1536cb7e728d18d9425677907ae723943df7 -RMD160 (varnish-3.0.2.tar.gz) = 6093839815ba72107fa2b52f0a198167a3a6b79b -Size (varnish-3.0.2.tar.gz) = 1977852 bytes -SHA1 (patch-bin__varnishd__cache_dir_random.c) = 1f197db3c543d202b2444192dee4c1095cd0ac2f +SHA1 (varnish-3.0.3.tar.gz) = 6e1535caa30c3f61af00160c59d318e470cd6f57 +RMD160 (varnish-3.0.3.tar.gz) = a911a2637ef26607aad8a1c34a83bc797a15235d +Size (varnish-3.0.3.tar.gz) = 2070020 bytes SHA1 (patch-configure.ac) = 5614b7a0f5d016884e1b6dcb43c42f59af3611db SHA1 (patch-etc__Makefile.in) = 86424950049721ef224facdfbe4cb630a2c46532 diff --git a/www/varnish/patches/patch-bin__varnishd__cache_dir_random.c b/www/varnish/patches/patch-bin__varnishd__cache_dir_random.c deleted file mode 100644 index d89965c5406..00000000000 --- a/www/varnish/patches/patch-bin__varnishd__cache_dir_random.c +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-bin__varnishd__cache_dir_random.c,v 1.1 2011/11/12 20:40:16 mspo Exp $ - -deal with missing exp2 - ---- bin/varnishd/cache_dir_random.c.orig 2011-10-24 07:25:09.000000000 +0000 -+++ bin/varnishd/cache_dir_random.c -@@ -62,6 +62,11 @@ - #include "vsha256.h" - #include "vend.h" - -+#ifndef HAVE_EXP2 -+ #define EXP2_32 4294967296 -+ #define EXP2_31 2147483648 -+#endif -+ - /*--------------------------------------------------------------------*/ - - struct vdi_random_host { -@@ -97,7 +102,11 @@ vdi_random_sha(const char *input, ssize_ - SHA256_Init(&ctx); - SHA256_Update(&ctx, input, len); - SHA256_Final(sign, &ctx); -+#ifndef HAVE_EXP2 -+ return (vle32dec(sign) / EXP2_32); -+#else - return (vle32dec(sign) / exp2(32)); -+#endif - } - - /* -@@ -119,11 +128,19 @@ vdi_random_init_seed(const struct vdi_ra - break; - case c_hash: - AN(sp->digest); -+#ifndef HAVE_EXP2 -+ retval = vle32dec(sp->digest) / EXP2_32; -+#else - retval = vle32dec(sp->digest) / exp2(32); -+#endif - break; - case c_random: - default: -+#ifndef HAVE_EXP2 -+ retval = random() / EXP2_31; -+#else - retval = random() / exp2(31); -+#endif - break; - } - return (retval); |