Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nginx to latest version 1.27.1 #472

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Update nginx to latest version 1.27.1 #472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9391118
Update nginx to latest version 1.27.1
jochenehret Sep 20, 2024
88537cd
Remove unused nginx 1.25.2 blob
jochenehret Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/blobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ nginx/nginx-1.25.2.tar.gz:
size: 1214903
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous version needs to be removed, otherwise the unused_blobs script that runs as part of the create-release-candidate job will fail.

object_id: 09cbde3f-4123-4091-778e-555347700100
sha: sha256:05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711
nginx/nginx-1.27.1.tar.gz:
size: 1245244
object_id: e7028095-e709-4222-7c3b-2eb810ec577b
sha: sha256:bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc
nginx/nginx-dav-ext-module-3.0.0.tar.gz:
size: 14558
object_id: 44648d53-c24b-45e4-4434-007713aa5fe7
Expand Down
8 changes: 4 additions & 4 deletions packages/nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ This repo is used for nginx and nginx-webdav packaging in BOSH deployments.

The files can be downloaded from the following locations:

| Filename | Download URL |
|----------------------------------|------------------------------------------------------------------------------------------------------------------|
| nginx-1.25.2.tar.gz | [nginx.org](http://nginx.org/download/nginx-1.25.2.tar.gz) |
| Filename | Download URL |
|----------------------------------|-------------------------------------------------------------------------------------------------------------------|
| nginx-1.27.1.tar.gz | [nginx.org](http://nginx.org/download/nginx-1.27.1.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) |
| pcre-8.45.tar.gz | [pcre.org](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.gz) |
12 changes: 6 additions & 6 deletions packages/nginx/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ pushd nginx-upload-module-2.3.0
popd

echo "Extracting nginx..."
tar xzvf nginx/nginx-1.25.2.tar.gz
tar xzvf nginx/nginx-1.27.1.tar.gz

sed -i 's@"nginx/"@"-/"@g' nginx-1.25.2/src/core/nginx.h
sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.25.2/src/http/ngx_http_header_filter_module.c
sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.25.2/src/http/v2/ngx_http_v2_filter_module.c
sed -i 's@<hr><center>nginx</center>@@g' nginx-1.25.2/src/http/ngx_http_special_response.c
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@<hr><center>nginx</center>@@g' nginx-1.27.1/src/http/ngx_http_special_response.c

echo "Building nginx..."
pushd nginx-1.25.2
pushd nginx-1.27.1
./configure \
--prefix=${BOSH_INSTALL_TARGET} \
--with-pcre=../pcre-8.45 \
Expand Down
2 changes: 1 addition & 1 deletion packages/nginx/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: nginx
files:
- nginx/nginx-1.25.2.tar.gz
- nginx/nginx-1.27.1.tar.gz
- nginx/pcre-8.45.tar.gz
- nginx/nginx-upload-module-2.3.0.tar.gz
- nginx/upload_module_put_support.patch
Expand Down
12 changes: 6 additions & 6 deletions packages/nginx_webdav/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ echo "Extracting pcre..."
tar xzvf nginx/pcre-8.45.tar.gz

echo "Extracting nginx..."
tar xzvf nginx/nginx-1.25.2.tar.gz
tar xzvf nginx/nginx-1.27.1.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.25.2/src/core/nginx.h
sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.25.2/src/http/ngx_http_header_filter_module.c
sed -i 's@r->headers_out.server == NULL@0@g' nginx-1.25.2/src/http/v2/ngx_http_v2_filter_module.c
sed -i 's@<hr><center>nginx</center>@@g' nginx-1.25.2/src/http/ngx_http_special_response.c
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@<hr><center>nginx</center>@@g' nginx-1.27.1/src/http/ngx_http_special_response.c

echo "Building nginx..."
pushd nginx-1.25.2
pushd nginx-1.27.1
./configure \
--prefix=${BOSH_INSTALL_TARGET} \
--with-ld-opt="-L /usr/local/lib" \
Expand Down
2 changes: 1 addition & 1 deletion packages/nginx_webdav/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name: nginx_webdav
files:
- expat/expat-2.5.0.tar.bz2
- nginx/nginx-1.25.2.tar.gz
- nginx/nginx-1.27.1.tar.gz
- nginx/pcre-8.45.tar.gz
- nginx/nginx-dav-ext-module-3.0.0.tar.gz