From 11fd354236f99d6518fa71b73904d869ebc20bdd Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Wed, 15 Sep 2021 10:43:52 +0000
Subject: [PATCH] AlmaLinux changes

---
 SOURCES/404.html   | 26 +++++++++++++-------------
 SOURCES/50x.html   | 26 +++++++++++++-------------
 SOURCES/index.html | 30 +++++++++++++++---------------
 SPECS/nginx.spec   |  5 ++++-
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/SOURCES/404.html b/SOURCES/404.html
index c6014a7..a63ac01 100644
--- a/SOURCES/404.html
+++ b/SOURCES/404.html
@@ -7,7 +7,7 @@
         <style type="text/css">
             /*<![CDATA[*/
             body {
-                background-color: #fff;
+                background-color: #FAF5F5;
                 color: #000;
                 font-size: 0.9em;
                 font-family: sans-serif,helvetica;
@@ -15,19 +15,19 @@
                 padding: 0;
             }
             :link {
-                color: #c00;
+                color: #0B2335;
             }
             :visited {
-                color: #c00;
+                color: #0B2335;
             }
             a:hover {
-                color: #f50;
+                color: #0069DA;
             }
             h1 {
                 text-align: center;
                 margin: 0;
                 padding: 0.6em 2em 0.4em;
-                background-color: #900;
+                background-color: #0B2335;
                 color: #fff;
                 font-weight: normal;
                 font-size: 1.75em;
@@ -39,7 +39,7 @@
             }
             h2 {
                 text-align: center;
-                background-color: #900;
+                background-color: #0B2335;
                 font-size: 1.1em;
                 font-weight: bold;
                 color: #fff;
@@ -64,7 +64,7 @@
             }
 
             img {
-                border: 2px solid #fff;
+                border: 2px solid #FAF5F5;
                 padding: 2px;
                 margin: 2px;
             }
@@ -92,7 +92,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
-                    Red Hat Enterprise Linux.  It is located
+                    AlmaLinux.  It is located
                     <tt>/usr/share/nginx/html/404.html</tt></p>
 
                     <p>You should customize this error page for your own
@@ -100,20 +100,20 @@
                     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>
+                    <p>For information on AlmaLinux, please visit the <a href="http://www.almalinux.org/">AlmaLinux website</a>.</p>
 
                 </div>
             </div>
 
             <div class="logos">
                 <a href="http://nginx.net/"><img
-                    src="nginx-logo.png" 
+                    src="nginx-logo.png"
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-                <a href="http://www.redhat.com/"><img
+                <a href="http://www.almalinux.org/"><img
                     src="poweredby.png"
-                    alt="[ Powered by Red Hat Enterprise Linux ]"
-                    width="88" height="31" /></a>
+                    alt="[ Powered by AlmaLinux ]"
+                    width="124" height="32" /></a>
             </div>
         </div>
     </body>
diff --git a/SOURCES/50x.html b/SOURCES/50x.html
index 5d8d957..24a3bf5 100644
--- a/SOURCES/50x.html
+++ b/SOURCES/50x.html
@@ -7,7 +7,7 @@
         <style type="text/css">
             /*<![CDATA[*/
             body {
-                background-color: #fff;
+                background-color: #FAF5F5;
                 color: #000;
                 font-size: 0.9em;
                 font-family: sans-serif,helvetica;
@@ -15,19 +15,19 @@
                 padding: 0;
             }
             :link {
-                color: #c00;
+                color: #0B2335;
             }
             :visited {
-                color: #c00;
+                color: #0B2335;
             }
             a:hover {
-                color: #f50;
+                color: #0069DA;
             }
             h1 {
                 text-align: center;
                 margin: 0;
                 padding: 0.6em 2em 0.4em;
-                background-color: #900;
+                background-color: #0B2335;
                 color: #fff;
                 font-weight: normal;
                 font-size: 1.75em;
@@ -39,7 +39,7 @@
             }
             h2 {
                 text-align: center;
-                background-color: #900;
+                background-color: #0B2335;
                 font-size: 1.1em;
                 font-weight: bold;
                 color: #fff;
@@ -64,7 +64,7 @@
             }
 
             img {
-                border: 2px solid #fff;
+                border: 2px solid #FAF5F5;
                 padding: 2px;
                 margin: 2px;
             }
@@ -92,7 +92,7 @@
                     <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
+                    AlmaLinux.  It is located
                     <tt>/usr/share/nginx/html/50x.html</tt></p>
 
                     <p>You should customize this error page for your own
@@ -100,20 +100,20 @@
                     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>
+                    <p>For information on AlmaLinux, please visit the <a href="http://www.almalinux.org/">AlmaLinux website</a>.</p>
 
                 </div>
             </div>
 
             <div class="logos">
                 <a href="http://nginx.net/"><img
-                    src="nginx-logo.png" 
+                    src="nginx-logo.png"
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-                <a href="http://www.redhat.com/"><img
+                <a href="http://www.almalinux.org/"><img
                     src="poweredby.png"
-                    alt="[ Powered by Red Hat Enterprise Linux ]"
-                    width="88" height="31" /></a>
+                    alt="[ Powered by AlmaLinux ]"
+                    width="124" height="32" /></a>
             </div>
         </div>
     </body>
diff --git a/SOURCES/index.html b/SOURCES/index.html
index 7756222..1543849 100644
--- a/SOURCES/index.html
+++ b/SOURCES/index.html
@@ -2,12 +2,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
-        <title>Test Page for the Nginx HTTP Server on Red Hat Enterprise Linux</title>
+        <title>Test Page for the Nginx HTTP Server on AlmaLinux</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <style type="text/css">
             /*<![CDATA[*/
             body {
-                background-color: #fff;
+                background-color: #FAF5F5;
                 color: #000;
                 font-size: 0.9em;
                 font-family: sans-serif,helvetica;
@@ -15,19 +15,19 @@
                 padding: 0;
             }
             :link {
-                color: #c00;
+                color: #0B2335;
             }
             :visited {
-                color: #c00;
+                color: #0B2335;
             }
             a:hover {
-                color: #f50;
+                color: #0069DA;
             }
             h1 {
                 text-align: center;
                 margin: 0;
                 padding: 0.6em 2em 0.4em;
-                background-color: #900;
+                background-color: #0B2335;
                 color: #fff;
                 font-weight: normal;
                 font-size: 1.75em;
@@ -39,7 +39,7 @@
             }
             h2 {
                 text-align: center;
-                background-color: #900;
+                background-color: #0B2335;
                 font-size: 1.1em;
                 font-weight: bold;
                 color: #fff;
@@ -58,7 +58,7 @@
             }
 
             img {
-                border: 2px solid #fff;
+                border: 2px solid #FAF5F5;
                 padding: 2px;
                 margin: 2px;
             }
@@ -74,7 +74,7 @@
     </head>
 
     <body>
-        <h1>Welcome to <strong>nginx</strong> on Red Hat Enterprise Linux!</h1>
+        <h1>Welcome to <strong>nginx</strong> on AlmaLinux!</h1>
 
         <div class="content">
             <p>This page is used to test the proper operation of the
@@ -88,7 +88,7 @@
                 <div class="content">
                     <p>This is the default <tt>index.html</tt> page that
                     is distributed with <strong>nginx</strong> on
-                    Red Hat Enterprise Linux.  It is located in
+                    AlmaLinux.  It is located in
                     <tt>/usr/share/nginx/html</tt>.</p>
 
                     <p>You should now put your content in a location of
@@ -97,20 +97,20 @@
                     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>
+                    <p>For information on AlmaLinux, please visit the <a href="http://www.almalinux.org/">AlmaLinux website</a>.</p>
 
                 </div>
             </div>
 
             <div class="logos">
                 <a href="http://nginx.net/"><img
-                    src="nginx-logo.png" 
+                    src="nginx-logo.png"
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-                <a href="http://www.redhat.com/"><img
+                <a href="http://www.almalinux.org/"><img
                     src="poweredby.png"
-                    alt="[ Powered by Red Hat Enterprise Linux ]"
-                    width="88" height="31" /></a>
+                    alt="[ Powered by AlmaLinux ]"
+                    width="124" height="32" /></a>
             </div>
         </div>
     </body>
diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec
index bb91407..9ae3a8b 100644
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@@ -19,7 +19,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.16.1
-Release:           2%{?dist}.1
+Release:           2%{?dist}.1.alma
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -469,6 +469,9 @@ fi
 
 
 %changelog
+* Tue Jun 08 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.16.1-2.1.alma
+- Debrand for AlmaLinux
+
 * Tue May 25 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.16.1-2.1
 - Resolves: #1963174 - CVE-2021-23017 nginx:1.16/nginx: Off-by-one in
   ngx_resolver_copy() when labels are followed by a pointer to a root