From owner-svn-ports-all@freebsd.org Fri Aug 21 11:35:05 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B2F0F3BA9E9; Fri, 21 Aug 2020 11:35:05 +0000 (UTC) (envelope-from joneum@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXzvs4DpWz3YXF; Fri, 21 Aug 2020 11:35:05 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74C9E24939; Fri, 21 Aug 2020 11:35:05 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07LBZ5M1089069; Fri, 21 Aug 2020 11:35:05 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07LBZ4jo089066; Fri, 21 Aug 2020 11:35:04 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202008211135.07LBZ4jo089066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 21 Aug 2020 11:35:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545592 - in head/www/nginx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/www/nginx: . files X-SVN-Commit-Revision: 545592 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2020 11:35:05 -0000 Author: joneum Date: Fri Aug 21 11:35:04 2020 New Revision: 545592 URL: https://svnweb.freebsd.org/changeset/ports/545592 Log: - Fix broken build after NJS update (missing USES+=libedit) - Fix broken build when IP2PROXY is enabled (bad comparison) PR: 248464 Reported by: zi Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-ip2proxy (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Aug 21 11:06:47 2020 (r545591) +++ head/www/nginx/Makefile Fri Aug 21 11:35:04 2020 (r545592) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 22 +PORTREVISION?= 23 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Fri Aug 21 11:06:47 2020 (r545591) +++ head/www/nginx/Makefile.extmod Fri Aug 21 11:35:04 2020 (r545592) @@ -111,6 +111,7 @@ HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:f9815e3: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 @@ -230,6 +231,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:b12fc23:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx +NJS_USES= libedit OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:2d81c29:opentracing OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing Added: head/www/nginx/files/extra-patch-ip2proxy ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ip2proxy Fri Aug 21 11:35:04 2020 (r545592) @@ -0,0 +1,11 @@ +--- ../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; + }