From nobody Fri Apr 08 15:59:31 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 27FDC1247655; Fri, 8 Apr 2022 15:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZjcM6Lkyz4nP2; Fri, 8 Apr 2022 15:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649433572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzqe2rVVu4eTeJT+pdmuoj+QBpsRF9TZ/lw8NfkHffg=; b=mJyYeNxmSheZG6471R2ANJUF2yctKT11B16kScpNpuH3TeHHp0spYtBtVL5vjX6Ffs/vIb wM3cnRWKJ8dJIV5A2Q+ux71IROKy8+alwU8+kxw/llAMq3SR53tObaQqZBFfnF8Oq/z7be 90m9+nVqFnRSADFD+lENCzHdBqi5D62ruswoAkJk+wxHXJ8xL8Jk0KM/SALWLN4jlMJuZr ZqZYxRArfh3+OQFx+LegIK+PVClbZrOVyZkfwxK76Fs+9IVEVFMxjrGp+G2v0Txa9PEOij PeOaQo592rduzGN/3MYFQIgJYcr3XKZeFgTo+txHDBShn6OEyxRlBg4zegMkrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F040275F0; Fri, 8 Apr 2022 15:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 238FxVwj068928; Fri, 8 Apr 2022 15:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238FxVU0068927; Fri, 8 Apr 2022 15:59:31 GMT (envelope-from git) Date: Fri, 8 Apr 2022 15:59:31 GMT Message-Id: <202204081559.238FxVU0068927@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 67fdef2e3c6d - main - www/varnish-ip2location: Update, fix build with varnish 7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67fdef2e3c6d16016820dc8edb1e9fbb97e9db14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649433572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzqe2rVVu4eTeJT+pdmuoj+QBpsRF9TZ/lw8NfkHffg=; b=ClpICxRlHLuUhysfm1/DKNNWzbS/TI7YCz8eoFn1R7hePt13FxGOJklH2cJBxNqNo1fRBy D23yXdH25Qir6cHY/mv+t9V7wplE3hGuMpvR2mkdDw+R4VxqRrOcGaj6wd+7UgFU/hGQ1h 8WBhTv/6JSHnf4NpVHKGiSLZuh7D6pkpgSWE3wVoiS1BNIqM1s/XRchQlHjdBRzP7IiM2a KhpGJEqi/SZUq3zNjlfoM8qbXBpTi2KnM/HIuePwgIjLEtB4YIMLE/oveeeAZU4lJSilTI bfQPYHXYWYzLNn1yBaVbniDQsjnNFYYzUxD58xcfOphm1t51jBkBnwaJwacIxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649433572; a=rsa-sha256; cv=none; b=Pvc2bD1MtlmEo9vdRJigC/8DvKyBKd7ZaMVA+Djf6cJI2b+MKgX1WrloVYORawlgvJNenD +er6MPjixKgSCLtGU8HSq3EXzYNYAUtQBswR+/8S+Q08y8AYpO38ODEQ482jekJZbpA3dJ qylzLbYMwZtzrw4s/vfYUZ6y7wnlqHi3jYS6uVg5xEqbFxmphfyEw1bRb1AIt+mQB6MxGt 3FQ748S6jNA8200/aUvflPjboUiXV9W9tqQloCq2i9FNkR18Uz6pgfnQ/LBkSZ7QCzEqzw Xl0hzPB0/1WRKgt89UhHQ06e6QWG/glv37AXHcrnugnTluTWQ7dbhuI6bO1fAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=67fdef2e3c6d16016820dc8edb1e9fbb97e9db14 commit 67fdef2e3c6d16016820dc8edb1e9fbb97e9db14 Author: Ryan Steinmetz AuthorDate: 2022-04-08 15:58:09 +0000 Commit: Ryan Steinmetz CommitDate: 2022-04-08 15:59:11 +0000 www/varnish-ip2location: Update, fix build with varnish 7 --- www/varnish-ip2location/Makefile | 5 +-- www/varnish-ip2location/distinfo | 6 ++-- www/varnish-ip2location/files/patch-Makefile.am | 6 ++-- .../files/patch-src_vmod__ip2location.c | 40 +++++++++++++++++++--- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/www/varnish-ip2location/Makefile b/www/varnish-ip2location/Makefile index 577eca0b3c13..01f20b0d28ed 100644 --- a/www/varnish-ip2location/Makefile +++ b/www/varnish-ip2location/Makefile @@ -2,6 +2,7 @@ PORTNAME= ip2location PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= varnish- @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LIB_DEPENDS= libIP2Location.so:net/ip2location BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} -USES= autoreconf:build libtool pkgconfig python:build varnish:6 +USES= autoreconf:build libtool pkgconfig python:build varnish:7 USE_LDCONFIG= yes PLIST_FILES= lib/varnish/vmods/libvmod_ip2location.so @@ -30,7 +31,7 @@ CFLAGS+= -I${WRKSRC}/src USE_GITHUB= yes GH_ACCOUNT= ip2location GH_PROJECT= ${PORTNAME}-varnish -GH_TAGNAME= 25928cf +GH_TAGNAME= b24b36e OPTIONS_DEFINE= DOCS diff --git a/www/varnish-ip2location/distinfo b/www/varnish-ip2location/distinfo index d7fff7a2c57c..f9aa9c41c473 100644 --- a/www/varnish-ip2location/distinfo +++ b/www/varnish-ip2location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649178745 -SHA256 (ip2location-ip2location-varnish-1.0.3-25928cf_GH0.tar.gz) = d10c85a42efa5aed788fe6fc30e5761a057b63e99643e6a466dd2aca736a6111 -SIZE (ip2location-ip2location-varnish-1.0.3-25928cf_GH0.tar.gz) = 7056 +TIMESTAMP = 1649431734 +SHA256 (ip2location-ip2location-varnish-1.0.3-b24b36e_GH0.tar.gz) = 3c8e5220c6a1807cde5dc53a76201ef3674e73afee94b61e1180edbe707e930f +SIZE (ip2location-ip2location-varnish-1.0.3-b24b36e_GH0.tar.gz) = 6667 diff --git a/www/varnish-ip2location/files/patch-Makefile.am b/www/varnish-ip2location/files/patch-Makefile.am index 1b317c8a93c8..4ebde7be637f 100644 --- a/www/varnish-ip2location/files/patch-Makefile.am +++ b/www/varnish-ip2location/files/patch-Makefile.am @@ -1,4 +1,4 @@ ---- Makefile.am.orig 2020-07-31 00:31:08 UTC +--- Makefile.am.orig 2020-11-29 23:51:52 UTC +++ Makefile.am @@ -5,18 +5,11 @@ SUBDIRS = src DISTCHECK_CONFIGURE_FLAGS = \ @@ -17,9 +17,9 @@ -if HAVE_RST2MAN - ${RST2MAN} README.rst $@ -else -- @echo "========================================" -- @echo "You need rst2man installed to make dist" +vmod_ip2location.3: @echo "========================================" +- @echo "You need rst2man installed to make dist" +- @echo "========================================" - @false -endif diff --git a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c b/www/varnish-ip2location/files/patch-src_vmod__ip2location.c index 3808b3447dc6..3f2ff55e821a 100644 --- a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c +++ b/www/varnish-ip2location/files/patch-src_vmod__ip2location.c @@ -1,8 +1,8 @@ ---- src/vmod_ip2location.c.orig 2020-07-24 05:30:13 UTC +--- src/vmod_ip2location.c.orig 2020-11-29 23:51:52 UTC +++ src/vmod_ip2location.c -@@ -12,6 +12,11 @@ - #include - #include +@@ -6,6 +6,11 @@ + + #include +#ifdef __FreeBSD__ +#include @@ -11,4 +11,34 @@ + #include "cache/cache.h" - /* Varnish < 6.2 compat */ + #ifndef VRT_H_INCLUDED +@@ -13,12 +18,19 @@ + #endif + + void +-i2pl_free(void *obj) ++ip2l_free(VRT_CTX, void *obj) + { + AN(obj); ++ CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); + IP2Location_close((IP2Location *)obj); + } + ++static const struct vmod_priv_methods ip2l_methods[1] = {{ ++ .magic = VMOD_PRIV_METHODS_MAGIC, ++ .type = "vmod_std_ip2location", ++ .fini = ip2l_free ++}}; ++ + VCL_VOID + vmod_init_db(VRT_CTX, struct vmod_priv *priv, char *filename, char *memtype) + { +@@ -51,7 +63,7 @@ vmod_init_db(VRT_CTX, struct vmod_priv *priv, char *fi + IP2Location_set_lookup_mode(IP2LocationObj, mtype); + + priv->priv = IP2LocationObj; +- priv->free = i2pl_free; ++ priv->methods = ip2l_methods; + } + + static VCL_STRING