From owner-svn-ports-all@freebsd.org Sun Sep 20 11:42:47 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 08B4D3DD5A7; Sun, 20 Sep 2020 11:42:47 +0000 (UTC) (envelope-from se@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 4BvQft6RHnz4QNK; Sun, 20 Sep 2020 11:42:46 +0000 (UTC) (envelope-from se@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 C02831CB32; Sun, 20 Sep 2020 11:42:46 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08KBgkuY033405; Sun, 20 Sep 2020 11:42:46 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08KBgk3H033402; Sun, 20 Sep 2020 11:42:46 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009201142.08KBgk3H033402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Sun, 20 Sep 2020 11:42:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549093 - in head/www: nginx nginx-full nginx/files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/www: nginx nginx-full nginx/files X-SVN-Commit-Revision: 549093 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: Sun, 20 Sep 2020 11:42:47 -0000 Author: se Date: Sun Sep 20 11:42:45 2020 New Revision: 549093 URL: https://svnweb.freebsd.org/changeset/ports/549093 Log: Fix build of www/nginx-full with -fno-common This fix should also apply to www/nginx built with option HTTP_PUSH, but the compilation fails with: error: no member named 'sockaddr' in 'struct redisContext' This seems to be an unrelated issue and I have not tried to diagnose it, yet. The PORTREVISION is only bumped for www/nginx-full, which built for me with this patch applied. Added: head/www/nginx/files/extra-patch-nchan-store-private.h (contents, props changed) Modified: head/www/nginx-full/Makefile head/www/nginx/Makefile.extmod Modified: head/www/nginx-full/Makefile ============================================================================== --- head/www/nginx-full/Makefile Sun Sep 20 11:36:50 2020 (r549092) +++ head/www/nginx-full/Makefile Sun Sep 20 11:42:45 2020 (r549093) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= -full MAINTAINER= robak@FreeBSD.org Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Sun Sep 20 11:36:50 2020 (r549092) +++ head/www/nginx/Makefile.extmod Sun Sep 20 11:42:45 2020 (r549093) @@ -137,6 +137,7 @@ HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14:push HTTP_PUSH_VARS= DSO_EXTMODS+=push +HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-private.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/files/extra-patch-nchan-store-private.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nchan-store-private.h Sun Sep 20 11:42:45 2020 (r549093) @@ -0,0 +1,10 @@ +--- ../nchan-1.1.14/src/store/memory/store-private.h.orig 2020-09-20 13:11:33.781569000 +0200 ++++ ../nchan-1.1.14/src/store/memory/store-private.h 2020-09-20 13:11:48.679855000 +0200 +@@ -172,6 +172,6 @@ + void memstore_chanhead_release(memstore_channel_head_t *ch, char *label); + void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label); + +-uint16_t memstore_worker_generation; //times nginx has been restarted + 1 ++extern uint16_t memstore_worker_generation; //times nginx has been restarted + 1 + + #endif /*MEMSTORE_PRIVATE_HEADER*/