rpms/nginx
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-04-10 03:25:40 -04:00
parent 888f002e39
commit e87e286eba
6 changed files with 220 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
SOURCES/404.html
View File

@ -1,132 +1,120 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>The page is not found</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif, helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #10B981;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #10B981;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #000;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
<head>
<title>The page is not found</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif,helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #900;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #900;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #000;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
<body>
<h1><strong>nginx error!</strong></h1>
<body>
<h1><strong>nginx error!</strong></h1>
<div class="content">
<h3>The page you are looking for is not found.</h3>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>
Something has triggered missing webpage on your website. This is the
default 404 error page for <strong>nginx</strong> that is
distributed with OpenELA. It is located
<tt>/usr/share/nginx/html/404.html</tt>
</p>
<p>
You should customize this error page for your own site or edit the
<tt>error_page</tt> directive in the
<strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.
</p>
<h3>The page you are looking for is not found.</h3>
<p>
For information on OpenELA, please visit the
<a href="https://www.openela.org/">OpenELA website</a>. The
documentation for OpenELA is
<a href="https://www.openela.org/"
>available on the OpenELA website</a
>.
</p>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>Something has triggered missing webpage on your
website. This is the default 404 error page for
<strong>nginx</strong> that is distributed with
Red Hat Enterprise Linux. It is located
<tt>/usr/share/nginx/html/404.html</tt></p>
<p>You should customize this error page for your own
site or edit the <tt>error_page</tt> directive in
the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p>
<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img
src="poweredby.png"
alt="[ Powered by Red Hat Enterprise Linux ]"
width="88" height="31" /></a>
</div>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"
><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121"
height="32"
/></a>
<a href="http://www.openela.org/"><img
src="poweredby.png"
alt="[ Powered by OpenELA ]"
width="32" height="32" /></a>
</div>
</div>
</body>
</body>
</html>

233
SOURCES/50x.html
View File

@ -1,135 +1,120 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>The page is temporarily unavailable</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif, helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #10B981;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #10B981;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #000;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
<head>
<title>The page is temporarily unavailable</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif,helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #900;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #900;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #000;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
<body>
<h1><strong>nginx error!</strong></h1>
<body>
<h1><strong>nginx error!</strong></h1>
<div class="content">
<h3>
The page you are looking for is temporarily unavailable. Please try
again later.
</h3>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>
Something has triggered missing webpage on your website. This is the
default error page for <strong>nginx</strong> that is distributed
with OpenELA. It is located
<tt>/usr/share/nginx/html/50x.html</tt>
</p>
<p>
You should customize this error page for your own site or edit the
<tt>error_page</tt> directive in the
<strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.
</p>
<h3>The page you are looking for is temporarily unavailable. Please try again later.</h3>
<p>
For information on OpenELA, please visit the
<a href="https://www.openela.org/">OpenELA website</a>. The
documentation for OpenELA is
<a href="https://www.openela.org/"
>available on the OpenELA website</a
>.
</p>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>Something has triggered missing webpage on your
website. This is the default error page for
<strong>nginx</strong> that is distributed with
Red Hat Enterprise Linux. It is located
<tt>/usr/share/nginx/html/50x.html</tt></p>
<p>You should customize this error page for your own
site or edit the <tt>error_page</tt> directive in
the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p>
<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img
src="poweredby.png"
alt="[ Powered by Red Hat Enterprise Linux ]"
width="88" height="31" /></a>
</div>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"
><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121"
height="32"
/></a>
<a href="http://www.openela.org/"><img
src="poweredby.png"
alt="[ Powered by OpenELA ]"
width="32" height="32" /></a>
</div>
</div>
</body>
</body>
</html>

0
SOURCES/nginx-upgrade Executable file → Normal file
View File

70
SOURCES/remove-redhat-404-references.patch
View File

@ -1,70 +0,0 @@
diff --git a/404.html b/404.html
index 5350e82..240c5c3 100644
--- a/404.html
+++ b/404.html
@@ -15,10 +15,10 @@
padding: 0;
}
:link {
- color: #c00;
+ color: #f00;
}
:visited {
- color: #c00;
+ color: #f00;
}
a:hover {
color: #f50;
@@ -27,7 +27,7 @@
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
- background-color: #10B981;
+ background-color: #ff0000;
color: #fff;
font-weight: normal;
font-size: 1.75em;
@@ -39,7 +39,7 @@
}
h2 {
text-align: center;
- background-color: #10B981;
+ background-color: #ff0000;
font-size: 1.1em;
font-weight: bold;
color: #fff;
@@ -91,7 +91,7 @@
<p>
Something has triggered missing webpage on your website. This is the
default 404 error page for <strong>nginx</strong> that is
- distributed with OpenELA. It is located
+ distributed with Oracle Linux. It is located
<tt>/usr/share/nginx/html/404.html</tt>
</p>
@@ -103,12 +103,7 @@
</p>
<p>
- For information on OpenELA, please visit the
- <a href="https://www.openela.org/">OpenELA website</a>. The
- documentation for OpenELA is
- <a href="https://www.openela.org/"
- >available on the OpenELA website</a
- >.
+ <p>For information on Oracle Linux, please visit the <a href="https://www.oracle.com/linux">Oracle Linux website</a>. The documentation for Oracle Linux is <a href="https://docs.oracle.com/en/operating-systems/oracle-linux/">available on the Oracle Linux website</a>.</p>
</p>
</div>
</div>
@@ -121,9 +116,9 @@
width="121"
height="32"
/></a>
- <a href="http://www.openela.org/"><img
+ <a href="https://www.oracle.com/"><img
src="poweredby.png"
- alt="[ Powered by OpenELA ]"
+ alt="[ Powered by Oracle Linux ]"
width="32" height="32" /></a>
</div>

77
SOURCES/remove-redhat-50x-references.patch
View File

@ -1,77 +0,0 @@
Signed-off-by: Alan Steinberg <alan.steinberg@oracle.com>
diff --git a/50x.html b/50x.html
index 5a9db82..b7d0b9a 100644
--- a/50x.html
+++ b/50x.html
@@ -15,10 +15,10 @@
padding: 0;
}
:link {
- color: #c00;
+ color: #f00;
}
:visited {
- color: #c00;
+ color: #f00;
}
a:hover {
color: #f50;
@@ -27,7 +27,7 @@
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
- background-color: #10B981;
+ background-color: #ff0000;
color: #fff;
font-weight: normal;
font-size: 1.75em;
@@ -39,7 +39,7 @@
}
h2 {
text-align: center;
- background-color: #10B981;
+ background-color: #ff0000;
font-size: 1.1em;
font-weight: bold;
color: #fff;
@@ -94,7 +94,7 @@
<p>
Something has triggered missing webpage on your website. This is the
default error page for <strong>nginx</strong> that is distributed
- with OpenELA. It is located
+ with Oracle Linux. It is located
<tt>/usr/share/nginx/html/50x.html</tt>
</p>
@@ -106,11 +106,11 @@
</p>
<p>
- For information on OpenELA, please visit the
- <a href="https://www.openela.org/">OpenELA website</a>. The
- documentation for OpenELA is
- <a href="https://www.openela.org/"
- >available on the OpenELA website</a
+ For information on Oracle Linux, please visit the
+ <a href="https://www.oracle.com/linux/">Oracle Linux website</a>. The
+ documentation for Oracle Linux is
+ <a href="https://docs.oracle.com/en/operating-systems/oracle-linux/"
+ >available on the Oracle Linux website</a
>.
</p>
</div>
@@ -124,11 +124,11 @@
width="121"
height="32"
/></a>
- <a href="http://www.openela.org/"><img
+ <a href="https://www.oracle.com/linux/"><img
src="poweredby.png"
- alt="[ Powered by OpenELA ]"
+ alt="[ Powered by Oracle Linux ]"
width="32" height="32" /></a>
-
+
</div>
</div>
</body>

15
SPECS/nginx.spec
View File

@ -41,7 +41,7 @@
Name: nginx
Epoch: 2
Version: 1.20.1
Release: 24.0.1%{?dist}.2
Release: 24%{?dist}.2
Summary: A high performance web server and reverse proxy server
# BSD License (two clause)
@ -68,9 +68,6 @@ Source103: 404.html
Source104: 50x.html
Source200: README.dynamic
Source210: UPGRADE-NOTES-1.6-to-1.10
# Oracle patches
Source1001: remove-redhat-404-references.patch
Source1002: remove-redhat-50x-references.patch
# removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
@ -141,7 +138,6 @@ Patch18: 0018-Mp4-avoid-zero-size-buffers-in-output.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: gnupg2
%if 0%{?with_gperftools}
BuildRequires: gperftools-devel
%endif
@ -156,7 +152,7 @@ BuildRequires: zlib-devel
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
%if 0%{?el7}
# centos-logos el7 does not provide 'system-indexhtml'
Requires: system-logos oracle-indexhtml
Requires: system-logos redhat-indexhtml
# need to remove epel7 geoip sub-package, doesn't work anymore
# https://bugzilla.redhat.com/show_bug.cgi?id=1576034
# https://bugzilla.redhat.com/show_bug.cgi?id=1664957
@ -458,8 +454,6 @@ ln -s ../../pixmaps/system-noindex-logo.png \
%{buildroot}%{_datadir}/nginx/html/system_noindex_logo.png
%endif
patch %{SOURCE103} %{SOURCE1001}
patch %{SOURCE104} %{SOURCE1002}
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
%{buildroot}%{_datadir}/nginx/html
@ -650,11 +644,6 @@ fi
%changelog
* Wed Apr 08 2026 EL Errata <el-errata_ww@oracle.com> - 1.20.1-24.0.1.el9_7.2
- Reference oracle-indexhtml within Requires [Orabug: 33802044]
- Remove Red Hat references [Orabug: 29498217]
- Update upstream references [Orabug: 36579090]
* Tue Mar 31 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:1.20.1-24.2
- Resolves: RHEL-159557 - CVE-2026-27654 nginx: NGINX: Denial of Service or file modification via buffer overflow in ngx_http_dav_module
- Resolves: RHEL-159536 - CVE-2026-27784 nginx: NGINX: Denial of Service due to memory corruption via crafted MP4 file