From owner-svn-ports-head@freebsd.org Wed Sep 30 15:58:37 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 B8B4F42ABCE for ; Wed, 30 Sep 2020 15:58:37 +0000 (UTC) (envelope-from vanilla@fatpipi.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C1gsS66wjz4RQW for ; Wed, 30 Sep 2020 15:58:36 +0000 (UTC) (envelope-from vanilla@fatpipi.com) Received: by mail-ed1-x52a.google.com with SMTP id n13so2398556edo.10 for ; Wed, 30 Sep 2020 08:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fatpipi-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:reply-to:from:date:message-id :subject:to:cc; bh=ILHtRipo6v0BtRA7W9tiqST+m1sJaMeRl/FZsh4WQ/Q=; b=SrfZuHNLel/D2oa1CgS6Mt+woLx0JYd/8L/ZrHaFaUtuxG60sCs+AJOaFgZAR6rMKU qoki4DicLwTp4f6hh4cyD+0JqS2jhG2WU1s+CHztXknTWDwvBe3MjQ7Q1639uP3M3ejh sZ5oZ9a7EInIC9CpiUgJr+YmqUuM+BBg5/mm6+AZIDmQg1rKPe/30/moW6B6ap4PUyLS lBFCmCXQjInpoQ5cczXMNLJiVBG2RYMzErukDTyq0WXmXYYLvkDGohrqkXCjQa6TmzBn p6wKn1M7J36Zy/CyCE5Jk3aFzwsNvE6hXEw71idFm/MKvhqG3znbfQhFbLvTzsdCS1DP dRYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=ILHtRipo6v0BtRA7W9tiqST+m1sJaMeRl/FZsh4WQ/Q=; b=sVZRKX9qLx40JOIRBo/8Pk4E837fFE01H7PXeNyIs5LysAIyo2fp7oogktXf+8FVRL QWMvAYvCnUsDuFy1WMslScmUcoghQdJVqIo0DWRIf2siJGbs0G0BGW1iLnDEhMHJ/8kI vUl4Vbfzg3aU61GenPxEs5yJNTHfj5t3tBBYo92LcDiJ2HWrM6sivoJpXtnH0C0mknfo 89y9+YRKX1tfirkm7Wa7CLGdD2yf/et+CLRtkjYieB2/xKIxTIVUMgDi8CWHyuZNqffz J6kbXEm9YzNoljLIG5weORKCdwjhqRf1zlvc2reIHPkZUANTwXkQhgWLUSSSkmgoIylt bLZg== X-Gm-Message-State: AOAM531EnaGEiYXqjual7osiEOgKIQJfKpOVSgw6/CfJW2GJRvNVIkJS IiIGH42QfVoTu5P7TlAAwt+czLJ4MSdA7F6a+4o+bQ== X-Google-Smtp-Source: ABdhPJwp8ewtE5Iw6gGbJmnqb0ukGSmXlQ7YkVevIVeZHLdiffMP1m9+BPMntzCdpeoGHvqp/3mnx9IMdIkrv8lQoHk= X-Received: by 2002:aa7:ce15:: with SMTP id d21mr3495388edv.284.1601481514288; Wed, 30 Sep 2020 08:58:34 -0700 (PDT) MIME-Version: 1.0 References: <202009301311.08UDBRQD004568@repo.freebsd.org> In-Reply-To: <202009301311.08UDBRQD004568@repo.freebsd.org> Reply-To: v@fatpipi.com From: Vanilla Hsu Date: Wed, 30 Sep 2020 23:58:22 +0800 Message-ID: Subject: Re: svn commit: r550699 - in head/www/nginx-devel: . files To: "Sergey A. Osokin" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: multipart/mixed; boundary="000000000000c6458905b089f8ea" X-Rspamd-Queue-Id: 4C1gsS66wjz4RQW X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fatpipi-com.20150623.gappssmtp.com header.s=20150623 header.b=SrfZuHNL; dmarc=none; spf=none (mx1.freebsd.org: domain of vanilla@fatpipi.com has no SPF policy when checking 2a00:1450:4864:20::52a) smtp.mailfrom=vanilla@fatpipi.com X-Spamd-Result: default: False [0.21 / 15.00]; HAS_REPLYTO(0.00)[v@fatpipi.com]; TO_DN_SOME(0.00)[]; HAS_ATTACHMENT(0.00)[]; DKIM_TRACE(0.00)[fatpipi-com.20150623.gappssmtp.com:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~,4:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.971]; R_DKIM_ALLOW(-0.20)[fatpipi-com.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[vanilla]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.80)[0.801]; NEURAL_HAM_LONG(-0.92)[-0.920]; MIME_GOOD(-0.10)[multipart/mixed,multipart/alternative,text/plain]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[svn-ports-head@freebsd.org]; MIME_BAD_ATTACHMENT(1.60)[h]; DMARC_NA(0.00)[fatpipi.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52a:from]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-ports-head] X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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: Wed, 30 Sep 2020 15:58:37 -0000 --000000000000c6458905b089f8ea Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi: my bad, nchan-1.2.7 need another patch to fix the fno-common issue. please help to review, thanks. Sergey A. Osokin =E6=96=BC 2020=E5=B9=B49=E6=9C=8830=E6= =97=A5 =E9=80=B1=E4=B8=89 =E4=B8=8B=E5=8D=889:11=E5=AF=AB=E9=81=93=EF=BC=9A > Author: osa > Date: Wed Sep 30 13:11:26 2020 > New Revision: 550699 > URL: https://svnweb.freebsd.org/changeset/ports/550699 > > Log: > Merge r549093 to fix build with -fno-common. > Bump PORTREVISION. > > Spotted by: vanilla > > Added: > head/www/nginx-devel/files/extra-patch-nchan-store-private.h > (contents, props changed) > Modified: > head/www/nginx-devel/Makefile > head/www/nginx-devel/Makefile.extmod > > Modified: head/www/nginx-devel/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx-devel/Makefile Wed Sep 30 12:52:41 2020 > (r550698) > +++ head/www/nginx-devel/Makefile Wed Sep 30 13:11:26 2020 > (r550699) > @@ -3,6 +3,7 @@ > > PORTNAME?=3D nginx > PORTVERSION=3D 1.19.3 > +PORTREVISION=3D 1 > CATEGORIES=3D www > MASTER_SITES=3D https://nginx.org/download/ \ > LOCAL/osa > > Modified: head/www/nginx-devel/Makefile.extmod > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx-devel/Makefile.extmod Wed Sep 30 12:52:41 2020 > (r550698) > +++ head/www/nginx-devel/Makefile.extmod Wed Sep 30 13:11:26 2020 > (r550699) > @@ -138,6 +138,7 @@ HTTP_NOTICE_VARS=3D DSO_EXTMODS+=3Dnotice > > HTTP_PUSH_GH_TUPLE=3D slact:nchan:v1.2.7:push > HTTP_PUSH_VARS=3D DSO_EXTMODS+=3Dpush > +HTTP_PUSH_EXTRA_PATCHES=3D > ${PATCHDIR}/extra-patch-nchan-store-private.h > > HTTP_PUSH_STREAM_GH_TUPLE=3D > wandenberg:nginx-push-stream-module:0.5.4:pushstream > HTTP_PUSH_STREAM_VARS=3D DSO_EXTMODS+=3Dpushstream > > Added: head/www/nginx-devel/files/extra-patch-nchan-store-private.h > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx-devel/files/extra-patch-nchan-store-private.h > Wed Sep 30 13:11:26 2020 (r550699) > @@ -0,0 +1,10 @@ > +--- ../nchan-1.2.7/src/store/memory/store-private.h.orig 2020-09-2= 0 > 13:11:33.781569000 +0200 > ++++ ../nchan-1.2.7/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*/ > --000000000000c6458905b089f8ea Content-Type: application/octet-stream; name="extra-patch-nchan-store-redis-redis_lua_commands.h" Content-Disposition: attachment; filename="extra-patch-nchan-store-redis-redis_lua_commands.h" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kfpkqd1u0 LS0tIC4uL25jaGFuLTEuMi43L3NyYy9zdG9yZS9yZWRpcy9yZWRpc19sdWFfY29tbWFuZHMuaC5v cmlnCTIwMjAtMDktMzAgMjM6NTE6NTIuMTE2NTEzMDAwICswODAwCisrKyAuLi9uY2hhbi0xLjIu Ny9zcmMvc3RvcmUvcmVkaXMvcmVkaXNfbHVhX2NvbW1hbmRzLmgJMjAyMC0wOS0zMCAyMzo1Mjox MS4xNjQ2MTcwMDAgKzA4MDAKQEAgLTYzLDcgKzYzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgewogICBy ZWRpc19sdWFfc2NyaXB0X3Qgc3Vic2NyaWJlcl91bnJlZ2lzdGVyOwogCiB9IHJlZGlzX2x1YV9z Y3JpcHRzX3Q7Ci1yZWRpc19sdWFfc2NyaXB0c190IHJlZGlzX2x1YV9zY3JpcHRzOwotY29uc3Qg aW50IHJlZGlzX2x1YV9zY3JpcHRzX2NvdW50OworZXh0ZXJuIHJlZGlzX2x1YV9zY3JpcHRzX3Qg cmVkaXNfbHVhX3NjcmlwdHM7CitleHRlcm4gY29uc3QgaW50IHJlZGlzX2x1YV9zY3JpcHRzX2Nv dW50OwogI2RlZmluZSBSRURJU19MVUFfU0NSSVBUU19FQUNIKHNjcmlwdCkgXAogZm9yKChzY3Jp cHQpPShyZWRpc19sdWFfc2NyaXB0X3QgKikmcmVkaXNfbHVhX3NjcmlwdHM7IChzY3JpcHQpIDwg KHJlZGlzX2x1YV9zY3JpcHRfdCAqKSgmcmVkaXNfbHVhX3NjcmlwdHMgKyAxKTsgKHNjcmlwdCkr KykgCg== --000000000000c6458905b089f8ea--