From nobody Thu Nov 2 17:59:24 2023 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 4SLs8D5Plhz4yxSJ; Thu, 2 Nov 2023 17:59:24 +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 4SLs8D4qWFz3Rbg; Thu, 2 Nov 2023 17:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698947964; 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=O8UDo3sW3NJaS73dFF3/axqlxj3QLa0hgD0kyT0T5TM=; b=QCc3rFnR5I3cwus25YQ7k+7sGtDEsWaQczh4M+Sfekunscr7RVRoahpophsAUEixtX0XEr ufZ8GvAgbL1z59rFA/Krf4SkUi0bYve80yCfTjctahF2VEhyN4xv2yoymNGv95yh68A5CD DOL/AxdF/ZwTklFOsMjIHXa9ahCdIKHHZuHcLyyDZF6Ewv42vMJP1Pt0ga9SeBuQvBlZxZ kzKfX2mbtWt/KBSwyB08tO6lfhZKE+KmTtl6kzK7sfc6Sl5/ubLmfpOjG0Su7iXGjD/Q43 W1iW5k7LXBYhUgkpG0UFS09Tlx9U0Em78D8Dd/PZA6Pz/23MKaqN0oWsUG4kyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698947964; 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=O8UDo3sW3NJaS73dFF3/axqlxj3QLa0hgD0kyT0T5TM=; b=cVIs/hoelJGuvrKQzcaFJDrBnviCSBkpJ8hE4sCHI7LLlSRyyHVKeeUOqprdqNnvgytYhu P0nv6G/EW7YaEsj5y5TKcGGJzUgWWWJ5fSBuP803QJcPS7IBK2kMweemsrpOrM6gQJmxlt uYzH7CmbY6mSuQO95nPdrecgnEN+MHgS/CWWWMaDr5ghyVmFnRGTYW7PG3DCBZevfRgeBa tT0alwjQV5hcc+wt61OOowCuh9VkJzig4IIo/PxEYyIS0S+fht78DGaW2LsotDmddTPBVQ ukhhnC+6WUoDOQI0xNweYDJgZaPhDOxSBHVONmV/TK4STEWJm8LjZUuLhbbKWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698947964; a=rsa-sha256; cv=none; b=WK9Cw8vTRMT+OjGv3Dq6JJhUf32jC43xT2ME+7VrM0yGhILJzl0KFfs4OXZny3MHjahc9T 3cGuFMGVNeBfvAShNwogM6M2UXLLGVrUsXXts4oGTgiq2o6UL5dpr3BnsTjrZnT0ZzcZHg fk8GoyolzaT7oI4b2UnKTe1xWkGMlovXFEY/qy4Plt/zcnYUrLvTt8BVgTOzjNBINKGVVv 1a7HBdeClFCdVIIcIWx8tlddwCoMSs00GTAtvEcbaoBDXhmkc8JD8NocHqVKVNpDWXp7nS FhAZ4yy8PE8IGbSbsU4OvkncHWofsHMumo1Tjq5EAu6Sl9mWbs/y1iJecBrlNg== 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 4SLs8D3bQyzfw0; Thu, 2 Nov 2023 17:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2HxObO061346; Thu, 2 Nov 2023 17:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2HxODj061343; Thu, 2 Nov 2023 17:59:24 GMT (envelope-from git) Date: Thu, 2 Nov 2023 17:59:24 GMT Message-Id: <202311021759.3A2HxODj061343@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: b4d7b4b8d8dc - main - www/varnish-ip2location: Update to upstream commit 32ff41a, bump 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: b4d7b4b8d8dcf97208f9b5afb1f963116c9e3d7b Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4d7b4b8d8dcf97208f9b5afb1f963116c9e3d7b commit b4d7b4b8d8dcf97208f9b5afb1f963116c9e3d7b Author: Ryan Steinmetz AuthorDate: 2023-11-02 17:59:19 +0000 Commit: Ryan Steinmetz CommitDate: 2023-11-02 17:59:19 +0000 www/varnish-ip2location: Update to upstream commit 32ff41a, bump --- www/varnish-ip2location/Makefile | 4 +- www/varnish-ip2location/distinfo | 6 +-- .../files/patch-src_vmod__ip2location.c | 44 ---------------------- 3 files changed, 5 insertions(+), 49 deletions(-) diff --git a/www/varnish-ip2location/Makefile b/www/varnish-ip2location/Makefile index d4d4375f882c..049d0992087a 100644 --- a/www/varnish-ip2location/Makefile +++ b/www/varnish-ip2location/Makefile @@ -1,6 +1,6 @@ PORTNAME= ip2location PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= varnish- @@ -30,7 +30,7 @@ CFLAGS+= -I${WRKSRC}/src USE_GITHUB= yes GH_ACCOUNT= ip2location GH_PROJECT= ${PORTNAME}-varnish -GH_TAGNAME= b24b36e +GH_TAGNAME= 32ff41a OPTIONS_DEFINE= DOCS diff --git a/www/varnish-ip2location/distinfo b/www/varnish-ip2location/distinfo index f9aa9c41c473..baa10f951a60 100644 --- a/www/varnish-ip2location/distinfo +++ b/www/varnish-ip2location/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1698945834 +SHA256 (ip2location-ip2location-varnish-1.0.3-32ff41a_GH0.tar.gz) = 5b741cb1d101105b5363218d69d62dff597f132e515c5492c4d317d5dbcd59f1 +SIZE (ip2location-ip2location-varnish-1.0.3-32ff41a_GH0.tar.gz) = 6735 diff --git a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c b/www/varnish-ip2location/files/patch-src_vmod__ip2location.c deleted file mode 100644 index 3f2ff55e821a..000000000000 --- a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c +++ /dev/null @@ -1,44 +0,0 @@ ---- src/vmod_ip2location.c.orig 2020-11-29 23:51:52 UTC -+++ src/vmod_ip2location.c -@@ -6,6 +6,11 @@ - - #include - -+#ifdef __FreeBSD__ -+#include -+#define gcvt(v, d, c) sprintf(c, "%*g", d, v); -+#endif -+ - #include "cache/cache.h" - - #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