Index: head/www/varnish4/Makefile =================================================================== --- head/www/varnish4/Makefile (revision 535758) +++ head/www/varnish4/Makefile (revision 535759) @@ -1,54 +1,54 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 4.1.10 +PORTVERSION= 4.1.11 DISTVERSIONPREFIX= varnish- -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= www PKGNAMESUFFIX= 4 MAINTAINER= feld@FreeBSD.org COMMENT= High-performance HTTP accelerator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rst2man:textproc/py-docutils LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS= varnish-2.* varnish-3.* USES= autoreconf cpe gmake libedit libtool ncurses pathfix \ pkgconfig python:2.7,build readline shebangfix SHEBANG_FILES= lib/libvcc/vmodtool.py CPE_VENDOR= varnish-cache CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX} --enable-tests USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check # some tests fail TEST_ARGS= TESTS_PARALLELISM=1 USE_GITHUB= yes GH_ACCOUNT= varnishcache GH_PROJECT= varnish-cache USERS= varnish varnishlog GROUPS= varnish USE_RC_SUBR= varnishd varnishlog varnishncsa SUB_FILES= pkg-message .if defined(NO_INET6) || defined(WITHOUT_INET6) BAD_TESTS+= r00832 EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch .endif OPTIONS_DEFINE= DOCS post-patch: .if defined(BAD_TESTS) ${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|} .endif .include Index: head/www/varnish4/distinfo =================================================================== --- head/www/varnish4/distinfo (revision 535758) +++ head/www/varnish4/distinfo (revision 535759) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536767576 -SHA256 (varnishcache-varnish-cache-varnish-4.1.10_GH0.tar.gz) = 44e0fa32112ffc1f8331f66c48b761e75bc1e4b10a9a0d4b58f63c202ce5c3f8 -SIZE (varnishcache-varnish-cache-varnish-4.1.10_GH0.tar.gz) = 953083 +TIMESTAMP = 1589821255 +SHA256 (varnishcache-varnish-cache-varnish-4.1.11_GH0.tar.gz) = eb2ad84cc1fb8d2a0e80cb4d9c43b1b79cd56b839440258de9f3d10854564cab +SIZE (varnishcache-varnish-cache-varnish-4.1.11_GH0.tar.gz) = 956466 Index: head/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c =================================================================== --- head/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c (nonexistent) +++ head/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c (revision 535759) @@ -0,0 +1,42 @@ +--- lib/libvmod_std/vmod_std_conversions.c.orig 2019-02-11 14:06:27 UTC ++++ lib/libvmod_std/vmod_std_conversions.c +@@ -45,6 +45,21 @@ + #include "vtim.h" + #include "vcc_if.h" + ++/* ++ * technically, as our VCL_INT is int64_t, its limits are INT64_MIN/INT64_MAX. ++ * ++ * Yet, for conversions, we use VNUMpfx with a double intermediate, so above ++ * 2^53 we see rounding errors. In order to catch a potential floor rounding ++ * error, we make our limit 2^53-1 ++ * ++ * Ref: https://stackoverflow.com/a/1848762 ++ */ ++#define VCL_INT_MAX ((INT64_C(1)<<53)-1) ++#define VCL_INT_MIN (-VCL_INT_MAX) ++ ++#define VCL_BYTES_MAX VCL_INT_MAX ++#define VCL_BYTES_MIN 0 ++ + VCL_DURATION __match_proto__(td_std_duration) + vmod_duration(VRT_CTX, VCL_STRING p, VCL_DURATION d) + { +@@ -195,7 +210,7 @@ vmod_real2integer(VRT_CTX, VCL_REAL r, VCL_INT i) + if (!isfinite(r)) + return (i); + r = round(r); +- if (r > LONG_MAX || r < LONG_MIN) ++ if (r > VCL_INT_MAX || r < VCL_INT_MIN) + return(i); + return ((long)r); + } +@@ -219,7 +234,7 @@ vmod_time2integer(VRT_CTX, VCL_TIME t, VCL_INT i) + if (!isfinite(t)) + return (i); + t = round(t); +- if (t > LONG_MAX || t < LONG_MIN) ++ if (t > VCL_INT_MAX || t < VCL_INT_MIN) + return(i); + return ((long)t); + } Property changes on: head/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property