From e9edae1e997379ade1fc1ec73b5e78714c9e0572 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Fri, 30 Apr 2021 13:28:06 +0200 Subject: [PATCH 1/3] Related: #1636235 - centralizing default index.html on nginx - change symlink destination to make it work on multiple distros, not only on Fedora --- nginx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nginx.spec b/nginx.spec index 5156f2b..87101e2 100644 --- a/nginx.spec +++ b/nginx.spec @@ -29,7 +29,7 @@ Name: nginx Epoch: 1 Version: 1.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -323,7 +323,7 @@ ln -s ../../doc/HTML/img \ ln -s ../../doc/HTML/en-US \ %{buildroot}%{_datadir}/nginx/html/en-US %else -ln -s ../../fedora-testpage/index.html \ +ln -s ../../testpage/index.html \ %{buildroot}%{_datadir}/nginx/html/index.html %endif install -p -m 0644 %{SOURCE102} \ @@ -501,6 +501,9 @@ fi %changelog +* Fri Apr 30 2021 Lubos Uhliarik - 1:1.20.0-3 +- Related: #1636235 - centralizing default index.html on nginx + * Wed Apr 21 2021 Felix Kaechele - 1:1.20.0-2 - sync rawhide and EPEL7 spec files again - systemd service reload now checks config file (rhbz#1565377) From 38fdeddda4851056b9efd411c0e5c45893904f55 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 13:01:53 +0200 Subject: [PATCH 2/3] Perl 5.34 rebuild --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 87101e2..8992b37 100644 --- a/nginx.spec +++ b/nginx.spec @@ -29,7 +29,7 @@ Name: nginx Epoch: 1 Version: 1.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -501,6 +501,9 @@ fi %changelog +* Fri May 21 2021 Jitka Plesnikova - 1:1.20.0-4 +- Perl 5.34 rebuild + * Fri Apr 30 2021 Lubos Uhliarik - 1:1.20.0-3 - Related: #1636235 - centralizing default index.html on nginx From 72036acd970829438847968b173c469b320e9b35 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 25 May 2021 12:00:05 -0400 Subject: [PATCH 3/3] update to 1.20.1 (fixes CVE-2021-23017) --- nginx.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nginx.spec b/nginx.spec index 8992b37..66ec01f 100644 --- a/nginx.spec +++ b/nginx.spec @@ -28,8 +28,8 @@ Name: nginx Epoch: 1 -Version: 1.20.0 -Release: 4%{?dist} +Version: 1.20.1 +Release: 1%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -501,6 +501,9 @@ fi %changelog +* Tue May 25 2021 Felix Kaechele - 1:1.20.1-1 +- update to 1.20.1 (fixes CVE-2021-23017) + * Fri May 21 2021 Jitka Plesnikova - 1:1.20.0-4 - Perl 5.34 rebuild diff --git a/sources b/sources index 58190aa..852e9ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nginx-1.20.0.tar.gz.asc) = adc401a3f26461caec4cb3404ff7f2034baa799e03c0a9cd5ddc058a7ef41c29efc03d93a3c9b1794092319f611e29182092b610600c6f6beca6b881138bc22d -SHA512 (nginx-1.20.0.tar.gz) = 06433bde23610ab27deeb6bf8c78148e4249b603d194c81e71a08fc159caead07ea659510286fb6d02668d53b9afcdaabdde8692480ae83de4a531adc1b930ca +SHA512 (nginx-1.20.1.tar.gz) = 3d9fd4bf2740eaf20fcc3c77260a3556aaf9dff2879afc2dbb5fff364dea27313ffbc51d335e9fc9c0186a2a44dac055ef60fde0d411b8cf842fdf661478c961 +SHA512 (nginx-1.20.1.tar.gz.asc) = 6e7dfaf199e9982faab265ada62a56861603499e03211d1792d9add5ac7bd971c9931b68b727fabdf7af66fcfb7b3e3dc2e9efa5e55b25b8186b7974f0f4823a