<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d5f03320659b77cc9d05cae852afe119826ce710">https://github.com/macports/macports-ports/commit/d5f03320659b77cc9d05cae852afe119826ce710</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d5f03320659 varnish: update to 7.0.0
</span>d5f03320659 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d5f03320659b77cc9d05cae852afe119826ce710
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Sep 23 19:12:20 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> varnish: update to 7.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Thus, it also contains fix for varnish7 on macOS:
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/varnishcache/varnish-cache/pull/3700
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63495
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63508
</span>---
sysutils/collectd/Portfile | 2 +-
www/varnish/Portfile | 37 ++++++++++++++++++----------
www/varnish/files/varnish7-printf.patch | 43 +++++++++++++++++++++++++++++++++
3 files changed, 68 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/collectd/Portfile b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5cb90eeaf88..20f1cad29d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortSystem 1.0
</span>
name collectd
version 5.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories sysutils net
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/varnish/Portfile b/www/varnish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a983b99b6d2..2e77166f9db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/varnish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/varnish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup varnishcache varnish-cache 7.0.0 varnish-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> name varnish
epoch 20110709
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories www
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {wohner.eu:normen @Gminfly} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {wohner.eu:normen @Gminfly} {@catap korins.ky:kirill} openmaintainer
</span> license BSD
description Varnish is a state-of-the-art, high-performance HTTP accelerator
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,22 +18,30 @@ long_description Varnish was written from the ground up to be a high \
</span> performance caching reverse proxy.
homepage https://varnish-cache.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}_downloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f6e74b4fa9bd49477ef1506e4bd3a0de3c4276f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f636ba2d881b146f480fb52efefae468b36c2c3e6620d07460f9ccbe364a76c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3404617
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 adb826d57a01830f96cf35af81cfa5394ee765c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bb351de8e5afb10b659df157dd04a020eebc56fd974302d38fe7b6ef47ae27e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1717622
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span>
depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-docutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-docutils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:pcre2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles varnish7-printf.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:pcre
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-rst2man=${prefix}/bin/rst2man-3.8.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rst2html=${prefix}/bin/rst2html-3.8.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sphinx-build=${prefix}/bin/sphinx-build-3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-rst2man=${prefix}/bin/rst2man-${python_branch}.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rst2html=${prefix}/bin/rst2html-${python_branch}.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sphinx-build=${prefix}/bin/sphinx-build-${python_branch}
</span>
startupitem.create yes
startupitem.pidfile auto "${prefix}/var/run/${name}/${name}.pid"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/varnish/files/varnish7-printf.patch b/www/varnish/files/varnish7-printf.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..86adbd4c3b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/varnish/files/varnish7-printf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 20e007a5b17c1f68f70ab42080de384f9e192900 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Martin Blix Grydeland <martin@varnish-software.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 22 Sep 2021 10:35:27 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Cast to (u)intmax_t for %ju and %jd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This to silence errors on OSX where apparently int64_t isn't type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+equivalent to intmax_t, causing printf-errors when using %jd.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: #3699
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin/varnishd/http2/cache_http2_panic.c | 7 +++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b9720070ac..06ea40c155 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/bin/varnishd/http2/cache_http2_panic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/bin/varnishd/http2/cache_http2_panic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cache/cache_varnishd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cache/cache_transport.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,13 +110,14 @@ h2_sess_panic(struct vsb *vsb, const struct sess *sp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_printf(vsb, "t_send = %f, t_winupd = %f,\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r2->t_send, r2->t_winupd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_printf(vsb, "t_window = %jd, r_window = %jd,\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- r2->t_window, r2->r_window);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (intmax_t)r2->t_window, (intmax_t)r2->r_window);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!PAN_dump_struct(vsb, r2->rxbuf, H2_RXBUF_MAGIC, "rxbuf")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_printf(vsb, "stvbuf = %p,\n", r2->rxbuf->stvbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_printf(vsb,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "{size, tail, head} = {%u, %ju, %ju},\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- r2->rxbuf->size, r2->rxbuf->tail, r2->rxbuf->head);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r2->rxbuf->size, (uintmax_t)r2->rxbuf->tail,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (uintmax_t)r2->rxbuf->head);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_indent(vsb, -2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VSB_cat(vsb, "},\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>