Re: UPDATE www/nginx-1.24.0

2023-04-17 Thread Sergey A. Osokin 
On Mon, Apr 17, 2023 at 11:00:38AM +0100, Stuart Henderson wrote:
> On 2023/04/16 20:28, Bjorn Ketelaars wrote:
> > Diff below updates nginx to 1.24.0, which is the latest stable release.
> > Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
> > 
> > Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
> > headers-more-nginx-module to a newer version because nginx >1.23.0
> > changed handling of multiple headers. Added 2 patches for
> > lua-nginx-module because of the header change.
> > 
> > Lightly run test, with a simple config, on am64.
> > 
> > Comments/OK?
> 
> Works here with my usual config (not using the subpackaged modules,
> but various proxies etc). ok for me, nice to see another devel/pcre
> user get replaced with pcre2.

Some third-party modules, such as lua, may require pcre, version 1.

-- 
Sergey A. Osokin

Re: UPDATE www/nginx-1.24.0

2023-04-17 Thread Robert Nagy 
ok

On 16/04/23 20:28 +0200, Bjorn Ketelaars wrote:
> Diff below updates nginx to 1.24.0, which is the latest stable release.
> Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
> 
> Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
> headers-more-nginx-module to a newer version because nginx >1.23.0
> changed handling of multiple headers. Added 2 patches for
> lua-nginx-module because of the header change.
> 
> Lightly run test, with a simple config, on am64.
> 
> Comments/OK?
> 
> 
> diff --git Makefile Makefile
> index cc6eed8f6ff..fb79699f981 100644
> --- Makefile
> +++ Makefile
> @@ -15,7 +15,7 @@ COMMENT-passenger=  nginx passenger (ruby/python/nodejs) 
> integration module
>  COMMENT-rtmp=nginx module for RTMP streaming
>  COMMENT-securelink=  nginx HMAC secure link module
>  
> -VERSION= 1.22.0
> +VERSION= 1.24.0
>  DISTNAME=nginx-${VERSION}
>  CATEGORIES=  www
>  
> @@ -36,8 +36,6 @@ PKGNAME-passenger=  nginx-passenger-${VERSION}
>  PKGNAME-rtmp=nginx-rtmp-${VERSION}
>  PKGNAME-securelink=  nginx-securelink-${VERSION}
>  
> -REVISION-main=   0
> -
>  ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
>  
>  MASTER_SITES=https://nginx.org/download/
> @@ -48,9 +46,9 @@ MASTER_SITES1=  
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
>  DISTFILES=   ${DISTNAME}${EXTRACT_SUFX}
>  
>  _GH_MODS=\
> - openresty   headers-more-nginx-module   v0.33 \
> + openresty   headers-more-nginx-module   v0.34 \
>   openresty   lua-nginx-modulev0.10.11 \
> - nbs-system  naxsi   1.3 \
> + nbs-system  naxsi   
> d714f1636ea49a9a9f4f06dba14aee003e970834 \
>   kvspb   nginx-auth-ldap 
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
>   arutnginx-rtmp-module   v${VERSION-rtmp} \
>   simpl   ngx_devel_kit   v0.3.0 \
> @@ -81,7 +79,7 @@ COMPILER =  base-clang ports-gcc base-gcc
>  
>  .include 
>  
> -WANTLIB-main=c z pcre ssl crypto
> +WANTLIB-main=c crypto pcre2-8 ssl z
>  WANTLIB-mailproxy=
>  WANTLIB-stream=
>  WANTLIB-image_filter=gd
> @@ -96,7 +94,7 @@ WANTLIB-perl=   c m perl
>  WANTLIB-passenger=   m pthread ${COMPILER_LIBCXX}
>  WANTLIB-securelink=  crypto
>  
> -LIB_DEPENDS-main=devel/pcre
> +LIB_DEPENDS-main=devel/pcre2
>  LIB_DEPENDS-xslt=textproc/libxml \
>   textproc/libxslt
>  LIB_DEPENDS-image_filter=graphics/gd
> @@ -182,7 +180,6 @@ CONFIGURE_ARGS+=  --prefix=${NGINX_DIR} \
>   --with-stream=dynamic \
>   --with-stream_ssl_module \
>   --with-stream_ssl_preread_module \
> - --without-pcre2 \
>   --add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
>   --add-dynamic-module=${WRKSRC}/ngx_devel_kit \
>   
> --add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
> diff --git distinfo distinfo
> index 92e4cc852ed..f508a39a69d 100644
> --- distinfo
> +++ distinfo
> @@ -1,18 +1,18 @@
> -SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
> o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
> +SHA256 (headers-more-nginx-module-v0.34.tar.gz) = 
> DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
>  SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> -SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> +SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 
> 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
>  SHA256 (nginx-1.20.1-chroot.patch) = 
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
> +SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
>  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=
>  SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = 
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
>  SHA256 
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
>  = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> -SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> +SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
>  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> -SIZE (naxsi-1.3.tar.gz) = 235626
> +SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
>  SIZE (nginx-1.20.1-chroot.patch) = 8783
> -SIZE (nginx-1.22.0.tar.gz) = 1073322
> +SIZE (nginx-1.24.0.tar.gz) = 1112471
>  SIZE

Re: UPDATE www/nginx-1.24.0

2023-04-17 Thread Stuart Henderson 
On 2023/04/16 20:28, Bjorn Ketelaars wrote:
> Diff below updates nginx to 1.24.0, which is the latest stable release.
> Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
> 
> Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
> headers-more-nginx-module to a newer version because nginx >1.23.0
> changed handling of multiple headers. Added 2 patches for
> lua-nginx-module because of the header change.
> 
> Lightly run test, with a simple config, on am64.
> 
> Comments/OK?

Works here with my usual config (not using the subpackaged modules,
but various proxies etc). ok for me, nice to see another devel/pcre
user get replaced with pcre2.

> 
> diff --git Makefile Makefile
> index cc6eed8f6ff..fb79699f981 100644
> --- Makefile
> +++ Makefile
> @@ -15,7 +15,7 @@ COMMENT-passenger=  nginx passenger (ruby/python/nodejs) 
> integration module
>  COMMENT-rtmp=nginx module for RTMP streaming
>  COMMENT-securelink=  nginx HMAC secure link module
>  
> -VERSION= 1.22.0
> +VERSION= 1.24.0
>  DISTNAME=nginx-${VERSION}
>  CATEGORIES=  www
>  
> @@ -36,8 +36,6 @@ PKGNAME-passenger=  nginx-passenger-${VERSION}
>  PKGNAME-rtmp=nginx-rtmp-${VERSION}
>  PKGNAME-securelink=  nginx-securelink-${VERSION}
>  
> -REVISION-main=   0
> -
>  ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
>  
>  MASTER_SITES=https://nginx.org/download/
> @@ -48,9 +46,9 @@ MASTER_SITES1=  
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
>  DISTFILES=   ${DISTNAME}${EXTRACT_SUFX}
>  
>  _GH_MODS=\
> - openresty   headers-more-nginx-module   v0.33 \
> + openresty   headers-more-nginx-module   v0.34 \
>   openresty   lua-nginx-modulev0.10.11 \
> - nbs-system  naxsi   1.3 \
> + nbs-system  naxsi   
> d714f1636ea49a9a9f4f06dba14aee003e970834 \
>   kvspb   nginx-auth-ldap 
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
>   arutnginx-rtmp-module   v${VERSION-rtmp} \
>   simpl   ngx_devel_kit   v0.3.0 \
> @@ -81,7 +79,7 @@ COMPILER =  base-clang ports-gcc base-gcc
>  
>  .include 
>  
> -WANTLIB-main=c z pcre ssl crypto
> +WANTLIB-main=c crypto pcre2-8 ssl z
>  WANTLIB-mailproxy=
>  WANTLIB-stream=
>  WANTLIB-image_filter=gd
> @@ -96,7 +94,7 @@ WANTLIB-perl=   c m perl
>  WANTLIB-passenger=   m pthread ${COMPILER_LIBCXX}
>  WANTLIB-securelink=  crypto
>  
> -LIB_DEPENDS-main=devel/pcre
> +LIB_DEPENDS-main=devel/pcre2
>  LIB_DEPENDS-xslt=textproc/libxml \
>   textproc/libxslt
>  LIB_DEPENDS-image_filter=graphics/gd
> @@ -182,7 +180,6 @@ CONFIGURE_ARGS+=  --prefix=${NGINX_DIR} \
>   --with-stream=dynamic \
>   --with-stream_ssl_module \
>   --with-stream_ssl_preread_module \
> - --without-pcre2 \
>   --add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
>   --add-dynamic-module=${WRKSRC}/ngx_devel_kit \
>   
> --add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
> diff --git distinfo distinfo
> index 92e4cc852ed..f508a39a69d 100644
> --- distinfo
> +++ distinfo
> @@ -1,18 +1,18 @@
> -SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
> o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
> +SHA256 (headers-more-nginx-module-v0.34.tar.gz) = 
> DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
>  SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> -SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> +SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 
> 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
>  SHA256 (nginx-1.20.1-chroot.patch) = 
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
> +SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
>  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=
>  SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = 
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
>  SHA256 
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
>  = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> -SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> +SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
>  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> -SIZE (naxsi-1.3.tar.gz) = 235626
> +SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
>

UPDATE www/nginx-1.24.0

2023-04-16 Thread Bjorn Ketelaars 
Diff below updates nginx to 1.24.0, which is the latest stable release.
Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.

Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
headers-more-nginx-module to a newer version because nginx >1.23.0
changed handling of multiple headers. Added 2 patches for
lua-nginx-module because of the header change.

Lightly run test, with a simple config, on am64.

Comments/OK?


diff --git Makefile Makefile
index cc6eed8f6ff..fb79699f981 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@ COMMENT-passenger=nginx passenger (ruby/python/nodejs) 
integration module
 COMMENT-rtmp=  nginx module for RTMP streaming
 COMMENT-securelink=nginx HMAC secure link module
 
-VERSION=   1.22.0
+VERSION=   1.24.0
 DISTNAME=  nginx-${VERSION}
 CATEGORIES=www
 
@@ -36,8 +36,6 @@ PKGNAME-passenger=nginx-passenger-${VERSION}
 PKGNAME-rtmp=  nginx-rtmp-${VERSION}
 PKGNAME-securelink=nginx-securelink-${VERSION}
 
-REVISION-main= 0
-
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
 MASTER_SITES=  https://nginx.org/download/
@@ -48,9 +46,9 @@ MASTER_SITES1=
https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=  \
-   openresty   headers-more-nginx-module   v0.33 \
+   openresty   headers-more-nginx-module   v0.34 \
openresty   lua-nginx-modulev0.10.11 \
-   nbs-system  naxsi   1.3 \
+   nbs-system  naxsi   
d714f1636ea49a9a9f4f06dba14aee003e970834 \
kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module   v${VERSION-rtmp} \
simpl   ngx_devel_kit   v0.3.0 \
@@ -81,7 +79,7 @@ COMPILER =base-clang ports-gcc base-gcc
 
 .include 
 
-WANTLIB-main=  c z pcre ssl crypto
+WANTLIB-main=  c crypto pcre2-8 ssl z
 WANTLIB-mailproxy=
 WANTLIB-stream=
 WANTLIB-image_filter=  gd
@@ -96,7 +94,7 @@ WANTLIB-perl= c m perl
 WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=crypto
 
-LIB_DEPENDS-main=  devel/pcre
+LIB_DEPENDS-main=  devel/pcre2
 LIB_DEPENDS-xslt=  textproc/libxml \
textproc/libxslt
 LIB_DEPENDS-image_filter=graphics/gd
@@ -182,7 +180,6 @@ CONFIGURE_ARGS+=--prefix=${NGINX_DIR} \
--with-stream=dynamic \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
-   --without-pcre2 \
--add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
--add-dynamic-module=${WRKSRC}/ngx_devel_kit \

--add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
diff --git distinfo distinfo
index 92e4cc852ed..f508a39a69d 100644
--- distinfo
+++ distinfo
@@ -1,18 +1,18 @@
-SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
+SHA256 (headers-more-nginx-module-v0.34.tar.gz) = 
DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
-SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
+SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 
2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
 SHA256 (nginx-1.20.1-chroot.patch) = 
SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
 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=
 SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = 
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
 SHA256 
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
 = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
-SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
+SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
-SIZE (naxsi-1.3.tar.gz) = 235626
+SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.24.0.tar.gz) = 1112471
 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
diff --git patches/patch-lua-nginx-module_src_ngx_http_lua_headers_in_c

Re: security update www/nginx to 1.22.1

2022-11-19 Thread Robert Nagy 
On 15/11/22 14:56 +, Sergey A. Osokin wrote:
> Hi,
> 
> On Thu, Oct 27, 2022 at 01:58:01PM +, Sergey A. Osokin wrote:
> > 
> > [...]
> 
> Could you please provide an update.
> Thank you.
> 
> -- 
> Sergey A. Osokin

Hi

I've looked into your diff and there are a lot of issues that needs
to be fixed, so please address these first:

- this is not freebsd, there is no PORTREVISION, so why did you add it?

- you do an update but you forgot to remove REVISION-main

- rearringing variables in an alphabetical order is nice, but
  completely useless in this case and it also makes the diff
  harder to read

- the distfile for the njs module is added, some variables are configured
  for it but then you don't actually enable the module, so it never get
  built (this module also has to be dynamic)

- missing plist and descr for the new module

Thanks 

-- 
Regards,
Robert Nagy

Re: security update www/nginx to 1.22.1

2022-11-15 Thread Sergey A. Osokin 
Hi,

On Thu, Oct 27, 2022 at 01:58:01PM +, Sergey A. Osokin wrote:
> 
> [...]

Could you please provide an update.
Thank you.

-- 
Sergey A. Osokin


signature.asc
Description: PGP signature

Re: security update www/nginx to 1.22.1

2022-10-27 Thread Sergey A. Osokin 
On Thu, Oct 20, 2022 at 04:43:56PM +, Sergey A. Osokin wrote:
> On Thu, Oct 20, 2022 at 08:47:13AM +0200, Robert Nagy wrote:
> > On 19/10/22 18:23 +0100, Stuart Henderson wrote:
> > > On 2022/10/19 16:30, Sergey A. Osokin wrote:
> > > > Hi,
> > > > 
> > > > could you please review the following changes for the security
> > > > update www/nginx to the recent stable version, 1.22.1.
> > > 
> > > adding maintainer to CC, it's usually helpful ..
> > 
> > that release and cve only affects the ngx_http_mp4_module which
> > we do not enable
> 
> Not a problem, here's another patch to add njs module I posted earlier
> and to update other third-party modules.

[...]

Could you please provide an update.
Thank you.

-- 
Sergey A. Osokin


signature.asc
Description: PGP signature

Re: security update www/nginx to 1.22.1

2022-10-20 Thread Sergey A. Osokin 
On Thu, Oct 20, 2022 at 08:47:13AM +0200, Robert Nagy wrote:
> On 19/10/22 18:23 +0100, Stuart Henderson wrote:
> > On 2022/10/19 16:30, Sergey A. Osokin wrote:
> > > Hi,
> > > 
> > > could you please review the following changes for the security
> > > update www/nginx to the recent stable version, 1.22.1.
> > 
> > adding maintainer to CC, it's usually helpful ..
> 
> that release and cve only affects the ngx_http_mp4_module which
> we do not enable

Not a problem, here's another patch to add njs module I posted earlier
and to update other third-party modules.

Thanks you.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile	29 Aug 2022 19:15:18 -	1.164
+++ Makefile	20 Oct 2022 16:40:26 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -15,26 +16,28 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.22.0
+VERSION=	1.22.1
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
-VERSION-rtmp=	1.2.1
+PORTREVISION=	0
+
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
-PKGNAME-image_filter=	nginx-image_filter-${VERSION}
 PKGNAME-geoip2=		nginx-geoip2-${VERSION}
-PKGNAME-xslt=		nginx-xslt-${VERSION}
+PKGNAME-headers_more=	nginx-headers-more-${VERSION}
+PKGNAME-image_filter=	nginx-image_filter-${VERSION}
 PKGNAME-mailproxy=	nginx-mailproxy-${VERSION}
-PKGNAME-stream=		nginx-stream-${VERSION}
-PKGNAME-naxsi=		nginx-naxsi-${VERSION}
 PKGNAME-ldap_auth=	nginx-ldap_auth-${VERSION}
 PKGNAME-lua=		nginx-lua-${VERSION}
-PKGNAME-headers_more=	nginx-headers-more-${VERSION}
-PKGNAME-perl=		nginx-perl-${VERSION}
+PKGNAME-naxsi=		nginx-naxsi-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
+PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-stream=		nginx-stream-${VERSION}
+PKGNAME-xslt=		nginx-xslt-${VERSION}
 
 REVISION-main=		0
 
@@ -48,14 +51,15 @@ MASTER_SITES1=	https://raw.githubusercon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
-	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
-	nbs-system	naxsi1.3 \
-	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nbs-system	naxsi1.3 \
+	nginx		njs0.7.7 \
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	openresty	headers-more-nginx-module	v0.33 \
+	openresty	lua-nginx-module		v0.10.11 \
+	vision5		ngx_devel_kit			v0.3.1
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,9 +74,9 @@ PERMIT_PACKAGE=	Yes
 
 MULTI_PACKAGES =	-main -naxsi -perl ${MODULE_PACKAGES}
 
-MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
-			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+MODULE_PACKAGES =	-headers_more -geoip2 -image_filter \
+			-ldap_auth -lua -mailproxy -passenger \
+			-rtmp -securelink -stream -xslt
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -82,29 +86,30 @@ COMPILER =		base-clang ports-gcc base-gc
 .include 
 
 WANTLIB-main=		c z pcre ssl crypto
-WANTLIB-mailproxy=
-WANTLIB-stream=
-WANTLIB-image_filter=	gd
+WANTLIB-headers_more=
 WANTLIB-geoip2=		maxminddb
-WANTLIB-rtmp=
-WANTLIB-xslt=		exslt xml2 xslt
-WANTLIB-naxsi=
+WANTLIB-image_filter=	gd
 WANTLIB-ldap_auth=	ldap
+WANTLIB-mailproxy=
+WANTLIB-naxsi=
+WANTLIB-njs=
 WANTLIB-lua=		${MODLUA_WANTLIB} m
-WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
+WANTLIB-rtmp=
 WANTLIB-securelink=	crypto
+WANTLIB-stream=
+WANTLIB-xslt=		exslt xml2 xslt
 
 LIB_DEPENDS-main=	devel/pcre
-LIB_DEPENDS-xslt=	textproc/libxml \
-			textproc/libxslt
-LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-geoip2=	net/libmaxminddb
+LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-ldap_auth=	databases/openldap
 LIB_DEPENDS-lua=	${MODLUA_LIB_DEPENDS}
 LIB_DEPENDS-rtmp=
 LIB_DEPENDS-securelink=
+LIB_DEPENDS-xslt=	textproc/libxml \
+			textproc/libxslt
 
 MODLUA_RUNDEP=		No
 RUN_DEPENDS=		www/nginx,-main=${VERSION}
@@ -196,7 +201,7 @@ NO_TEST=		Yes
 ALL_TARGET=

Re: security update www/nginx to 1.22.1

2022-10-20 Thread Robert Nagy 
On 19/10/22 18:23 +0100, Stuart Henderson wrote:
> On 2022/10/19 16:30, Sergey A. Osokin wrote:
> > Hi,
> > 
> > could you please review the following changes for the security
> > update www/nginx to the recent stable version, 1.22.1.
> 
> adding maintainer to CC, it's usually helpful ..

that release and cve only affects the ngx_http_mp4_module which
we do not enable

Re: security update www/nginx to 1.22.1

2022-10-19 Thread Stuart Henderson 
On 2022/10/19 16:30, Sergey A. Osokin wrote:
> Hi,
> 
> could you please review the following changes for the security
> update www/nginx to the recent stable version, 1.22.1.

adding maintainer to CC, it's usually helpful ..

> Here's the commit message.
> ---
> www/nginx: security update 1.22.0 -> 1.22.1
> 
> 
> 
> *) Security: processing of a specially crafted mp4 file by the
>ngx_http_mp4_module might cause a worker process crash, worker
>process memory disclosure, or might have potential other impact
>(CVE-2022-41741, CVE-2022-41742).

I'm ok with the update however it is a noop for us as we don't build
that module in the port.

security update www/nginx to 1.22.1

2022-10-19 Thread Sergey A. Osokin 
Hi,

could you please review the following changes for the security
update www/nginx to the recent stable version, 1.22.1.

Here's the commit message.
---
www/nginx: security update 1.22.0 -> 1.22.1



*) Security: processing of a specially crafted mp4 file by the
   ngx_http_mp4_module might cause a worker process crash, worker
   process memory disclosure, or might have potential other impact
   (CVE-2022-41741, CVE-2022-41742).


---

Thank you.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile	29 Aug 2022 19:15:18 -	1.164
+++ Makefile	19 Oct 2022 16:22:00 -
@@ -15,7 +15,7 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.22.0
+VERSION=	1.22.1
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	19 Oct 2022 16:22:00 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.22.1.tar.gz) = nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=
 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=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
 SIZE (naxsi-1.3.tar.gz) = 235626
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.22.1.tar.gz) = 1073948
 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


signature.asc
Description: PGP signature

Re: [PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Sergey A. Osokin 
On Tue, Nov 16, 2021 at 08:14:56PM +0100, Robert Nagy wrote:
> commited, thanks

Thanks, Robert!

I sent a patch to add NJS, NGINX Javascript module to the www/nginx
port last month, Oct 26th.  Could you please help me with
review of the patch.

-- 
Sergey Osokin


signature.asc
Description: PGP signature

Re: [PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Robert Nagy 
commited, thanks

On 16/11/21 18:23 +, Sergey A. Osokin wrote:
> Hi Robert,
> 
> good point!  Updated and attached, thanks!
> 
> On Tue, Nov 16, 2021 at 07:07:19PM +0100, Robert Nagy wrote:
> > you are missing the REVISION changes / removals from the Makefile
> > 
> > On 16/11/21 17:38 +, Sergey A. Osokin wrote:
> > > and here's the commit log.
> > > 
> > > On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> > > > Hello,
> > > > 
> > > > hope you're doing well.
> > > > Here's the patch to update www/nginx to its recent stable version.
> > > > Thanks.
> 
> -- 
> Sergey Osokin





-- 
Regards,
Robert Nagy

Re: [PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Sergey A. Osokin 
Hi Robert,

good point!  Updated and attached, thanks!

On Tue, Nov 16, 2021 at 07:07:19PM +0100, Robert Nagy wrote:
> you are missing the REVISION changes / removals from the Makefile
> 
> On 16/11/21 17:38 +, Sergey A. Osokin wrote:
> > and here's the commit log.
> > 
> > On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> > > Hello,
> > > 
> > > hope you're doing well.
> > > Here's the patch to update www/nginx to its recent stable version.
> > > Thanks.

-- 
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile	10 Sep 2021 15:19:00 -	1.156
+++ Makefile	16 Nov 2021 18:22:01 -
@@ -17,13 +17,10 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.20.1
+VERSION=	1.20.2
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
-REVISION-lua=	0
-REVISION-passenger=	0
-
 VERSION-rtmp=	1.2.1
 
 PKGNAME-main=		${DISTNAME}
@@ -40,8 +37,6 @@ PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
-
-REVISION-main=		0
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo	25 May 2021 19:43:55 -	1.77
+++ distinfo	16 Nov 2021 18:22:01 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
+SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
 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=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
 SIZE (naxsi-1.3.tar.gz) = 235626
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.20.1.tar.gz) = 1061461
+SIZE (nginx-1.20.2.tar.gz) = 1062124
 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


signature.asc
Description: PGP signature

Re: [PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Robert Nagy 
you are missing the REVISION changes / removals from the Makefile

On 16/11/21 17:38 +, Sergey A. Osokin wrote:
> and here's the commit log.
> 
> On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> > Hello,
> > 
> > hope you're doing well.
> > Here's the patch to update www/nginx to its recent stable version.
> > Thanks.
> > 
> > -- 
> > Sergey Osokin
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/nginx/Makefile,v
> > retrieving revision 1.156
> > diff -u -p -r1.156 Makefile
> > --- Makefile10 Sep 2021 15:19:00 -  1.156
> > +++ Makefile16 Nov 2021 17:33:58 -
> > @@ -17,7 +17,7 @@ COMMENT-passenger=nginx passenger (ruby
> >  COMMENT-rtmp=  nginx module for RTMP streaming
> >  COMMENT-securelink=nginx HMAC secure link module
> >  
> > -VERSION=   1.20.1
> > +VERSION=   1.20.2
> >  DISTNAME=  nginx-${VERSION}
> >  CATEGORIES=www
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/www/nginx/distinfo,v
> > retrieving revision 1.77
> > diff -u -p -r1.77 distinfo
> > --- distinfo25 May 2021 19:43:55 -  1.77
> > +++ distinfo16 Nov 2021 17:33:58 -
> > @@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
> >  SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
> > wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> >  SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> >  SHA256 (nginx-1.20.1-chroot.patch) = 
> > SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> > -SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
> > +SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
> >  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=
> > @@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
> >  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> >  SIZE (naxsi-1.3.tar.gz) = 235626
> >  SIZE (nginx-1.20.1-chroot.patch) = 8783
> > -SIZE (nginx-1.20.1.tar.gz) = 1061461
> > +SIZE (nginx-1.20.2.tar.gz) = 1062124
> >  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
> 
> 
> 

> www/nginx: update to 1.20.2.
> 
> 
> 
> *) Feature: OpenSSL 3.0 compatibility.
> 
> *) Bugfix: SSL variables might be empty when used in logs; the bug had
>appeared in 1.19.5.
> 
> *) Bugfix: keepalive connections with gRPC backends might not be closed
>after receiving a GOAWAY frame.
> 
> *) Bugfix: backend SSL connections in the stream module might hang after
>an SSL handshake.
> 
> *) Bugfix: SSL connections with gRPC backends might hang if select,
>poll, or /dev/poll methods were used.
> 
> *) Bugfix: in the $content_length variable when using chunked transfer
>encoding.
> 
> *) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
>directive.
> 
> 




-- 
Regards,
Robert Nagy

Re: [PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Sergey A. Osokin 
and here's the commit log.

On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> Hello,
> 
> hope you're doing well.
> Here's the patch to update www/nginx to its recent stable version.
> Thanks.
> 
> -- 
> Sergey Osokin

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.156
> diff -u -p -r1.156 Makefile
> --- Makefile  10 Sep 2021 15:19:00 -  1.156
> +++ Makefile  16 Nov 2021 17:33:58 -
> @@ -17,7 +17,7 @@ COMMENT-passenger=  nginx passenger (ruby
>  COMMENT-rtmp=nginx module for RTMP streaming
>  COMMENT-securelink=  nginx HMAC secure link module
>  
> -VERSION= 1.20.1
> +VERSION= 1.20.2
>  DISTNAME=nginx-${VERSION}
>  CATEGORIES=  www
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.77
> diff -u -p -r1.77 distinfo
> --- distinfo  25 May 2021 19:43:55 -  1.77
> +++ distinfo  16 Nov 2021 17:33:58 -
> @@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
>  SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
>  SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
>  SHA256 (nginx-1.20.1-chroot.patch) = 
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
> +SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
>  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=
> @@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
>  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
>  SIZE (naxsi-1.3.tar.gz) = 235626
>  SIZE (nginx-1.20.1-chroot.patch) = 8783
> -SIZE (nginx-1.20.1.tar.gz) = 1061461
> +SIZE (nginx-1.20.2.tar.gz) = 1062124
>  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



www/nginx: update to 1.20.2.



*) Feature: OpenSSL 3.0 compatibility.

*) Bugfix: SSL variables might be empty when used in logs; the bug had
   appeared in 1.19.5.

*) Bugfix: keepalive connections with gRPC backends might not be closed
   after receiving a GOAWAY frame.

*) Bugfix: backend SSL connections in the stream module might hang after
   an SSL handshake.

*) Bugfix: SSL connections with gRPC backends might hang if select,
   poll, or /dev/poll methods were used.

*) Bugfix: in the $content_length variable when using chunked transfer
   encoding.

*) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
   directive.




signature.asc
Description: PGP signature

[PATCH] update www/nginx to 1.20.2

2021-11-16 Thread Sergey A. Osokin 
Hello,

hope you're doing well.
Here's the patch to update www/nginx to its recent stable version.
Thanks.

-- 
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile	10 Sep 2021 15:19:00 -	1.156
+++ Makefile	16 Nov 2021 17:33:58 -
@@ -17,7 +17,7 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.20.1
+VERSION=	1.20.2
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo	25 May 2021 19:43:55 -	1.77
+++ distinfo	16 Nov 2021 17:33:58 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
+SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
 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=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
 SIZE (naxsi-1.3.tar.gz) = 235626
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.20.1.tar.gz) = 1061461
+SIZE (nginx-1.20.2.tar.gz) = 1062124
 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


signature.asc
Description: PGP signature

Re: update www/nginx-naxsi

2021-01-23 Thread Solene Rapenne 
On Fri, 22 Jan 2021 23:09:49 +0100
Solene Rapenne :

> This diff updates the nginx naxsi module to its latest version.
> The current version we have is from february 2017.
> 
> A small patch is required to compile, I'll upstream it.
> 

patch got upstreamed but I'm not sure they release often.
https://github.com/nbs-system/naxsi/commit/0395b102b7e9b5165e89e99bb62e9ddaa0a74910

I'll include that link in the patch before committing it (if ok for update)

update www/nginx-naxsi

2021-01-22 Thread Solene Rapenne 
This diff updates the nginx naxsi module to its latest version.
The current version we have is from february 2017.

A small patch is required to compile, I'll upstream it.

Following the official setup guide
https://github.com/nbs-system/naxsi/wiki/naxsi-setup I've been able
to triggers naxsi to output in the error log as expected from the
how to.

Index: Makefile
===
RCS file: /home/reposync/ports/www/nginx/Makefile,v
retrieving revision 1.150
diff -u -p -r1.150 Makefile
--- Makefile1 Jan 2021 12:46:51 -   1.150
+++ Makefile22 Jan 2021 22:01:50 -
@@ -25,6 +25,7 @@ REVISION-main=4
 REVISION-xslt= 0
 REVISION-passenger=0
 REVISION-stream=   0
+REVISION-naxsi=0
 
 VERSION-rtmp=  1.2.1
 
@@ -54,7 +55,7 @@ DISTFILES=${DISTNAME}${EXTRACT_SUFX}
 _GH_MODS=  \
openresty   headers-more-nginx-module   v0.33 \
openresty   lua-nginx-modulev0.10.11 \
-   nbs-system  naxsi   0.55.3 \
+   nbs-system  naxsi   1.3 \
kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module   v${VERSION-rtmp} \
simpl   ngx_devel_kit   v0.3.0 \
Index: distinfo
===
RCS file: /home/reposync/ports/www/nginx/distinfo,v
retrieving revision 1.75
diff -u -p -r1.75 distinfo
--- distinfo27 Jul 2020 14:33:15 -  1.75
+++ distinfo22 Jan 2021 18:04:12 -
@@ -1,6 +1,6 @@
 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-0.55.3.tar.gz) = CzyV0lB3Lcia2LSeR8HgJMWuLHbAz/pEXp/gXE3RNJU=
+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-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
@@ -10,7 +10,7 @@ SHA256 (ngx_http_geoip2_module-3.3.tar.g
 SHA256 
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
 = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
 SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
-SIZE (naxsi-0.55.3.tar.gz) = 187416
+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-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
Index: patches/patch-naxsi_naxsi_src_naxsi_net_h
===
RCS file: patches/patch-naxsi_naxsi_src_naxsi_net_h
diff -N patches/patch-naxsi_naxsi_src_naxsi_net_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-naxsi_naxsi_src_naxsi_net_h   22 Jan 2021 20:40:42 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: naxsi/naxsi_src/naxsi_net.h
+--- naxsi/naxsi_src/naxsi_net.h.orig
 naxsi/naxsi_src/naxsi_net.h
+@@ -7,7 +7,7 @@
+ #ifndef __NAXSI_NET_H__
+ #define __NAXSI_NET_H__
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include 
+ #include 
+ #include

Re: update: www/nginx 1.4.4 / 1.5.7

2013-11-24 Thread Stuart Henderson 
On 2013/11/23 21:23, William Yodlowsky wrote:
 On 20 November 2013 at 23:41, William Yodlowsky will...@openbsd.org wrote:
  - security update to 1.4.4 and 1.5.7 (CVE-2013-4547)
  - naxsi update to 0.53 and reflect the move to github
  - enable the new auth_request_module for the devel branch
  
  ok?
 
 ping.  Is the distfile handling too complicated?  Or ok?

Not tested as I don't use the ports version of nginx anywhere
and the lack of chroot means it isn't a drop-in replacement for base
nginx for a quick test, but comments from reading:

   MASTER_SITES=  http://nginx.org/download/
   MASTER_SITES0= http://dropbox.eait.uq.edu.au/uqdgwynn/distfiles/
  -MASTER_SITES1 =http://naxsi.googlecode.com/files/
  +MASTER_SITES1 =https://github.com/nbs-system/naxsi/archive/

mix of FOO= and FOO =

  -CONFIGURE_ARGS =   --add-module=${WRKSRC}/../naxsi-core-0.49/naxsi_src/
  +CONFIGURE_ARGS =   --add-module=${WRKSRC}/../naxsi-${NAXSIV}/naxsi_src/

for consistency, why not handle this the same way as other modules,
i.e. mv it to a fixed name in pre-patch?

(these aren't show-stoppers for the update, which I'm basically ok
with, but would be nice to have sometime.)

  @@ -65,7 +65,8 @@
   LUADISTFILES+= simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz:0
   LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:0
   SUBSTFILES=conf/nginx.conf
  -NAXSIDISTFILES +=  naxsi-core-0.49.tgz:1
  +NAXSIV=0.53-1
  +NAXSIDISTFILES +=  
  naxsi-${NAXSIV}${EXTRACT_SUFX}{${NAXSIV}${EXTRACT_SUFX}}:1

not related to the port update, but I suppose we are going to have
to put up with more of this mess with googlecode shutting down file
distribution, damn the people using it to distribute warez/ebookz. :(

UPDATE www/nginx

2009-11-20 Thread Max Varencov 

Hi,

Here is a diff for nginx 0.7.64.

Changelog http://nginx.net/CHANGES-0.7

Tested on OpenBSD current amd64 and i386.
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.22
diff -u Makefile
--- Makefile30 Oct 2009 00:42:17 -  1.22
+++ Makefile20 Nov 2009 13:16:26 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.7.63
+DISTNAME=  nginx-0.7.64
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.16
diff -u distinfo
--- distinfo30 Oct 2009 00:42:17 -  1.16
+++ distinfo20 Nov 2009 13:16:26 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.7.63.tar.gz) = 3b2+ylIG3MDNek2cusACQA==
-RMD160 (nginx-0.7.63.tar.gz) = nc3MiUZFza25CBpr6A13xUepPbE=
-SHA1 (nginx-0.7.63.tar.gz) = pXpC2NR/l0vrSeFQgXrnZW6eDxQ=
-SHA256 (nginx-0.7.63.tar.gz) = BsHGHh3z5LVvvqsp7uZv4rGb/p7vIP20hLKt/YwQdMg=
-SIZE (nginx-0.7.63.tar.gz) = 600683
+MD5 (nginx-0.7.64.tar.gz) = z6l8D3hFMoIBELXu5X/vbQ==
+RMD160 (nginx-0.7.64.tar.gz) = iMmC3IipHbMzfBq3TXpB1QNzY2Y=
+SHA1 (nginx-0.7.64.tar.gz) = 5PcbmpCMI8PXv+tj6Xx/hcPW7tc=
+SHA256 (nginx-0.7.64.tar.gz) = VwXQiveK3Sl59WaYHIbVn4VLDdNQrAnfh8H1WmhG+80=
+SIZE (nginx-0.7.64.tar.gz) = 601601

Re: update: www/nginx

2009-05-23 Thread Simon Kuhnle 
On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote:
 Update to 0.6.36, set default user to _nginx in the config file (from
 simon@ via Darrin), and take MAINTAINER... (update done with Darrin)
 
 Thanks in advance.

Only a few days later 0.6.37 was released ;-)

Interesting thing is that http://nginx.net/CHANGES-0.6 says:

Bugfix: nginx could not be built on platforms different from i386, 
   amd64, sparc, and ppc; the bug had appeared in 0.6.36.

Did anyone experience problems on platforms not listed above?
-- 
Simon

Re: update: www/nginx

2009-05-23 Thread Stuart Henderson 
On 2009/05/23 15:53, Simon Kuhnle wrote:
 On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote:
  Update to 0.6.36, set default user to _nginx in the config file (from
  simon@ via Darrin), and take MAINTAINER... (update done with Darrin)
  
  Thanks in advance.
 
 Only a few days later 0.6.37 was released ;-)
 
 Interesting thing is that http://nginx.net/CHANGES-0.6 says:
 
 Bugfix: nginx could not be built on platforms different from i386, 
amd64, sparc, and ppc; the bug had appeared in 0.6.36.
 
 Did anyone experience problems on platforms not listed above?
 -- 
 Simon
 

yes;

===  Building for nginx-0.6.36
make -f objs/Makefile
cc -c -O2 -pipe -I src/core  -I src/event  -I src/event/modules  -I src/os/unix 
 -I /usr/local/include  -I objs  -o objs/src/core/nginx.o  src/core/nginx.c
In file included from src/core/ngx_core.h:66,
 from src/core/nginx.c:8:
src/core/ngx_shmtx.h: In function `ngx_shmtx_trylock':
src/core/ngx_shmtx.h:68: error: too many arguments to function `ngx_log_abort'
src/core/ngx_shmtx.h: In function `ngx_shmtx_lock':
src/core/ngx_shmtx.h:85: error: too many arguments to function `ngx_log_abort'
src/core/ngx_shmtx.h: In function `ngx_shmtx_unlock':
src/core/ngx_shmtx.h:100: error: too many arguments to function `ngx_log_abort'
*** Error code 1

Bumping DISTNAME and make makesum is enough and fixes build on arm.
I'm not using nginx so haven't tested the end package, can you check it
works ok please?

Re: update: www/nginx

2009-05-16 Thread Simon Kuhnle 
On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote:
 Update to 0.6.36, set default user to _nginx in the config file (from
 simon@ via Darrin), and take MAINTAINER... (update done with Darrin)
 
 Thanks in advance.

Works for me on amd64.
-- 
Simon

Re: update: www/nginx

2009-05-15 Thread Darrin Chandler 
On Fri, May 15, 2009 at 11:51:29PM -0400, b...@openbsd.rutgers.edu wrote:
 Update to 0.6.36, set default user to _nginx in the config file (from
 simon@ via Darrin), and take MAINTAINER... (update done with Darrin)

This is fine by me, and thanks!

 Thanks in advance.
 

 Index: Makefile
 ===
 RCS file: /cvs/ports/www/nginx/Makefile,v
 retrieving revision 1.12
 diff -u -u -r1.12 Makefile
 --- Makefile  22 Mar 2009 20:19:32 -  1.12
 +++ Makefile  16 May 2009 03:26:56 -
 @@ -2,12 +2,12 @@
  
  COMMENT= robust and small HTTP server and mail proxy server
  
 -DISTNAME=nginx-0.6.35
 +DISTNAME=nginx-0.6.36
  CATEGORIES=  www
  
  HOMEPAGE=http://nginx.net/
  
 -MAINTAINER=  Darrin Chandler dwchand...@stilyagin.com
 +MAINTAINER=  William Yodlowsky b...@openbsd.rutgers.edu
  
  # BSD-like
  PERMIT_PACKAGE_CDROM=Yes
 Index: distinfo
 ===
 RCS file: /cvs/ports/www/nginx/distinfo,v
 retrieving revision 1.9
 diff -u -u -r1.9 distinfo
 --- distinfo  22 Mar 2009 20:19:32 -  1.9
 +++ distinfo  16 May 2009 03:27:04 -
 @@ -1,5 +1,5 @@
 -MD5 (nginx-0.6.35.tar.gz) = Rcei09kfJ/WvG0Y/D/RgcA==
 -RMD160 (nginx-0.6.35.tar.gz) = Pq9xi++kWnLZVvss9Et2918fFgU=
 -SHA1 (nginx-0.6.35.tar.gz) = XnC7AWRNgD9oWRR3FdUvqtGdZVY=
 -SHA256 (nginx-0.6.35.tar.gz) = BNwZx12PlrRhajpYpxjhPzhHtsbMA6cJsZqT45iCP7U=
 -SIZE (nginx-0.6.35.tar.gz) = 524987
 +MD5 (nginx-0.6.36.tar.gz) = FczmECou/PTUrN6btx6m0w==
 +RMD160 (nginx-0.6.36.tar.gz) = VXr66VTNnmjMG994gQVwUuxpNdg=
 +SHA1 (nginx-0.6.36.tar.gz) = 1egapWo1z+u2OKuItqgErPD3ebc=
 +SHA256 (nginx-0.6.36.tar.gz) = McGvuwh+ZQ1jgAAShiG1FNIdQS/rnKxCJypfsofbrsU=
 +SIZE (nginx-0.6.36.tar.gz) = 528425
 Index: patches/patch-conf_nginx_conf
 ===
 RCS file: /cvs/ports/www/nginx/patches/patch-conf_nginx_conf,v
 retrieving revision 1.3
 diff -u -u -r1.3 patch-conf_nginx_conf
 --- patches/patch-conf_nginx_conf 7 Dec 2008 20:08:55 -   1.3
 +++ patches/patch-conf_nginx_conf 16 May 2009 03:35:50 -
 @@ -1,6 +1,13 @@
  $OpenBSD: patch-conf_nginx_conf,v 1.3 2008/12/07 20:08:55 merdely Exp $
  --- conf/nginx.conf.orig Thu Feb 28 15:44:16 2008
 -+++ conf/nginx.conf  Sun Dec  7 14:33:16 2008
  conf/nginx.conf  Fri May 15 23:35:38 2009
 +@@ -1,5 +1,5 @@
 + 
 +-#user  nobody;
 ++user _nginx;
 + worker_processes  1;
 + 
 + #error_log  logs/error.log;
  @@ -41,7 +41,7 @@ http {
   #access_log  logs/host.access.log  main;
   


-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
dwchand...@stilyagin.com   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation

Re: UPDATE www/nginx

2009-03-22 Thread Darrin Chandler 
Works for me on sparc64, in addition to Max's test on amd64.

Ok maintainer :)

Comments? Otherwise please commit. Thanks!

On Sat, Mar 21, 2009 at 02:31:33PM +0300, Max Varencov wrote:
 Hi,

 Here is a diff for latest stable version 0.6.35 of the nginx.

 CHANGELOG:
 * Bugfix: in shared memory allocations if nginx was built without
debugging.
 * Bugfixes in an Expect request header line support.
 * Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module.

 Tested on amd64.

 diff -uNr --exclude=CVS /usr/ports/www/nginx/Makefile 
 /usr/ports/mystuff/www/nginx/Makefile
 --- /usr/ports/www/nginx/Makefile Fri Dec 26 20:30:23 2008
 +++ /usr/ports/mystuff/www/nginx/Makefile Sat Mar 21 13:57:33 2009
 @@ -2,8 +2,8 @@
  
  COMMENT= robust and small HTTP server and mail proxy server
  
 -DISTNAME=nginx-0.6.34
 -PKGNAME= ${DISTNAME}p0
 +DISTNAME=nginx-0.6.35
 +PKGNAME= ${DISTNAME}
  CATEGORIES=  www
  
  HOMEPAGE=http://nginx.net/
 diff -uNr --exclude=CVS /usr/ports/www/nginx/distinfo 
 /usr/ports/mystuff/www/nginx/distinfo
 --- /usr/ports/www/nginx/distinfo Sun Dec  7 23:08:55 2008
 +++ /usr/ports/mystuff/www/nginx/distinfo Sat Mar 21 13:58:42 2009
 @@ -1,5 +1,5 @@
 -MD5 (nginx-0.6.34.tar.gz) = g3vPuIvca278TmOXnJx7QQ==
 -RMD160 (nginx-0.6.34.tar.gz) = hCTxS7znIxV3wiIa5UGkn4osakE=
 -SHA1 (nginx-0.6.34.tar.gz) = nwjqCIQSPrDwF7MOnwZI1GVi+N0=
 -SHA256 (nginx-0.6.34.tar.gz) = uYtv8N/padUKCdlyAm9/gaKM7Xyiyvj5NJmg3SPkMSU=
 -SIZE (nginx-0.6.34.tar.gz) = 524667
 +MD5 (nginx-0.6.35.tar.gz) = Rcei09kfJ/WvG0Y/D/RgcA==
 +RMD160 (nginx-0.6.35.tar.gz) = Pq9xi++kWnLZVvss9Et2918fFgU=
 +SHA1 (nginx-0.6.35.tar.gz) = XnC7AWRNgD9oWRR3FdUvqtGdZVY=
 +SHA256 (nginx-0.6.35.tar.gz) = BNwZx12PlrRhajpYpxjhPzhHtsbMA6cJsZqT45iCP7U=
 +SIZE(nginx-0.6.35.tar.gz) = 524987
 diff -uNr --exclude=CVS 
 /usr/ports/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c 
 /usr/ports/mystuff/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c
 --- /usr/ports/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c   Fri Dec 
 26 20:30:23 2008
 +++ /usr/ports/mystuff/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c   
 Thu Jan  1 03:00:00 1970
 @@ -1,12 +0,0 @@
 -$OpenBSD: patch-src_os_unix_ngx_posix_init_c,v 1.1 2008/12/26 17:30:23 
 steven Exp $
  src/os/unix/ngx_posix_init.c.origMon Dec  3 09:46:46 2007
 -+++ src/os/unix/ngx_posix_init.c Thu Dec 25 09:57:05 2008
 -@@ -22,7 +22,7 @@ ngx_os_io_t ngx_os_io = {
 - ngx_unix_recv,
 - ngx_readv_chain,
 - ngx_udp_unix_recv,
 --NULL,
 -+ngx_unix_send,
 - ngx_writev_chain,
 - 0
 - };


-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
dwchand...@stilyagin.com   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation

UPDATE www/nginx

2009-03-21 Thread Max Varencov 

Hi,

Here is a diff for latest stable version 0.6.35 of the nginx.

CHANGELOG:
* Bugfix: in shared memory allocations if nginx was built without
   debugging.
* Bugfixes in an Expect request header line support.
* Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module.

Tested on amd64.
diff -uNr --exclude=CVS /usr/ports/www/nginx/Makefile 
/usr/ports/mystuff/www/nginx/Makefile
--- /usr/ports/www/nginx/Makefile   Fri Dec 26 20:30:23 2008
+++ /usr/ports/mystuff/www/nginx/Makefile   Sat Mar 21 13:57:33 2009
@@ -2,8 +2,8 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.6.34
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  nginx-0.6.35
+PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
diff -uNr --exclude=CVS /usr/ports/www/nginx/distinfo 
/usr/ports/mystuff/www/nginx/distinfo
--- /usr/ports/www/nginx/distinfo   Sun Dec  7 23:08:55 2008
+++ /usr/ports/mystuff/www/nginx/distinfo   Sat Mar 21 13:58:42 2009
@@ -1,5 +1,5 @@
-MD5 (nginx-0.6.34.tar.gz) = g3vPuIvca278TmOXnJx7QQ==
-RMD160 (nginx-0.6.34.tar.gz) = hCTxS7znIxV3wiIa5UGkn4osakE=
-SHA1 (nginx-0.6.34.tar.gz) = nwjqCIQSPrDwF7MOnwZI1GVi+N0=
-SHA256 (nginx-0.6.34.tar.gz) = uYtv8N/padUKCdlyAm9/gaKM7Xyiyvj5NJmg3SPkMSU=
-SIZE (nginx-0.6.34.tar.gz) = 524667
+MD5 (nginx-0.6.35.tar.gz) = Rcei09kfJ/WvG0Y/D/RgcA==
+RMD160 (nginx-0.6.35.tar.gz) = Pq9xi++kWnLZVvss9Et2918fFgU=
+SHA1 (nginx-0.6.35.tar.gz) = XnC7AWRNgD9oWRR3FdUvqtGdZVY=
+SHA256 (nginx-0.6.35.tar.gz) = BNwZx12PlrRhajpYpxjhPzhHtsbMA6cJsZqT45iCP7U=
+SIZE(nginx-0.6.35.tar.gz) = 524987
diff -uNr --exclude=CVS 
/usr/ports/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c 
/usr/ports/mystuff/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c
--- /usr/ports/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c Fri Dec 
26 20:30:23 2008
+++ /usr/ports/mystuff/www/nginx/patches/patch-src_os_unix_ngx_posix_init_c 
Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_os_unix_ngx_posix_init_c,v 1.1 2008/12/26 17:30:23 steven 
Exp $
 src/os/unix/ngx_posix_init.c.orig  Mon Dec  3 09:46:46 2007
-+++ src/os/unix/ngx_posix_init.c   Thu Dec 25 09:57:05 2008
-@@ -22,7 +22,7 @@ ngx_os_io_t ngx_os_io = {
- ngx_unix_recv,
- ngx_readv_chain,
- ngx_udp_unix_recv,
--NULL,
-+ngx_unix_send,
- ngx_writev_chain,
- 0
- };

MAINTAINER UPDATE: www/nginx - 0.6.34

2008-12-05 Thread Darrin Chandler 
This updates nginx to the latest stable version 0.6.34 and removed a
configure workaround (fixed upstream).

In production use on amd64 and lightly tested in sparc64. Additional
testing appreciated, especially 32-bit.

Comments?

Ok?


Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile13 May 2008 18:46:07 -  1.8
+++ Makefile6 Dec 2008 02:59:45 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.6.32
+DISTNAME=  nginx-0.6.34
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
@@ -41,9 +41,6 @@ CONFIGURE_ARGS=   --prefix=${SYSCONFDIR}/
--with-http_stub_status_module \
--with-mail \
--with-mail_ssl_module
-
-# Get rid of '#include malloc.h' which caused many warnings
-CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo13 May 2008 18:46:07 -  1.6
+++ distinfo6 Dec 2008 02:59:45 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.6.31.tar.gz) = gkvMJbvVtjbxgiN7aSJ70g==
-RMD160 (nginx-0.6.31.tar.gz) = edoi6rpBXrnSTdM88r4LGZm7Ebw=
-SHA1 (nginx-0.6.31.tar.gz) = wsResq41LczoL6mXqM/HbM5knBo=
-SHA256 (nginx-0.6.31.tar.gz) = 5okIcF38H7FmUG7EQSkce607bdzdt2CxZpMb/bW1gqc=
-SIZE (nginx-0.6.31.tar.gz) = 520344
+MD5 (nginx-0.6.34.tar.gz) = g3vPuIvca278TmOXnJx7QQ==
+RMD160 (nginx-0.6.34.tar.gz) = hCTxS7znIxV3wiIa5UGkn4osakE=
+SHA1 (nginx-0.6.34.tar.gz) = nwjqCIQSPrDwF7MOnwZI1GVi+N0=
+SHA256 (nginx-0.6.34.tar.gz) = uYtv8N/padUKCdlyAm9/gaKM7Xyiyvj5NJmg3SPkMSU=
+SIZE (nginx-0.6.34.tar.gz) = 524667

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation


pgpRZWGdQGQWM.pgp
Description: PGP signature

UPDATE: www/nginx to version 0.6.32

2008-09-01 Thread Darrin Chandler 
Hi,

Here'a a diff to bring www/nginx to the latest stable release which
included some new features as well as some important bug fixes.

http://nginx.net/CHANGES-0.6

Thanks to Toni Mueller for prodding, and to Simon Kuhnle for prodding,
testing, and the patch (I had the same diff just before lock but kept
forgetting after unlock).

Light testing on amd64 and sparc64.

Comments? OK?


Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile13 May 2008 18:46:07 -  1.8
+++ Makefile31 Aug 2008 15:49:44 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.6.31
+DISTNAME=  nginx-0.6.32
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo13 May 2008 18:46:07 -  1.6
+++ distinfo31 Aug 2008 15:49:44 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.6.31.tar.gz) = gkvMJbvVtjbxgiN7aSJ70g==
-RMD160 (nginx-0.6.31.tar.gz) = edoi6rpBXrnSTdM88r4LGZm7Ebw=
-SHA1 (nginx-0.6.31.tar.gz) = wsResq41LczoL6mXqM/HbM5knBo=
-SHA256 (nginx-0.6.31.tar.gz) = 5okIcF38H7FmUG7EQSkce607bdzdt2CxZpMb/bW1gqc=
-SIZE (nginx-0.6.31.tar.gz) = 520344
+MD5 (nginx-0.6.32.tar.gz) = wJoqzjyR9F2ru2CLEeSO0Q==
+RMD160 (nginx-0.6.32.tar.gz) = BnScW/g0o/foKtMSKl20V8GT0Rc=
+SHA1 (nginx-0.6.32.tar.gz) = NGFmFxR3w+eHWb27yEYRB9hHUmk=
+SHA256 (nginx-0.6.32.tar.gz) = 10u7kjXnvqv3vgOn3smfDKuJ+kQwqZimpxUZAeoUHp0=
+SIZE (nginx-0.6.32.tar.gz) = 522183
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nginx/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST   29 Mar 2008 13:50:39 -  1.3
+++ pkg/PLIST   31 Aug 2008 15:49:44 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2008/03/29 13:50:39 bernd Exp $
 @newgroup _nginx:593
 @newuser _nginx:593:_nginx:daemon:nginx user:/nonexistent:/sbin/nologin
-sbin/nginx
[EMAIL PROTECTED] sbin/nginx
 @mode 755
 @sample ${NGINX_DIR}/
 @sample /var/log/nginx/

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation


pgpOTd1ugAPpv.pgp
Description: PGP signature

UPDATE: www/nginx-0.6.30 - 0.6.31

2008-05-12 Thread Darrin Chandler 
Bugfix update to latest version. Fixes include:

*) Bugfix: nginx did not process FastCGI response if header was at
   the end of FastCGI record; bug appeared in 0.6.2.  Thanks to
   Sergey Serov.

   
*) bugfix: a segmentation fault might occur in worker process if a
   file was deleted and the open_file_cache_errors directive was
   off.

Basic tests by me on i386/amd64/sparc64.

Please review, test and commit. Thanks!

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile7 May 2008 23:08:24 -   1.7
+++ Makefile12 May 2008 19:13:04 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-0.6.30
+DISTNAME=  nginx-0.6.31
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo7 May 2008 23:08:24 -   1.5
+++ distinfo12 May 2008 19:13:04 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.6.30.tar.gz) = QV6bvHHirjbZEgr4ARLFwQ==
-RMD160 (nginx-0.6.30.tar.gz) = OQSjeFjC426g01riKcVaDGtlIPo=
-SHA1 (nginx-0.6.30.tar.gz) = rc5ReFbPh5PqAU+ZWyNFaI1sS/4=
-SHA256 (nginx-0.6.30.tar.gz) = NRwaEJaIQpnsJIpH83mjRtrKcwq547q10L16X4GhjVM=
-SIZE (nginx-0.6.30.tar.gz) = 520139
+MD5 (nginx-0.6.31.tar.gz) = gkvMJbvVtjbxgiN7aSJ70g==
+RMD160 (nginx-0.6.31.tar.gz) = edoi6rpBXrnSTdM88r4LGZm7Ebw=
+SHA1 (nginx-0.6.31.tar.gz) = wsResq41LczoL6mXqM/HbM5knBo=
+SHA256 (nginx-0.6.31.tar.gz) = 5okIcF38H7FmUG7EQSkce607bdzdt2CxZpMb/bW1gqc=
+SIZE (nginx-0.6.31.tar.gz) = 520344

Re: UPDATE: www/nginx-0.6.30 - 0.6.31

2008-05-12 Thread Mike Erdely 
On Mon, May 12, 2008 at 12:19:32PM -0700, Darrin Chandler wrote:
 Bugfix update to latest version. Fixes include:
 
 *) Bugfix: nginx did not process FastCGI response if header was at
the end of FastCGI record; bug appeared in 0.6.2.  Thanks to
Sergey Serov.
   
  
 *) bugfix: a segmentation fault might occur in worker process if a
file was deleted and the open_file_cache_errors directive was
off.
 
 Basic tests by me on i386/amd64/sparc64.
 
 Please review, test and commit. Thanks!

Basic tests pass on macppc for me.
ok?

-ME

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Mike Erdely 
On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
 This brings nginx up to 0.5.34, the latest stable version. Change log is
 at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
 some new features.
 
 I have also made this a flavored port, with only the most common
 features enabled by default (http server  proxy, mod_ssl).

I'm not sure about the flavors.  To me if feels like you're adding
complexity where none is needed.  nginx is not a large binary with all
options compiled in.  The options do not include a large number of
dependencies which one might want to leave out.

Anyone else with opinions on this?

 Tested by me on i386, amd64, sparc64.
 
 Diff attached. Tarball available at
 http://phxbsd.com/OpenBSD/nginx.tar.gz
 
 Please test and commit. Feedback appreciated.

-ME

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Bernd Ahlers 
Mike Erdely [Sun, Dec 30, 2007 at 12:40:47PM -0500] wrote:
On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
 This brings nginx up to 0.5.34, the latest stable version. Change log is
 at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
 some new features.
 
 I have also made this a flavored port, with only the most common
 features enabled by default (http server  proxy, mod_ssl).

I'm not sure about the flavors.  To me if feels like you're adding
complexity where none is needed.  nginx is not a large binary with all
options compiled in.

Hmm? It is a large binary, no?

The options do not include a large number of
dependencies which one might want to leave out.

Anyone else with opinions on this?

I don't like adding flavors to nginx. What's the gain?

Bernd

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Okan Demirmen 
On Sun 2007.12.30 at 12:40 -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?

yes - i agree with ME - the binary isn't that large, and the dependency
tree doesn't grow or shrink with each flavor; it's not really worth it,
is it?

  Tested by me on i386, amd64, sparc64.
  
  Diff attached. Tarball available at
  http://phxbsd.com/OpenBSD/nginx.tar.gz
  
  Please test and commit. Feedback appreciated.
 
 -ME

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Joachim Schipper 
On Sun, Dec 30, 2007 at 12:40:47PM -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?

Unless there is a good reason to leave out some code (for instance, it's
very new and of unknown quality, and hence may have security issues), I
see no real point.

I *am* not really qualified to comment, of course.

Joachim

-- 
TFMotD: nologin (8) - politely refuse a login

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
On Sun, Dec 30, 2007 at 12:40:47PM -0500, Mike Erdely wrote:
 On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
  This brings nginx up to 0.5.34, the latest stable version. Change log is
  at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
  some new features.
  
  I have also made this a flavored port, with only the most common
  features enabled by default (http server  proxy, mod_ssl).
 
 I'm not sure about the flavors.  To me if feels like you're adding
 complexity where none is needed.  nginx is not a large binary with all
 options compiled in.  The options do not include a large number of
 dependencies which one might want to leave out.
 
 Anyone else with opinions on this?
 
  Tested by me on i386, amd64, sparc64.
  
  Diff attached. Tarball available at
  http://phxbsd.com/OpenBSD/nginx.tar.gz
  
  Please test and commit. Feedback appreciated.

Thanks Mike, Bernd, Okan, and you too Joachim :)

Unflavored diff attached.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile29 Dec 2007 22:56:50 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -28,11 +28,17 @@ SUBST_VARS+=NGINX_DIR
 
 CONFIGURE_STYLE=   simple
 
+FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
+FLAVOR?=
+
 # Some conf files are relative to --prefix and
 # have no --xxx-path of their own. Set this so
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -43,13 +49,26 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
-   --group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
-   --with-http_ssl_module \
-   --with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --group=_nginx
+
+.if ${FLAVOR:L:Mno_http_proxy}
+CONFIGURE_ARGS+=   --without-http_proxy_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}
+CONFIGURE_ARGS+=   --with-mail
+.endif
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-http_ssl_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}  !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-mail_ssl_module
+.endif
+.if ${FLAVOR:L:Mmod_perl}
+CONFIGURE_ARGS+=   --with-http_perl_module
+.endif
+.if ${FLAVOR:L:Mmod_status}
+CONFIGURE_ARGS+=   --with-http_stub_status_module
+.endif
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo29 Dec 2007 22:56:50 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
 Unflavored diff attached.

 +FLAVORS= mail_proxy mod_status mod_perl no_http_proxy no_ssl
 +FLAVOR?=

Not sure how THAT happened! New diff coming soon, when I'm SURE.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation

Re: MAINTAINER UPDATE: www/nginx

2007-12-30 Thread Darrin Chandler 
On Sun, Dec 30, 2007 at 02:42:12PM -0700, Darrin Chandler wrote:
  Unflavored diff attached.
 
  +FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
  +FLAVOR?=
 
 Not sure how THAT happened! New diff coming soon, when I'm SURE.

Minor copying screwup. Here's the diff...

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile30 Dec 2007 21:47:06 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -33,6 +33,9 @@ CONFIGURE_STYLE=  simple
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -44,12 +47,10 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
--group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
--with-http_ssl_module \
--with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --with-mail \
+   --with-mail_ssl_module
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo30 Dec 2007 21:47:06 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

MAINTAINER UPDATE: www/nginx

2007-12-29 Thread Darrin Chandler 
This brings nginx up to 0.5.34, the latest stable version. Change log is
at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
some new features.

I have also made this a flavored port, with only the most common
features enabled by default (http server  proxy, mod_ssl).

Tested by me on i386, amd64, sparc64.

Diff attached. Tarball available at
http://phxbsd.com/OpenBSD/nginx.tar.gz

Please test and commit. Feedback appreciated.

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Oct 2007 19:23:43 -   1.3
+++ Makefile29 Dec 2007 22:56:50 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.32
+DISTNAME=  nginx-0.5.34
 PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
@@ -28,11 +28,17 @@ SUBST_VARS+=NGINX_DIR
 
 CONFIGURE_STYLE=   simple
 
+FLAVORS=   mail_proxy mod_status mod_perl no_http_proxy no_ssl
+FLAVOR?=
+
 # Some conf files are relative to --prefix and
 # have no --xxx-path of their own. Set this so
 # all runtime configs live in the same place.
 CONFIGURE_ARGS+=   --prefix=${SYSCONFDIR}/nginx
 
+# Get rid of '#include malloc.h' which caused many warnings
+CONFIGURE_ARGS+=   --with-cc-opt=-DNGX_HAVE_MALLOC_H=0
+
 CONFIGURE_ARGS+=   --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -43,13 +49,26 @@ CONFIGURE_ARGS+=--conf-path=${SYSCONFDI
--http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
-   --group=_nginx \
-   --with-cc-opt=-I ${LOCALBASE}/include \
-   --with-ld-opt=-L ${LOCALBASE}/lib \
-   --with-http_ssl_module \
-   --with-http_stub_status_module \
-   --with-imap \
-   --with-imap_ssl_module
+   --group=_nginx
+
+.if ${FLAVOR:L:Mno_http_proxy}
+CONFIGURE_ARGS+=   --without-http_proxy_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}
+CONFIGURE_ARGS+=   --with-mail
+.endif
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-http_ssl_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}  !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+=   --with-mail_ssl_module
+.endif
+.if ${FLAVOR:L:Mmod_perl}
+CONFIGURE_ARGS+=   --with-http_perl_module
+.endif
+.if ${FLAVOR:L:Mmod_status}
+CONFIGURE_ARGS+=   --with-http_stub_status_module
+.endif
 
 NO_REGRESS=Yes
 ALL_TARGET=
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Oct 2007 19:23:43 -   1.2
+++ distinfo29 Dec 2007 22:56:50 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815

MAINTAINER UPDATE: www/nginx

2007-10-07 Thread Darrin Chandler 
Update from nginx-0.5.31p0 to nginx-0.5.32. Several bugfixes and a few
features (changelog at http://nginx.net/CHANGES-0.5).

Tested on i386.

Please commit. Thanks!

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile22 Sep 2007 21:06:05 -  1.2
+++ Makefile7 Oct 2007 20:19:40 -
@@ -2,8 +2,8 @@
 
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
-DISTNAME=  nginx-0.5.31
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  nginx-0.5.32
+PKGNAME=   ${DISTNAME}
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Sep 2007 21:58:26 -   1.1.1.1
+++ distinfo7 Oct 2007 20:19:40 -
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.31.tar.gz) = d84ef8e624b8953faf9cee2b5da535c1
-RMD160 (nginx-0.5.31.tar.gz) = 02153a490c2b58dccf02d120da6c3fd7b26c5a61
-SHA1 (nginx-0.5.31.tar.gz) = c58076b3e1f3f4cb59afe5143fc0a893d3a4f0ba
-SHA256 (nginx-0.5.31.tar.gz) = 
34cae92545e10c6b84708d058a4981f31b688ea5309f24c394b7422ae5d71042
-SIZE (nginx-0.5.31.tar.gz) = 475892
+MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
+RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
+SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
+SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
+SIZE (nginx-0.5.32.tar.gz) = 479982
Index: patches/patch-src_http_modules_ngx_http_autoindex_module_c
===
RCS file: patches/patch-src_http_modules_ngx_http_autoindex_module_c
diff -N patches/patch-src_http_modules_ngx_http_autoindex_module_c
--- patches/patch-src_http_modules_ngx_http_autoindex_module_c  22 Sep 2007 
21:06:06 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_http_modules_ngx_http_autoindex_module_c,v 1.1 2007/09/22 
21:06:06 sthen Exp $
 src/http/modules/ngx_http_autoindex_module.c.orig  Sat Sep 22 21:51:41 2007
-+++ src/http/modules/ngx_http_autoindex_module.c   Sat Sep 22 21:53:41 2007
-@@ -236,6 +236,11 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
- rc = ngx_http_send_header(r);
- 
- if (rc == NGX_ERROR || rc  NGX_OK || r-header_only) {
-+if (ngx_close_dir(dir) == NGX_ERROR) {
-+ngx_log_error(NGX_LOG_ALERT, r-connection-log, ngx_errno,
-+  ngx_close_dir_n  \%V\ failed, path);
-+}
-+
- return rc;
- }
-

MAINTAINER UPDATE: www/nginx - reliability/DoS fix

2007-09-22 Thread Darrin Chandler 
With autoindexing enabled, HEAD requests to an auto indexed directory
leaks the file descriptor, eventually exhausting them. Patch from
nginx author Igor Sysoev, and bump to p0.

Tested by me on i386, sparc64, amd64.

Please review, test, commit.


Index: ports/www/nginx/Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ports/www/nginx/Makefile4 Sep 2007 21:58:26 -   1.1.1.1
+++ ports/www/nginx/Makefile22 Sep 2007 20:14:48 -
@@ -3,6 +3,7 @@
 COMMENT=   robust and small HTTP server and IMAP/POP3 proxy server
 
 DISTNAME=  nginx-0.5.31
+PKGNAME=   ${DISTNAME}p0
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.net/
Index: 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
===
RCS file: 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
diff -N 
ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ ports/www/nginx/patches/patch-src_http_modules_ngx_http_autoindex_module_c  
22 Sep 2007 20:14:48 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/http/modules/ngx_http_autoindex_module.c.orig  Mon Nov 13 13:53:37 2006
 src/http/modules/ngx_http_autoindex_module.c   Sat Sep 22 10:58:02 2007
+@@ -236,6 +236,11 @@ ngx_http_autoindex_handler(ngx_http_requ
+ rc = ngx_http_send_header(r);
+ 
+ if (rc == NGX_ERROR || rc  NGX_OK || r-header_only) {
++if (ngx_close_dir(dir) == NGX_ERROR) {
++ngx_log_error(NGX_LOG_ALERT, r-connection-log, ngx_errno,
++  ngx_close_dir_n  \%V\ failed, path);
++}
++
+ return rc;
+ }
+ 

-- 
Darrin Chandler|  Phoenix BSD User Group  |  MetaBUG
[EMAIL PROTECTED]   |  http://phxbug.org/  |  http://metabug.org/
http://www.stilyagin.com/  |  Daemons in the Desert   |  Global BUG Federation


pgpkg0zAxs4Lw.pgp
Description: PGP signature