<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/662d7a0347dd59004afc2cf8a989f443efc10d12">https://github.com/macports/macports-ports/commit/662d7a0347dd59004afc2cf8a989f443efc10d12</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 662d7a0347d varnish: update to 7.1.0
</span>662d7a0347d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 662d7a0347dd59004afc2cf8a989f443efc10d12
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Apr 5 01:59:11 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> varnish: update to 7.1.0
</span>---
www/varnish/Portfile | 11 +++------
www/varnish/files/varnish7-printf.patch | 43 ---------------------------------
2 files changed, 4 insertions(+), 50 deletions(-)
<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 03f6d769155..ba7ff3f744e 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup varnishcache varnish-cache 7.0.2 varnish-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup varnishcache varnish-cache 7.1.0 varnish-
</span> github.tarball_from archive
name varnish
epoch 20110709
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description Varnish was written from the ground up to be a high \
</span>
homepage https://varnish-cache.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5cc9552208c880bb9154e0e5adf0190a72c20c04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b51bc252d0a247173c08b3b4aa4f82757bef658444324507349d53e671c772f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1719908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e5910d7febf53fa81321d7f25a2b640854e9fa0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6dc4b066a949886e917736c21ae4e9ee3f519d7479820914643b45133a793684 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1742291
</span>
set python_branch 3.10
set python_version [string map {. {}} ${python_branch}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ depends_build port:pkgconfig \
</span>
depends_lib port:pcre2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles varnish7-printf.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
autoreconf.args -fi
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86adbd4c3b6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/varnish/files/varnish7-printf.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 20e007a5b17c1f68f70ab42080de384f9e192900 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Martin Blix Grydeland <martin@varnish-software.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 22 Sep 2021 10:35:27 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Cast to (u)intmax_t for %ju and %jd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This to silence errors on OSX where apparently int64_t isn't type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-equivalent to intmax_t, causing printf-errors when using %jd.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: #3699
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/varnishd/http2/cache_http2_panic.c | 7 +++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index b9720070ac..06ea40c155 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/bin/varnishd/http2/cache_http2_panic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/bin/varnishd/http2/cache_http2_panic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cache/cache_varnishd.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cache/cache_transport.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,13 +110,14 @@ h2_sess_panic(struct vsb *vsb, const struct sess *sp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_printf(vsb, "t_send = %f, t_winupd = %f,\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r2->t_send, r2->t_winupd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_printf(vsb, "t_window = %jd, r_window = %jd,\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r2->t_window, r2->r_window);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (intmax_t)r2->t_window, (intmax_t)r2->r_window);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PAN_dump_struct(vsb, r2->rxbuf, H2_RXBUF_MAGIC, "rxbuf")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_printf(vsb, "stvbuf = %p,\n", r2->rxbuf->stvbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_printf(vsb,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "{size, tail, head} = {%u, %ju, %ju},\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r2->rxbuf->size, r2->rxbuf->tail, r2->rxbuf->head);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r2->rxbuf->size, (uintmax_t)r2->rxbuf->tail,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (uintmax_t)r2->rxbuf->head);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_indent(vsb, -2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VSB_cat(vsb, "},\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>