Date: Tue, 12 Jul 2022 13:16:35 +0000 From: "Sergey A. Osokin" <osa@freebsd.org> To: Jochen Neumeister <joneum@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 62983916db3a - main - www/nginx: Update to 1.23.0 Message-ID: <Ys10M5fi3lCNPEOf@FreeBSD.org> In-Reply-To: <202207120827.26C8RFXV022388@gitrepo.freebsd.org> References: <202207120827.26C8RFXV022388@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--UAkPkv4olt3dNyNU Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Why? 1.23.0 is from the mainline, and www/nginx for stable versions. On Tue, Jul 12, 2022 at 08:27:15AM +0000, Jochen Neumeister wrote: > The branch main has been updated by joneum: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D62983916db3a439c2c8cd5ea= 3445e26e49200507 >=20 > commit 62983916db3a439c2c8cd5ea3445e26e49200507 > Author: Jochen Neumeister <joneum@FreeBSD.org> > AuthorDate: 2022-07-12 08:25:18 +0000 > Commit: Jochen Neumeister <joneum@FreeBSD.org> > CommitDate: 2022-07-12 08:25:18 +0000 >=20 > www/nginx: Update to 1.23.0 > =20 > Changes with nginx 1.23.0 21 J= un 2022 > =20 > *) Change in internal API: now header lines are represented as li= nked > lists. > =20 > *) Change: now nginx combines arbitrary header lines with identic= al > names when sending to FastCGI, SCGI, and uwsgi backends, in the > $r->header_in() method of the ngx_http_perl_module, and during= lookup > of the "$http_...", "$sent_http_...", "$sent_trailer_...", > "$upstream_http_...", and "$upstream_trailer_..." variables. > =20 > *) Bugfix: if there were multiple "Vary" header lines in the back= end > response, nginx only used the last of them when caching. > =20 > *) Bugfix: if there were multiple "WWW-Authenticate" header lines= in the > backend response and errors with code 401 were intercepted or = the > "auth_request" directive was used, nginx only sent the first o= f the > header lines to the client. > =20 > *) Change: the logging level of the "application data after close > notify" SSL errors has been lowered from "crit" to "info". > =20 > *) Bugfix: connections might hang if nginx was built on Linux 2.6= =2E17 or > newer, but was used on systems without EPOLLRDHUP support, not= ably > with epoll emulation layers; the bug had appeared in 1.17.5. > Thanks to Marcus Ball. > =20 > *) Bugfix: nginx did not cache the response if the "Expires" resp= onse > header line disabled caching, but following "Cache-Control" he= ader > line enabled caching. > =20 > Fix the build for the 3rd Party Module CLOJURE > =20 > Sponsored by: Netzkommune GmbH > --- > www/nginx/Makefile | 4 ++-- > www/nginx/Makefile.extmod | 3 ++- > www/nginx/distinfo | 10 +++++----- > www/nginx/files/extra-patch-ngx_http_clojure_mem.h | 11 +++++++++++ > 4 files changed, 20 insertions(+), 8 deletions(-) >=20 > diff --git a/www/nginx/Makefile b/www/nginx/Makefile > index 598634276db3..e622929f7d57 100644 > --- a/www/nginx/Makefile > +++ b/www/nginx/Makefile > @@ -1,8 +1,8 @@ > # Created by: Sergey A. Osokin <osa@FreeBSD.org> > =20 > PORTNAME=3D nginx > -PORTVERSION=3D 1.22.0 > -PORTREVISION?=3D 6 > +PORTVERSION=3D 1.23.0 > +PORTREVISION?=3D 0 > PORTEPOCH=3D 2 > CATEGORIES=3D www > MASTER_SITES=3D https://nginx.org/download/ \ > diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod > index e03071ed5fc0..f68cb18edc23 100644 > --- a/www/nginx/Makefile.extmod > +++ b/www/nginx/Makefile.extmod > @@ -19,9 +19,10 @@ CACHE_PURGE_CONFIGURE_ON=3D --add-module=3D${WRKDIR}/n= gx_cache_purge-4746629 > CLOJURE_CATEGORIES+=3D java > CLOJURE_USE=3D JAVA=3Dyes JAVA_OS=3Dnative JAVA_VERSION=3D1.8 \ > JAVA_VENDOR=3Dopenjdk JAVA_BUILD=3Dyes JAVA_RUN=3Dyes > -CLOJURE_GH_TUPLE=3D nginx-clojure:nginx-clojure:v0.5.2:clojure > +CLOJURE_GH_TUPLE=3D nginx-clojure:nginx-clojure:4347955:clojure > CLOJURE_CONFIGURE_ENV=3D "JNI_INCS=3D-I${LOCALBASE}/openjdk8/include -I$= {LOCALBASE}/openjdk8/include/freebsd" > CLOJURE_VARS=3D DSO_EXTMODS+=3Dclojure CLOJURE_SUBDIR=3D/src/c > +CLOJURE_EXTRA_PATCHES=3D ${PATCHDIR}/extra-patch-ngx_http_clojure_mem.h > =20 > CT_IMPLIES=3D HTTP_SSL > CT_GH_TUPLE=3D grahamedgecombe:nginx-ct:v1.3.2:ct > diff --git a/www/nginx/distinfo b/www/nginx/distinfo > index 1f316aa5d817..08422342f4c9 100644 > --- a/www/nginx/distinfo > +++ b/www/nginx/distinfo > @@ -1,6 +1,6 @@ > -TIMESTAMP =3D 1655831672 > -SHA256 (nginx-1.22.0.tar.gz) =3D b33d569a6f11a01433a57ce17e83935e953ad4d= c77cdd4d40f896c88ac26eb53 > -SIZE (nginx-1.22.0.tar.gz) =3D 1073322 > +TIMESTAMP =3D 1657613920 > +SHA256 (nginx-1.23.0.tar.gz) =3D 820acaa35b9272be9e9e72f6defa4a5f2921824= 709f8aa4772c78ab31ed94cd1 > +SIZE (nginx-1.23.0.tar.gz) =3D 1102940 > SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) =3D 7ac230d30907f013dff8d435= a118619ea6168aa3714dba62c6962d350c6295ae > SIZE (nginx_mogilefs_module-1.0.4.tar.gz) =3D 11208 > SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) =3D 6d974ba630cef59de1f60= 996c66b401264a345d25988a76037c2856cec756c19 > @@ -21,8 +21,8 @@ SHA256 (google-ngx_brotli-9aec15e_GH0.tar.gz) =3D 0177b= 1158ff7092b9996346de28a0b29 > SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) =3D 16194 > SHA256 (nginx-modules-ngx_cache_purge-4746629_GH0.tar.gz) =3D 68debae407= 22e15a70f37e10d20a4d3b9a26597457f1dd639e903b62c0a2f689 > SIZE (nginx-modules-ngx_cache_purge-4746629_GH0.tar.gz) =3D 17114 > -SHA256 (nginx-clojure-nginx-clojure-v0.5.2_GH0.tar.gz) =3D cb8bc0bef5d29= 8df55fb625400cb77c4145dc5167483e111ff2b90d4d3396200 > -SIZE (nginx-clojure-nginx-clojure-v0.5.2_GH0.tar.gz) =3D 755650 > +SHA256 (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) =3D 9f0fc3b47993= 6fc5b20101c6d238bff5a6f4a32b28d8ec4a511f902abe2abc1f > +SIZE (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) =3D 756519 > SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) =3D b4ceae549b9dbf84= b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 > SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) =3D 6844 > SHA256 (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) =3D 0e971105e210d272a4975= 67fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 > diff --git a/www/nginx/files/extra-patch-ngx_http_clojure_mem.h b/www/ngi= nx/files/extra-patch-ngx_http_clojure_mem.h > new file mode 100644 > index 000000000000..8ccf7ea4ba2b > --- /dev/null > +++ b/www/nginx/files/extra-patch-ngx_http_clojure_mem.h > @@ -0,0 +1,11 @@ > +--- ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h.orig 2022-07-1= 1 13:38:32.426478000 -0400 > ++++ ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h 2022-07-11 13:= 38:45.346434000 -0400 > +@@ -421,7 +421,7 @@ > + #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_IDX 90 > + #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_OFFSET offsetof(ngx_http_heade= rs_in_t, passwd) > + #define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_IDX 91 > +-#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_heade= rs_in_t, cookies) > ++#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_heade= rs_in_t, cookie) > + #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_IDX 92 > + #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_OFFSET offsetof(ngx_http_heade= rs_in_t, server) > + #define NGX_HTTP_CLOJURE_HEADERSI_CONTENT_LENGTH_N_IDX 93 --UAkPkv4olt3dNyNU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAEBCgB9FiEEZTMJYdHlAQrZCsSmOBlAga+KbzQFAmLNdC9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 MzMwOTYxRDFFNTAxMEFEOTBBQzRBNjM4MTk0MDgxQUY4QTZGMzQACgkQOBlAga+K bzTLCQwAwXGEcwgULYj+LHbJMJQ5ZwmagdUfXNkQPHcUt4Ua9Utpdp6ZeCLjLa+N bxGUZ7xn84S311iW8/XJijpKx65nxfgTUgiHnxEpbKk0vquqhqgtNA/JKssOd0dd TTGm41dMZtTNqWwouqYWgMO7rV5ObZYHXpo2SyM1Z7onb4ix3rlN3ts/SbqdZH8D 7iM/B9wOaLL+ccH0+JMJDN+Ly05XeHUqpLv3J3DIDctAX9bmeAshQej0xDvOF0+Z YHjoXYJs18qZdXs2gJivxOOcO+r4CRQ6NJ/bfwmBqeYJfIWho959lKjvUTmoAfJe vAXAoc5Tyt3h3Bxss3qR0XDO5Qd2gZZUEqPKfHy9WV4dXNNHh8f9lFClEAsbchzk ZwfrFSGSijlp5UB3YDvx8DeicqfUQoLWUJB1ohFGN2TOlTlWQLs5AfoPb0E0KhHz wDRwn2c56+J9dYxMKQ88E2ZdzJ5Mpk72mla72t3tRF95RSlL5eu5klj2KhhDVwZI GHfHyY93 =1uoU -----END PGP SIGNATURE----- --UAkPkv4olt3dNyNU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Ys10M5fi3lCNPEOf>