Attached patch updates www/varnish to 4.0. ok to commit?
jim@
? www/varnish/patches/patch-bin_varnishd_mgt_mgt_main_c Index: www/varnish//Makefile =================================================================== RCS file: /cvs/ports/www/varnish/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- www/varnish//Makefile 4 Jan 2014 16:52:09 -0000 1.16 +++ www/varnish//Makefile 27 Apr 2014 14:06:08 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY = Yes COMMENT = high-performance HTTP accelerator -DISTNAME = varnish-3.0.5 +DISTNAME = varnish-4.0.0 CATEGORIES = www SHARED_LIBS = varnishapi 1.0 @@ -16,7 +16,7 @@ MAINTAINER = Jim Razmus II <jim@openbsd # BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c curses m pcre pthread readline termcap +WANTLIB = c m ncursesw pcre pthread readline termcap MASTER_SITES = http://repo.varnish-cache.org/source/ @@ -30,8 +30,7 @@ TEST_TARGET = check post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish - mv ${WRKINST}${SYSCONFDIR}/varnish/default.vcl \ - ${PREFIX}/share/examples/varnish + rm -f ${PREFIX}/lib/*.{a,la} rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la} .include <bsd.port.mk> Index: www/varnish//distinfo =================================================================== RCS file: /cvs/ports/www/varnish/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- www/varnish//distinfo 4 Jan 2014 16:52:09 -0000 1.6 +++ www/varnish//distinfo 27 Apr 2014 14:06:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (varnish-3.0.5.tar.gz) = MC/Wr8dxUkyjkS9dlFqxl6VXYjhcASsgVN99hr964rc= -SIZE (varnish-3.0.5.tar.gz) = 2116664 +SHA256 (varnish-4.0.0.tar.gz) = S79zZWvhFofLuMfUpzFXhggWh2ZLQKjMvmezb4wLHBc= +SIZE (varnish-4.0.0.tar.gz) = 2372630 Index: www/varnish//patches/patch-bin_varnishd_mgt_param_c =================================================================== RCS file: www/varnish//patches/patch-bin_varnishd_mgt_param_c diff -N www/varnish//patches/patch-bin_varnishd_mgt_param_c --- www/varnish//patches/patch-bin_varnishd_mgt_param_c 23 Dec 2011 13:06:30 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-bin_varnishd_mgt_param_c,v 1.4 2011/12/23 13:06:30 jasper Exp $ ---- bin/varnishd/mgt_param.c.orig Mon Oct 24 03:25:13 2011 -+++ bin/varnishd/mgt_param.c Tue Nov 29 20:39:42 2011 -@@ -261,7 +261,7 @@ tweak_user(struct cli *cli, const struct parspec *par, - (void)par; - if (arg != NULL) { - if (!strcmp(arg, MAGIC_INIT_STRING)) { -- pw = getpwnam("nobody"); -+ pw = getpwnam("_varnish"); - if (pw == NULL) { - master.uid = getuid(); - return; Index: www/varnish//pkg/PLIST =================================================================== RCS file: /cvs/ports/www/varnish/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- www/varnish//pkg/PLIST 23 Sep 2013 08:23:16 -0000 1.5 +++ www/varnish//pkg/PLIST 27 Apr 2014 14:06:08 -0000 @@ -5,51 +5,104 @@ @bin bin/varnishhist @bin bin/varnishlog @bin bin/varnishncsa -@bin bin/varnishreplay -@bin bin/varnishsizes @bin bin/varnishstat @bin bin/varnishtest @bin bin/varnishtop include/varnish/ -include/varnish/varnishapi.h +include/varnish/tbl/ +include/varnish/tbl/acct_fields_bereq.h +include/varnish/tbl/acct_fields_req.h +include/varnish/tbl/backend_poll.h +include/varnish/tbl/ban_vars.h +include/varnish/tbl/bo_flags.h +include/varnish/tbl/body_status.h +include/varnish/tbl/debug_bits.h +include/varnish/tbl/feature_bits.h +include/varnish/tbl/http_headers.h +include/varnish/tbl/http_response.h +include/varnish/tbl/locks.h +include/varnish/tbl/req_body.h +include/varnish/tbl/sess_close.h +include/varnish/tbl/steps.h +include/varnish/tbl/symbol_kind.h +include/varnish/tbl/vcc_types.h +include/varnish/tbl/vcl_returns.h +include/varnish/tbl/vrt_stv_var.h +include/varnish/tbl/vsc_all.h +include/varnish/tbl/vsc_f_main.h +include/varnish/tbl/vsc_fields.h +include/varnish/tbl/vsc_levels.h +include/varnish/tbl/vsc_types.h +include/varnish/tbl/vsl_tags.h +include/varnish/tbl/vsl_tags_http.h +include/varnish/vapi/ +include/varnish/vapi/vapi_options.h +include/varnish/vapi/voptget.h +include/varnish/vapi/vsc.h +include/varnish/vapi/vsc_int.h +include/varnish/vapi/vsl.h +include/varnish/vapi/vsl_int.h +include/varnish/vapi/vsm.h +include/varnish/vapi/vsm_int.h include/varnish/vcli.h -include/varnish/vsc.h -include/varnish/vsc_all.h -include/varnish/vsc_fields.h -include/varnish/vsl.h -include/varnish/vsl_tags.h -include/varnish/vsm.h -lib/libvarnishapi.a -lib/libvarnishapi.la @lib lib/libvarnishapi.so.${LIBvarnishapi_VERSION} lib/pkgconfig/varnishapi.pc lib/varnish/ lib/varnish/libvarnish.so lib/varnish/libvarnishcompat.so -lib/varnish/libvcl.so +lib/varnish/libvcc.so lib/varnish/libvgz.so lib/varnish/vmods/ +lib/varnish/vmods/libvmod_directors.so lib/varnish/vmods/libvmod_std.so @man man/man1/varnishadm.1 @man man/man1/varnishd.1 @man man/man1/varnishhist.1 @man man/man1/varnishlog.1 @man man/man1/varnishncsa.1 -@man man/man1/varnishreplay.1 -@man man/man1/varnishsizes.1 @man man/man1/varnishstat.1 @man man/man1/varnishtest.1 @man man/man1/varnishtop.1 +@man man/man3/vmod_directors.3 @man man/man3/vmod_std.3 @man man/man7/varnish-cli.7 @man man/man7/varnish-counters.7 @man man/man7/vcl.7 +@man man/man7/vsl-query.7 +@man man/man7/vsl.7 @bin sbin/varnishd +share/aclocal/ +share/aclocal/varnish.m4 share/doc/varnish/ +share/doc/varnish/builtin.vcl +share/doc/varnish/example.vcl share/examples/varnish/ -@sample ${SYSCONFDIR}/varnish/ -share/examples/varnish/default.vcl +share/varnish/ +share/varnish/include/ +share/varnish/include/cache/ +share/varnish/include/cache/cache.h +share/varnish/include/cache/cache_backend.h +share/varnish/include/common/ +share/varnish/include/common/common.h +share/varnish/include/common/params.h +share/varnish/include/miniobj.h +share/varnish/include/vas.h +share/varnish/include/vav.h +share/varnish/include/vbm.h +share/varnish/include/vcl.h +share/varnish/include/vcs.h +share/varnish/include/vdef.h +share/varnish/include/vmod_abi.h +share/varnish/include/vqueue.h +share/varnish/include/vre.h +share/varnish/include/vrt.h +share/varnish/include/vrt_obj.h +share/varnish/include/vsa.h +share/varnish/include/vsb.h +share/varnish/include/vsha256.h +share/varnish/vmodtool.py @sample ${SYSCONFDIR}/varnish/default.vcl +@sample ${SYSCONFDIR}/varnish/ @exec-add mkdir -p /var/varnish @extraunexec rm -fr /var/varnish @rcscript ${RCDIR}/varnishd
