From owner-svn-ports-head@freebsd.org Thu Oct 1 15:45:14 2020 Return-Path: Delivered-To: svn-ports-head@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 2DDC142BD16; Thu, 1 Oct 2020 15:45:14 +0000 (UTC) (envelope-from osa@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 4C2HWY4Vhnz4HxS; Thu, 1 Oct 2020 15:45:13 +0000 (UTC) (envelope-from osa@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 109C7130F9; Thu, 1 Oct 2020 15:45:13 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 091FjCdq099157; Thu, 1 Oct 2020 15:45:12 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 091FjCUq099155; Thu, 1 Oct 2020 15:45:12 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202010011545.091FjCUq099155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Thu, 1 Oct 2020 15:45:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550845 - head/www/nginx-devel X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/www/nginx-devel X-SVN-Commit-Revision: 550845 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 15:45:14 -0000 Author: osa Date: Thu Oct 1 15:45:12 2020 New Revision: 550845 URL: https://svnweb.freebsd.org/changeset/ports/550845 Log: Re-add the patch from r550699 to fix build with -fno-common for the third-party nchan module. Bump PORTREVISION. Spotted by: vanilla Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Thu Oct 1 15:36:27 2020 (r550844) +++ head/www/nginx-devel/Makefile Thu Oct 1 15:45:12 2020 (r550845) @@ -3,7 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Thu Oct 1 15:36:27 2020 (r550844) +++ head/www/nginx-devel/Makefile.extmod Thu Oct 1 15:45:12 2020 (r550845) @@ -138,7 +138,8 @@ HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.7:push HTTP_PUSH_VARS= DSO_EXTMODS+=push -HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-redis-redis_lua_commands.h +HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-private.h \ + ${PATCHDIR}/extra-patch-nchan-store-redis-redis_lua_commands.h HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream