From owner-svn-ports-all@freebsd.org Wed Sep 30 16:12:17 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 67BB342B32A; Wed, 30 Sep 2020 16:12:17 +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 4C1h9F266dz4Skp; Wed, 30 Sep 2020 16:12:17 +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 2C7CD2259D; Wed, 30 Sep 2020 16:12:17 +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 08UGCHi6015712; Wed, 30 Sep 2020 16:12:17 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UGCGSU015709; Wed, 30 Sep 2020 16:12:16 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202009301612.08UGCGSU015709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 30 Sep 2020 16:12:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550720 - in head/www/nginx-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/www/nginx-devel: . files X-SVN-Commit-Revision: 550720 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: Wed, 30 Sep 2020 16:12:17 -0000 Author: osa Date: Wed Sep 30 16:12:16 2020 New Revision: 550720 URL: https://svnweb.freebsd.org/changeset/ports/550720 Log: Fix build with -fno-common. Bump PORTREVISION. Submitted by: vanilla Added: head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h (contents, props changed) Deleted: head/www/nginx-devel/files/extra-patch-nchan-store-private.h Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed Sep 30 16:07:59 2020 (r550719) +++ head/www/nginx-devel/Makefile Wed Sep 30 16:12:16 2020 (r550720) @@ -3,7 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Wed Sep 30 16:07:59 2020 (r550719) +++ head/www/nginx-devel/Makefile.extmod Wed Sep 30 16:12:16 2020 (r550720) @@ -138,7 +138,7 @@ 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-private.h +HTTP_PUSH_EXTRA_PATCHES= ${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 Added: head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h Wed Sep 30 16:12:16 2020 (r550720) @@ -0,0 +1,12 @@ +--- ../nchan-1.2.7/src/store/redis/redis_lua_commands.h.orig 2020-09-30 23:51:52.116513000 +0800 ++++ ../nchan-1.2.7/src/store/redis/redis_lua_commands.h 2020-09-30 23:52:11.164617000 +0800 +@@ -63,7 +63,7 @@ typedef struct { + redis_lua_script_t subscriber_unregister; + + } redis_lua_scripts_t; +-redis_lua_scripts_t redis_lua_scripts; +-const int redis_lua_scripts_count; ++extern redis_lua_scripts_t redis_lua_scripts; ++extern const int redis_lua_scripts_count; + #define REDIS_LUA_SCRIPTS_EACH(script) \ + for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++)