From 3566adb92685c75c3d06ef69b6ec8438842803b1 Mon Sep 17 00:00:00 2001 From: ari-wg-gitbot Date: Tue, 8 Oct 2024 08:46:26 +0000 Subject: [PATCH] Bump nginx to 1.27.2 Changes: https://nginx.org/en/CHANGES --- config/blobs.yml | 8 ++++---- packages/nginx/README.md | 2 +- packages/nginx/packaging | 12 ++++++------ packages/nginx/spec | 2 +- packages/nginx_webdav/packaging | 12 ++++++------ packages/nginx_webdav/spec | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index 09c83e5527..b2f63932fc 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -74,10 +74,10 @@ nginx/newrelic_nginx_agent-1.2.1.tar.gz: size: 5222 object_id: c63358f6-574a-4e20-9d2b-7e1450368b6d sha: sha256:a5a7f9b3a7e20302943b1dd448d9b725cf3cb28d774d79f618aab7c4ddeea52b -nginx/nginx-1.27.1.tar.gz: - size: 1245244 - object_id: e7028095-e709-4222-7c3b-2eb810ec577b - sha: sha256:bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc +nginx/nginx-1.27.2.tar.gz: + size: 1258098 + object_id: cc331840-d34a-411b-7159-c057f4a48245 + sha: sha256:a91ecfc3a0b3a2c1413afca627bd886d76e0414b81cad0fb7872a9655a1b25fa nginx/nginx-dav-ext-module-3.0.0.tar.gz: size: 14558 object_id: 44648d53-c24b-45e4-4434-007713aa5fe7 diff --git a/packages/nginx/README.md b/packages/nginx/README.md index 69bbec45c5..daf4d804f7 100644 --- a/packages/nginx/README.md +++ b/packages/nginx/README.md @@ -6,6 +6,6 @@ The files can be downloaded from the following locations: | Filename | Download URL | |----------------------------------|-------------------------------------------------------------------------------------------------------------------| -| nginx-1.27.1.tar.gz | [nginx.org](http://nginx.org/download/nginx-1.27.1.tar.gz) | +| nginx-1.27.2.tar.gz | [nginx.org](http://nginx.org/download/nginx-1.27.2.tar.gz) | | nginx-upload-module-2.3.0.tar.gz | [github.com/vkholodkov/nginx-upload-module](https://github.com/fdintino/nginx-upload-module/archive/2.3.0.tar.gz) | pcre-8.45.tar.gz | [pcre.org](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.gz) | diff --git a/packages/nginx/packaging b/packages/nginx/packaging index efc8a2bc6c..046aa43b83 100644 --- a/packages/nginx/packaging +++ b/packages/nginx/packaging @@ -13,15 +13,15 @@ pushd nginx-upload-module-2.3.0 popd echo "Extracting nginx..." -tar xzvf nginx/nginx-1.27.1.tar.gz +tar xzvf nginx/nginx-1.27.2.tar.gz -sed -i 's@"nginx/"@"-/"@g' nginx-1.27.1/src/core/nginx.h -sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.1/src/http/ngx_http_header_filter_module.c -sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.1/src/http/v2/ngx_http_v2_filter_module.c -sed -i 's@
nginx
@@g' nginx-1.27.1/src/http/ngx_http_special_response.c +sed -i 's@"nginx/"@"-/"@g' nginx-1.27.2/src/core/nginx.h +sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.2/src/http/ngx_http_header_filter_module.c +sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.2/src/http/v2/ngx_http_v2_filter_module.c +sed -i 's@
nginx
@@g' nginx-1.27.2/src/http/ngx_http_special_response.c echo "Building nginx..." -pushd nginx-1.27.1 +pushd nginx-1.27.2 ./configure \ --prefix=${BOSH_INSTALL_TARGET} \ --with-pcre=../pcre-8.45 \ diff --git a/packages/nginx/spec b/packages/nginx/spec index 7a3348f3f3..063c21b39c 100644 --- a/packages/nginx/spec +++ b/packages/nginx/spec @@ -1,7 +1,7 @@ --- name: nginx files: -- nginx/nginx-1.27.1.tar.gz +- nginx/nginx-1.27.2.tar.gz - nginx/pcre-8.45.tar.gz - nginx/nginx-upload-module-2.3.0.tar.gz - nginx/upload_module_put_support.patch diff --git a/packages/nginx_webdav/packaging b/packages/nginx_webdav/packaging index de88cd8215..c1840bb426 100644 --- a/packages/nginx_webdav/packaging +++ b/packages/nginx_webdav/packaging @@ -15,18 +15,18 @@ echo "Extracting pcre..." tar xzvf nginx/pcre-8.45.tar.gz echo "Extracting nginx..." -tar xzvf nginx/nginx-1.27.1.tar.gz +tar xzvf nginx/nginx-1.27.2.tar.gz echo "Extracting webdav extensions" tar xzvf nginx/nginx-dav-ext-module-3.0.0.tar.gz -sed -i 's@"nginx/"@"-/"@g' nginx-1.27.1/src/core/nginx.h -sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.1/src/http/ngx_http_header_filter_module.c -sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.1/src/http/v2/ngx_http_v2_filter_module.c -sed -i 's@
nginx
@@g' nginx-1.27.1/src/http/ngx_http_special_response.c +sed -i 's@"nginx/"@"-/"@g' nginx-1.27.2/src/core/nginx.h +sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.2/src/http/ngx_http_header_filter_module.c +sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.27.2/src/http/v2/ngx_http_v2_filter_module.c +sed -i 's@
nginx
@@g' nginx-1.27.2/src/http/ngx_http_special_response.c echo "Building nginx..." -pushd nginx-1.27.1 +pushd nginx-1.27.2 ./configure \ --prefix=${BOSH_INSTALL_TARGET} \ --with-ld-opt="-L /usr/local/lib" \ diff --git a/packages/nginx_webdav/spec b/packages/nginx_webdav/spec index bf0a9bfc98..7ff5f6d847 100644 --- a/packages/nginx_webdav/spec +++ b/packages/nginx_webdav/spec @@ -2,6 +2,6 @@ name: nginx_webdav files: - expat/expat-2.5.0.tar.bz2 - - nginx/nginx-1.27.1.tar.gz + - nginx/nginx-1.27.2.tar.gz - nginx/pcre-8.45.tar.gz - nginx/nginx-dav-ext-module-3.0.0.tar.gz