[main] upgrading nginx to v 1.20.2 (#2306)

* upgrading nginx to v 1.20.2

* applying relevant linting
This commit is contained in:
Max Brodeur-Urbas 2022-02-24 10:36:57 -08:00 committed by GitHub
parent ef1e7b3a41
commit 139dbacc80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions

View File

@ -1,6 +1,6 @@
{
"Signatures": {
"nginx-1.20.1.tar.gz": "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49",
"nginx-1.20.2.tar.gz": "958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42",
"nginx-njs-0.2.1.tar.gz": "1e9d6692d47ba1a529139dcc238585ae0e23d1543f25d85fc6516a2f241dbc11",
"nginx.service": "73a1321ae35eafc4e02614cde224fc0bf20ceba97f969b3373dd73c15c22a0e1"
}

View File

@ -3,8 +3,10 @@
Summary: High-performance HTTP server and reverse proxy
Name: nginx
Version: 1.20.1
Release: 2%{?dist}
# Currently on "stable" version of nginx from https://nginx.org/en/download.html.
# Note: Stable versions are even (1.20), mainline versions are odd (1.21)
Version: 1.20.2
Release: 1%{?dist}
License: BSD 2-Clause
Vendor: Microsoft Corporation
Distribution: Mariner
@ -13,12 +15,9 @@ URL: https://nginx.org/
Source0: https://nginx.org/download/%{name}-%{version}.tar.gz
Source1: nginx.service
Source2: nginx-njs-0.2.1.tar.gz
Patch0: CVE-2009-4487.nopatch
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: which
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-mimetypes
@ -26,9 +25,9 @@ Requires: %{name}-mimetypes
NGINX is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server.
%package filesystem
Summary: The basic directory layout for the Nginx server
BuildArch: noarch
Requires(pre): shadow-utils
Summary: The basic directory layout for the Nginx server
BuildArch: noarch
Requires(pre): shadow-utils
%description filesystem
The nginx-filesystem package contains the basic directory layout
@ -109,6 +108,9 @@ exit 0
%dir %{_sysconfdir}/%{name}
%changelog
* Wed Feb 23 2022 Max Brodeur-Urbas <maxbr@microsoft.com> - 1.20.2-1
- Upgrading to latest version 1.20.2 from "stable" branch.
* Wed Oct 13 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.20.1-2
- Split out "nginx-filesystem" using Fedora 34 spec (license: MIT) as guidance.
- Removing conflicts with "nginx-mimetypes" over "mime.types".

View File

@ -14543,8 +14543,8 @@
"type": "other",
"other": {
"name": "nginx",
"version": "1.20.1",
"downloadUrl": "https://nginx.org/download/nginx-1.20.1.tar.gz"
"version": "1.20.2",
"downloadUrl": "https://nginx.org/download/nginx-1.20.2.tar.gz"
}
}
},