Date: Wed, 30 Sep 2020 23:58:22 +0800 From: Vanilla Hsu <vanilla@fatpipi.com> To: "Sergey A. Osokin" <osa@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r550699 - in head/www/nginx-devel: . files Message-ID: <CAB_qb6-2fzMqGBRPtzWzDDTCwE3DKnx4JkLpkL6WLon5TVYvBQ@mail.gmail.com> In-Reply-To: <202009301311.08UDBRQD004568@repo.freebsd.org> References: <202009301311.08UDBRQD004568@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <osa@freebsd.org> =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: <f_kfpkqd1u0> X-Attachment-Id: f_kfpkqd1u0 LS0tIC4uL25jaGFuLTEuMi43L3NyYy9zdG9yZS9yZWRpcy9yZWRpc19sdWFfY29tbWFuZHMuaC5v cmlnCTIwMjAtMDktMzAgMjM6NTE6NTIuMTE2NTEzMDAwICswODAwCisrKyAuLi9uY2hhbi0xLjIu Ny9zcmMvc3RvcmUvcmVkaXMvcmVkaXNfbHVhX2NvbW1hbmRzLmgJMjAyMC0wOS0zMCAyMzo1Mjox MS4xNjQ2MTcwMDAgKzA4MDAKQEAgLTYzLDcgKzYzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgewogICBy ZWRpc19sdWFfc2NyaXB0X3Qgc3Vic2NyaWJlcl91bnJlZ2lzdGVyOwogCiB9IHJlZGlzX2x1YV9z Y3JpcHRzX3Q7Ci1yZWRpc19sdWFfc2NyaXB0c190IHJlZGlzX2x1YV9zY3JpcHRzOwotY29uc3Qg aW50IHJlZGlzX2x1YV9zY3JpcHRzX2NvdW50OworZXh0ZXJuIHJlZGlzX2x1YV9zY3JpcHRzX3Qg cmVkaXNfbHVhX3NjcmlwdHM7CitleHRlcm4gY29uc3QgaW50IHJlZGlzX2x1YV9zY3JpcHRzX2Nv dW50OwogI2RlZmluZSBSRURJU19MVUFfU0NSSVBUU19FQUNIKHNjcmlwdCkgXAogZm9yKChzY3Jp cHQpPShyZWRpc19sdWFfc2NyaXB0X3QgKikmcmVkaXNfbHVhX3NjcmlwdHM7IChzY3JpcHQpIDwg KHJlZGlzX2x1YV9zY3JpcHRfdCAqKSgmcmVkaXNfbHVhX3NjcmlwdHMgKyAxKTsgKHNjcmlwdCkr KykgCg== --000000000000c6458905b089f8ea--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAB_qb6-2fzMqGBRPtzWzDDTCwE3DKnx4JkLpkL6WLon5TVYvBQ>