Merge branch 'c8-stream-1.20' into a8-stream-1.20

.gitignore

@@ -1 +1 @@
-SOURCES/nginx-1.20.0.tar.gz
+SOURCES/nginx-1.20.1.tar.gz

.nginx.metadata

@@ -1 +1 @@
-71dc4916e9ac7e15b03f7ea71577f72e0dd5dff1 SOURCES/nginx-1.20.0.tar.gz
+6b4ab4eff3c617e133819f43fdfc14708e593a79 SOURCES/nginx-1.20.1.tar.gz

SPECS/nginx.spec

@@ -18,8 +18,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.20.0
-Release:           2%{?dist}.alma
+Version:           1.20.1
+Release:           1%{?dist}.alma
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -474,9 +474,12 @@ fi
 
 
 %changelog
-* Sun Oct 10 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.20.0-2.alma
+* Mon Jan 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.20.1-1.alma
 - Debrand for AlmaLinux
 
+* Tue Dec 21 2021 Joe Orton <jorton@redhat.com> - 1:1.20.1-1
+- rebase to 1.20.1 (addressing CVE-2021-23017)
+
 * Fri Aug 20 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.0-2
 - Resolves: #1991796 - build nginx with --with-compat