From 138eb31f53dde3ff51e034d31dd5c1e06d41ae5c Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 13:02:17 -0500 Subject: [PATCH] Import rpm: a34e0639cc5a6404d39c0b0540216812653b7298 --- nginx.spec | 11 +---------- sources | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/nginx.spec b/nginx.spec index e5ee179..1a98009 100644 --- a/nginx.spec +++ b/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 Version: 1.18.0 -Release: 3%{?dist}.1 +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -60,9 +60,6 @@ Patch4: nginx-1.16.0-enable-tls1v3-by-default.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1668717 Patch5: nginx-1.18.0-pkcs11-cert.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1963121 -Patch6: nginx-1.18.0-CVE-2021-23017.patch - %if 0%{?with_gperftools} BuildRequires: gperftools-devel %endif @@ -195,7 +192,6 @@ Requires: nginx %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} . @@ -477,11 +473,6 @@ fi %changelog -* Tue May 25 2021 Luboš Uhliarik - 1:1.18.0-3.1 -- Resolves: #1963178 - CVE-2021-23017 nginx:1.18/nginx: Off-by-one in - ngx_resolver_copy() when labels are followed by a pointer to a root - domain name - * Thu Nov 12 2020 Lubos Uhliarik - 1:1.18.0-3 - Resolves: #1651377 - centralizing default index.html on nginx - Resolves: #1825683 - Outdated Red Hat branding used in nginx default pages diff --git a/sources b/sources index 952a4fb..5dcb822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nginx-1.18.0.tar.gz) = 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb +SHA1 (nginx-1.18.0.tar.gz) = 47b2c5ccd12e2a7088b03d629ff6b9ab18215180