From nobody Sat Apr 09 12:34:00 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 470D31A91CF0; Sat, 9 Apr 2022 12:34:01 +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 4KbF0n1Zqqz4TdR; Sat, 9 Apr 2022 12:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649507641; 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=Ie5KYr7HVLG5Ody3CCp8kCVjCCjEDL5IPwUDrDXHVDY=; b=hbO014XEt6Pr+PBwM3WcCDXA0Z3JZr4D//+JrQ8Ngr5s4T6LopeDvVNO6IcSD/fDr0J2tT 4amU2B0Wo3+G/X0VhHdgFR6ghGT9YUBWEfyJTbUBzTaPFSmCcAle8yOE+AWgn7gDfu8GTo hs4ocjgmBZqFVCHNdHE+e96lcn1cd6x2GBJc5Ohd8241dXamL0ziTiPzdW3wwp8k4t6HuS osdsAG7VcxnpbSjZIYe9iYeFG8xF+YnTmryMbpuo4dGiPQpuxJUcclANKI5r4pdy8rCKSl tR1q8bZxzFKIkia/NwNck3LbtmncVT9sFg0o0u0iN22eVDpr6Lxxi01TEelK/g== 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 1609C19CC0; Sat, 9 Apr 2022 12:34:01 +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 239CY0wJ051890; Sat, 9 Apr 2022 12:34:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 239CY0DE051889; Sat, 9 Apr 2022 12:34:00 GMT (envelope-from git) Date: Sat, 9 Apr 2022 12:34:00 GMT Message-Id: <202204091234.239CY0DE051889@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: fd546b136ecc - main - www/nginx: Unbreak ip2proxy/ip2location modules 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: fd546b136ecc9e0241bb0a628ffdb8bdaec78ce5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649507641; 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=Ie5KYr7HVLG5Ody3CCp8kCVjCCjEDL5IPwUDrDXHVDY=; b=qFjs1BiYHbqJT/q5wTkhWgpZdd+I23LGlhps+PdVssYEagR1nfJlTGkaByCFIwoA9riTlk R6xRlBh8M0uWdP0+UQIbnIyfmwuLo9u1vgS96xrSyMaSlAXmPgh8ij0Nq+ZxWatJPPElhE 3yjrzmI2j+RBD3EA3D81ZaKrewuBYk9BuZ1LH/J84PpKCZyPsaNBGg3mOUXillNNDK/SMX SFYUjd4/k41UVmkA7ogTYfnq1tvLLvH4Sd6XGDxwiMGAmhlJ3qdhZ1ageH6WaF4VFHZQD7 dVEIlhUwj0v4rYOiQHuTiuhSxoVsMaMqOtzpBdT6GD7dfnCzncIkw8epZea5Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649507641; a=rsa-sha256; cv=none; b=EuvweCHpLttDcpkFLEHA1P9ZKnXp5xuOcNXLe9PhGUlIMZTGhYtkgNHI7LIKSKjyEtp/ss wIw4vpTKBWSJypXyKJTZklo2Y+FBKG050wZTQsN667ZVDL0ZhbnPBnWw6oaKEodpcBs0Bd fBu6088RSc82Lyv3RiS7wHSQ5dh31J07Yuno9lly/zkeP6+lH0Z8Q+mulks0CxKdsXYYrU J0ZfV+ku1UhcYJl306CqdvseFTvXa4j7sOsK5IFd9EdyCiKzhal0SRklJblvhWZanQ8BHG CjJzMXkkFKq/wlYzy5M5UAy3GK7cnkohH8/8XhHRaVAcmNppOQXXs5OAZnkLyw== 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=fd546b136ecc9e0241bb0a628ffdb8bdaec78ce5 commit fd546b136ecc9e0241bb0a628ffdb8bdaec78ce5 Author: Ryan Steinmetz AuthorDate: 2022-04-09 12:31:25 +0000 Commit: Ryan Steinmetz CommitDate: 2022-04-09 12:33:40 +0000 www/nginx: Unbreak ip2proxy/ip2location modules PR: 263174 Reported By: Alessandro Sagratini Approved by: blanket --- www/nginx/Makefile.extmod | 5 ++--- www/nginx/distinfo | 8 ++++---- www/nginx/files/extra-patch-ip2proxy | 11 ----------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index e363c39b0d17..8128f5908b9d 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -109,14 +109,13 @@ HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include HTTP_GEOIP2_VARS= DSO_EXTMODS+=geoip2 HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb -HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:7aa49ce:ip2location +HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:710214c:ip2location HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location -HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:f9815e3:ip2proxy +HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:931599f:ip2proxy HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy -HTTP_IP2PROXY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ip2proxy HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 67591357acda..047eeab687f4 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -67,10 +67,10 @@ SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934 SHA256 (leev-ngx_http_geoip2_module-3.3_GH0.tar.gz) = 41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7 SIZE (leev-ngx_http_geoip2_module-3.3_GH0.tar.gz) = 8509 -SHA256 (ip2location-ip2location-nginx-7aa49ce_GH0.tar.gz) = 588e31def37aacd9afd19f4bf0892e80dcc26e0824f6cce6fa69cf6d44923b29 -SIZE (ip2location-ip2location-nginx-7aa49ce_GH0.tar.gz) = 5932 -SHA256 (ip2location-ip2proxy-nginx-f9815e3_GH0.tar.gz) = 46d6609130724cf6310515a97bf016395aa07781babfb99f092e624dc9e43488 -SIZE (ip2location-ip2proxy-nginx-f9815e3_GH0.tar.gz) = 4954 +SHA256 (ip2location-ip2location-nginx-710214c_GH0.tar.gz) = 06f11b743ee26e5b508b71f3524e8a5c8754078f837d75b648012c921b264183 +SIZE (ip2location-ip2location-nginx-710214c_GH0.tar.gz) = 5323 +SHA256 (ip2location-ip2proxy-nginx-931599f_GH0.tar.gz) = 7b08713caabf254816830aef115cf8755719d8b663f088882d62c21a9ffd0450 +SIZE (ip2location-ip2proxy-nginx-931599f_GH0.tar.gz) = 5043 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 diff --git a/www/nginx/files/extra-patch-ip2proxy b/www/nginx/files/extra-patch-ip2proxy deleted file mode 100644 index d87f389dc751..000000000000 --- a/www/nginx/files/extra-patch-ip2proxy +++ /dev/null @@ -1,11 +0,0 @@ ---- ../ip2proxy-nginx-f9815e3/ngx_http_ip2proxy.c.orig 2020-08-04 06:47:10.018483000 -0400 -+++ ../ip2proxy-nginx-f9815e3/ngx_http_ip2proxy.c 2020-08-04 06:47:20.081413000 -0400 -@@ -537,7 +537,7 @@ - - v->data = *(u_char **) ((char *) ctx->record + data); - -- if (ngx_strcmp(v->data, NOT_SUPPORTED) == 0 || ngx_strcmp(v->data, INVALID_IPV4_ADDRESS) == 0) { -+ if (ngx_strcmp(v->data, NOT_SUPPORTED) == 0 || ngx_strcmp(v->data, INVALID_IP_ADDRESS) == 0) { - v->not_found = 1; - return NGX_OK; - }