okay
On 25/05/21 20:34 +0100, Stuart Henderson wrote:
> updates to the most recent stable branch, only lightly tested but seems ok so
> far.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.152
> diff -u -p -r1.152 Makefile
> --- Makefile 10 May 2021 15:06:06 -0000 1.152
> +++ Makefile 25 May 2021 19:32:36 -0000
> @@ -17,17 +17,10 @@ COMMENT-passenger= nginx passenger (ruby
> COMMENT-rtmp= nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
>
> -VERSION= 1.18.0
> +VERSION= 1.20.1
> DISTNAME= nginx-${VERSION}
> CATEGORIES= www
>
> -REVISION-main= 4
> -REVISION-lua= 0
> -REVISION-xslt= 0
> -REVISION-passenger= 0
> -REVISION-stream= 0
> -REVISION-naxsi= 0
> -
> VERSION-rtmp= 1.2.1
>
> PKGNAME-main= ${DISTNAME}
> @@ -49,7 +42,8 @@ ONLY_FOR_ARCHS-passenger= aarch64 amd64
>
> MASTER_SITES= https://nginx.org/download/
> MASTER_SITES0= https://github.com/
> -MASTER_SITES1=
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/
> +MASTER_SITES1=
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/ \
> +
> https://raw.githubusercontent.com/sthen/nginx_chroot_patch/add_1.20.1/
>
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
>
> @@ -136,7 +130,7 @@ CFLAGS+= -Wall -Wpointer-arith \
> LDFLAGS+= -L ${LOCALBASE}/lib -L ${X11BASE}/lib
> CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
>
> -PATCHFILES+= nginx-1.16.1-chroot.patch:1
> +PATCHFILES+= nginx-1.20.1-chroot.patch:1
> PATCH_DIST_STRIP= -p1
>
> CONFIGURE_STYLE= simple
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.76
> diff -u -p -r1.76 distinfo
> --- distinfo 2 Feb 2021 22:54:04 -0000 1.76
> +++ distinfo 25 May 2021 19:32:36 -0000
> @@ -1,8 +1,8 @@
> SHA256 (headers-more-nginx-module-v0.33.tar.gz) =
> o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
> SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> -SHA256 (nginx-1.16.1-chroot.patch) =
> ohNkspocgL7QnBX7q8Kgv2lgrN0ndgLKd0v5nSCLQRU=
> -SHA256 (nginx-1.18.0.tar.gz) = TDc+erW/kdNKTxGgyUllYQYbpe7mAg2ycqF6cijTX5k=
> +SHA256 (nginx-1.20.1-chroot.patch) =
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> +SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
> SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
> h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> @@ -11,8 +11,8 @@ SHA256 (ngx_http_hmac_secure_link_module
> SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> SIZE (naxsi-1.3.tar.gz) = 235626
> -SIZE (nginx-1.16.1-chroot.patch) = 8220
> -SIZE (nginx-1.18.0.tar.gz) = 1039530
> +SIZE (nginx-1.20.1-chroot.patch) = 8783
> +SIZE (nginx-1.20.1.tar.gz) = 1061461
> SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> 18542
> SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
> SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> Index: patches/patch-man_nginx_8
> ===================================================================
> RCS file: /cvs/ports/www/nginx/patches/patch-man_nginx_8,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-man_nginx_8
> --- patches/patch-man_nginx_8 8 Jun 2020 06:03:50 -0000 1.5
> +++ patches/patch-man_nginx_8 25 May 2021 19:32:36 -0000
> @@ -1,8 +1,9 @@
> $OpenBSD: patch-man_nginx_8,v 1.5 2020/06/08 06:03:50 landry Exp $
> +
> Index: man/nginx.8
> --- man/nginx.8.orig
> +++ man/nginx.8
> -@@ -92,6 +92,23 @@ Do not run, just test the configuration file.
> +@@ -99,6 +99,23 @@ Do not run, just test the configuration file.
> .Nm
> checks the configuration file syntax and then tries to open files
> referenced in the configuration file.
>
--
Regards,
Robert Nagy
