diff --git a/SOURCES/404.html b/SOURCES/404.html index 5350e82..c6014a7 100644 --- a/SOURCES/404.html +++ b/SOURCES/404.html @@ -1,132 +1,120 @@ - - The page is not found - - - + img { + border: 2px solid #fff; + padding: 2px; + margin: 2px; + } + a:hover img { + border: 2px solid #294172; + } + .logos { + margin: 1em; + text-align: center; + } + /*]]>*/ + + - -

nginx error!

+ +

nginx error!

-
-

The page you are looking for is not found.

- -
-

Website Administrator

-

- Something has triggered missing webpage on your website. This is the - default 404 error page for nginx that is - distributed with OpenELA. It is located - /usr/share/nginx/html/404.html -

-

- You should customize this error page for your own site or edit the - error_page directive in the - nginx configuration file - /etc/nginx/nginx.conf. -

+

The page you are looking for is not found.

-

- For information on OpenELA, please visit the - OpenELA website. The - documentation for OpenELA is - available on the OpenELA website. -

+
+

Website Administrator

+
+

Something has triggered missing webpage on your + website. This is the default 404 error page for + nginx that is distributed with + Red Hat Enterprise Linux. It is located + /usr/share/nginx/html/404.html

+ +

You should customize this error page for your own + site or edit the error_page directive in + the nginx configuration file + /etc/nginx/nginx.conf.

+ +

For information on Red Hat Enterprise Linux, please visit the Red Hat, Inc. website. The documentation for Red Hat Enterprise Linux is available on the Red Hat, Inc. website.

+ +
+
+ +
+ [ Powered by nginx ] + [ Powered by Red Hat Enterprise Linux ] +
-
- -
- [ Powered by nginx ] - [ Powered by OpenELA ] - -
-
- + diff --git a/SOURCES/50x.html b/SOURCES/50x.html index 5a9db82..5d8d957 100644 --- a/SOURCES/50x.html +++ b/SOURCES/50x.html @@ -1,135 +1,120 @@ - - The page is temporarily unavailable - - - + img { + border: 2px solid #fff; + padding: 2px; + margin: 2px; + } + a:hover img { + border: 2px solid #294172; + } + .logos { + margin: 1em; + text-align: center; + } + /*]]>*/ + + - -

nginx error!

+ +

nginx error!

-
-

- The page you are looking for is temporarily unavailable. Please try - again later. -

- -
-

Website Administrator

-

- Something has triggered missing webpage on your website. This is the - default error page for nginx that is distributed - with OpenELA. It is located - /usr/share/nginx/html/50x.html -

-

- You should customize this error page for your own site or edit the - error_page directive in the - nginx configuration file - /etc/nginx/nginx.conf. -

+

The page you are looking for is temporarily unavailable. Please try again later.

-

- For information on OpenELA, please visit the - OpenELA website. The - documentation for OpenELA is - available on the OpenELA website. -

+
+

Website Administrator

+
+

Something has triggered missing webpage on your + website. This is the default error page for + nginx that is distributed with + Red Hat Enterprise Linux. It is located + /usr/share/nginx/html/50x.html

+ +

You should customize this error page for your own + site or edit the error_page directive in + the nginx configuration file + /etc/nginx/nginx.conf.

+ +

For information on Red Hat Enterprise Linux, please visit the Red Hat, Inc. website. The documentation for Red Hat Enterprise Linux is available on the Red Hat, Inc. website.

+ +
+
+ +
+ [ Powered by nginx ] + [ Powered by Red Hat Enterprise Linux ] +
-
- -
- [ Powered by nginx ] - [ Powered by OpenELA ] - -
-
- + diff --git a/SOURCES/nginx-upgrade b/SOURCES/nginx-upgrade old mode 100755 new mode 100644 diff --git a/SOURCES/remove-redhat-404-references.patch b/SOURCES/remove-redhat-404-references.patch deleted file mode 100644 index 5973d65..0000000 --- a/SOURCES/remove-redhat-404-references.patch +++ /dev/null @@ -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 @@ -

- Something has triggered missing webpage on your website. This is the - default 404 error page for nginx that is -- distributed with OpenELA. It is located -+ distributed with Oracle Linux. It is located - /usr/share/nginx/html/404.html -

- -@@ -103,12 +103,7 @@ -

- -

-- For information on OpenELA, please visit the -- OpenELA website. The -- documentation for OpenELA is -- available on the OpenELA website. -+

For information on Oracle Linux, please visit the Oracle Linux website. The documentation for Oracle Linux is available on the Oracle Linux website.

-

- - -@@ -121,9 +116,9 @@ - width="121" - height="32" - /> -- [ Powered by OpenELA ] - - diff --git a/SOURCES/remove-redhat-50x-references.patch b/SOURCES/remove-redhat-50x-references.patch deleted file mode 100644 index df3d81b..0000000 --- a/SOURCES/remove-redhat-50x-references.patch +++ /dev/null @@ -1,77 +0,0 @@ -Signed-off-by: Alan Steinberg -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 @@ -

- Something has triggered missing webpage on your website. This is the - default error page for nginx that is distributed -- with OpenELA. It is located -+ with Oracle Linux. It is located - /usr/share/nginx/html/50x.html -

- -@@ -106,11 +106,11 @@ -

- -

-- For information on OpenELA, please visit the -- OpenELA website. The -- documentation for OpenELA is -- available on the OpenELA websiteOracle Linux website. The -+ documentation for Oracle Linux is -+ available on the Oracle Linux website. -

- -@@ -124,11 +124,11 @@ - width="121" - height="32" - /> -- [ Powered by OpenELA ] -- -+ - - - diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec index 9815a9f..21d194e 100644 --- a/SPECS/nginx.spec +++ b/SPECS/nginx.spec @@ -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 - 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 - 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