On Fri, Mar 16, 2018 at 09:15:34AM +0100, Gonzalo L. Rodriguez wrote: > Hallo, > > Update for Varnish to 6.0.0: > > https://varnish-cache.org/docs/6.0/whats-new/changes-6.0.html > > OK? Comments? Updated diff with proper python handling as briefly discussed off-list with Gonzalo already. Python 3 will through unicode errors when processing various .rst files.
I also added s/cp/INSTALL_DATA/ and some (whitespace) nits. WRKDIST is set to default so leave it, plus we can build outside the source tree. How about improving DESCR? It's quite sparse and mentioning things like HTTP/2 and sharding for example would definitely be helpful when searching packages for an adequate proxy. Index: Makefile =================================================================== RCS file: /cvs/ports/www/varnish/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- Makefile 5 Feb 2018 14:03:26 -0000 1.36 +++ Makefile 16 Mar 2018 14:58:07 -0000 @@ -2,12 +2,11 @@ COMMENT = high-performance HTTP accelerator -DISTNAME = varnish-5.2.1 -REVISION = 1 +DISTNAME = varnish-6.0.0 CATEGORIES = www -SHARED_LIBS = varnishapi 1.0 +SHARED_LIBS = varnishapi 1.0 # 1.6 HOMEPAGE = https://www.varnish-cache.org/ @@ -17,38 +16,43 @@ MAINTAINER = Jim Razmus II <jim@openbsd # BSD PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = https://varnish-cache.org/_downloads/ +MASTER_SITES = https://varnish-cache.org/_downloads/ EXTRACT_SUFX = .tgz -WANTLIB += c execinfo m ncursesw pcre pthread readline termcap +WANTLIB += c curses execinfo m pcre pthread readline + +MODULES = lang/python +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} +MODPY_RUNDEP = No +MODPY_ADJ_FILES = lib/libvcc/{vsc,vmod}tool.py BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ devel/libtool \ - textproc/py-docutils -LIB_DEPENDS = devel/pcre + textproc/py-docutils${MODPY_FLAVOR} +LIB_DEPENDS = devel/pcre # The internal backtrace implementation fails to build with -Werror on arm/hppa LIB_DEPENDS += devel/libexecinfo -WRKDIST = ${WRKDIR}/${DISTNAME} USE_GMAKE = Yes +SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu AUTOCONF_VERSION = 2.69 AUTOMAKE_VERSION = 1.15 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \ + PYTHON="${MODPY_BIN}" TEST_TARGET = check -post-patch: +pre-configure: cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish - cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \ + ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \ ${PREFIX}/share/examples/varnish rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la} Index: distinfo =================================================================== RCS file: /cvs/ports/www/varnish/distinfo,v retrieving revision 1.18 diff -u -p -r1.18 distinfo --- distinfo 22 Nov 2017 21:56:30 -0000 1.18 +++ distinfo 16 Mar 2018 14:58:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM= -SIZE (varnish-5.2.1.tgz) = 2827676 +SHA256 (varnish-6.0.0.tgz) = x7KDnJWyvx8zarwgtdixScOqct7/FC8jedHUMSBrC+4= +SIZE (varnish-6.0.0.tgz) = 3033621 Index: patches/patch-lib_libvmod_unix_cred_compat_h =================================================================== RCS file: patches/patch-lib_libvmod_unix_cred_compat_h diff -N patches/patch-lib_libvmod_unix_cred_compat_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_libvmod_unix_cred_compat_h 16 Mar 2018 14:58:07 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: lib/libvmod_unix/cred_compat.h +--- lib/libvmod_unix/cred_compat.h.orig ++++ lib/libvmod_unix/cred_compat.h +@@ -48,7 +48,7 @@ get_ids(int fd, uid_t *uid, gid_t *gid) + + #if defined(SO_PEERCRED) + +- struct ucred ucred; ++ struct sockpeercred ucred; + socklen_t l = sizeof(ucred); + + errno = 0; Index: pkg/MESSAGE =================================================================== RCS file: /cvs/ports/www/varnish/pkg/MESSAGE,v retrieving revision 1.5 diff -u -p -r1.5 MESSAGE --- pkg/MESSAGE 17 Jan 2017 14:04:15 -0000 1.5 +++ pkg/MESSAGE 16 Mar 2018 14:58:07 -0000 @@ -1,8 +1,8 @@ Varnish has a default configuration built in, however see vcl(7) or the following link for more information: - http://www.varnish-cache.org/wiki/VCLExamples + ${HOMEPAGE}wiki/VCLExamples and for further information: - https://www.varnish-cache.org/docs/5.0/ + ${HOMEPAGE}docs/6.0/ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/varnish/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 18 Sep 2017 14:09:53 -0000 1.11 +++ pkg/PLIST 16 Mar 2018 14:58:07 -0000 @@ -14,10 +14,9 @@ include/varnish/cache/cache.h include/varnish/cache/cache_backend.h include/varnish/cache/cache_director.h include/varnish/cache/cache_filter.h +include/varnish/cache/cache_varnishd.h include/varnish/common/ -include/varnish/common/com_params.h -include/varnish/common/common.h -include/varnish/common/common_vsm.h +include/varnish/common/common_param.h include/varnish/miniobj.h include/varnish/tbl/ include/varnish/tbl/acct_fields_bereq.h @@ -63,7 +62,6 @@ 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 @@ -97,8 +95,10 @@ lib/varnish/ lib/varnish/vmods/ lib/varnish/vmods/libvmod_blob.so lib/varnish/vmods/libvmod_directors.so +lib/varnish/vmods/libvmod_proxy.so lib/varnish/vmods/libvmod_purge.so lib/varnish/vmods/libvmod_std.so +lib/varnish/vmods/libvmod_unix.so lib/varnish/vmods/libvmod_vtc.so @man man/man1/varnishadm.1 @man man/man1/varnishd.1 @@ -110,8 +110,10 @@ lib/varnish/vmods/libvmod_vtc.so @man man/man1/varnishtop.1 @man man/man3/vmod_blob.3 @man man/man3/vmod_directors.3 +@man man/man3/vmod_proxy.3 @man man/man3/vmod_purge.3 @man man/man3/vmod_std.3 +@man man/man3/vmod_unix.3 @man man/man3/vmod_vtc.3 @man man/man7/varnish-cli.7 @man man/man7/varnish-counters.7 @@ -126,11 +128,6 @@ share/aclocal/varnish.m4 share/doc/varnish/ share/doc/varnish/builtin.vcl share/doc/varnish/example.vcl -share/varnish/ -share/varnish/vcl/ -share/varnish/vcl/devicedetect.vcl -share/varnish/vmodtool.py -share/varnish/vsctool.py share/examples/varnish/ @sample ${SYSCONFDIR}/varnish/ share/examples/varnish/builtin.vcl @@ -139,4 +136,9 @@ share/examples/varnish/example.vcl @sample ${SYSCONFDIR}/varnish/example.vcl @exec-add mkdir -p /var/varnish @extraunexec rm -fr /var/varnish +share/varnish/ +share/varnish/vcl/ +share/varnish/vcl/devicedetect.vcl +share/varnish/vmodtool.py +share/varnish/vsctool.py @rcscript ${RCDIR}/varnishd
