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

AlmaLinux changes

This commit is contained in:
Andrew Lukoshko 2021-09-15 10:43:52 +00:00
parent 2aed67ac15
commit 11fd354236
4 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SOURCES/404.html
View File

@ -7,7 +7,7 @@
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
body { body {
background-color: #fff; background-color: #FAF5F5;
color: #000; color: #000;
font-size: 0.9em; font-size: 0.9em;
font-family: sans-serif,helvetica; font-family: sans-serif,helvetica;
@ -15,19 +15,19 @@
padding: 0; padding: 0;
} }
:link { :link {
color: #c00; color: #0B2335;
} }
:visited { :visited {
color: #c00; color: #0B2335;
} }
a:hover { a:hover {
color: #f50; color: #0069DA;
} }
h1 { h1 {
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #0B2335;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -39,7 +39,7 @@
} }
h2 { h2 {
text-align: center; text-align: center;
background-color: #900; background-color: #0B2335;
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
@ -64,7 +64,7 @@
} }
img { img {
border: 2px solid #fff; border: 2px solid #FAF5F5;
padding: 2px; padding: 2px;
margin: 2px; margin: 2px;
} }
@ -92,7 +92,7 @@
<p>Something has triggered missing webpage on your <p>Something has triggered missing webpage on your
website. This is the default 404 error page for website. This is the default 404 error page for
<strong>nginx</strong> that is distributed with <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> <tt>/usr/share/nginx/html/404.html</tt></p>
<p>You should customize this error page for your own <p>You should customize this error page for your own
@ -100,20 +100,20 @@
the <strong>nginx</strong> configuration file the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p> <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> </div>
<div class="logos"> <div class="logos">
<a href="http://nginx.net/"><img <a href="http://nginx.net/"><img
src="nginx-logo.png" src="nginx-logo.png"
alt="[ Powered by nginx ]" alt="[ Powered by nginx ]"
width="121" height="32" /></a> width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img <a href="http://www.almalinux.org/"><img
src="poweredby.png" src="poweredby.png"
alt="[ Powered by Red Hat Enterprise Linux ]" alt="[ Powered by AlmaLinux ]"
width="88" height="31" /></a> width="124" height="32" /></a>
</div> </div>
</div> </div>
</body> </body>

26
SOURCES/50x.html
View File

@ -7,7 +7,7 @@
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
body { body {
background-color: #fff; background-color: #FAF5F5;
color: #000; color: #000;
font-size: 0.9em; font-size: 0.9em;
font-family: sans-serif,helvetica; font-family: sans-serif,helvetica;
@ -15,19 +15,19 @@
padding: 0; padding: 0;
} }
:link { :link {
color: #c00; color: #0B2335;
} }
:visited { :visited {
color: #c00; color: #0B2335;
} }
a:hover { a:hover {
color: #f50; color: #0069DA;
} }
h1 { h1 {
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #0B2335;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -39,7 +39,7 @@
} }
h2 { h2 {
text-align: center; text-align: center;
background-color: #900; background-color: #0B2335;
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
@ -64,7 +64,7 @@
} }
img { img {
border: 2px solid #fff; border: 2px solid #FAF5F5;
padding: 2px; padding: 2px;
margin: 2px; margin: 2px;
} }
@ -92,7 +92,7 @@
<p>Something has triggered missing webpage on your <p>Something has triggered missing webpage on your
website. This is the default error page for website. This is the default error page for
<strong>nginx</strong> that is distributed with <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> <tt>/usr/share/nginx/html/50x.html</tt></p>
<p>You should customize this error page for your own <p>You should customize this error page for your own
@ -100,20 +100,20 @@
the <strong>nginx</strong> configuration file the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p> <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> </div>
<div class="logos"> <div class="logos">
<a href="http://nginx.net/"><img <a href="http://nginx.net/"><img
src="nginx-logo.png" src="nginx-logo.png"
alt="[ Powered by nginx ]" alt="[ Powered by nginx ]"
width="121" height="32" /></a> width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img <a href="http://www.almalinux.org/"><img
src="poweredby.png" src="poweredby.png"
alt="[ Powered by Red Hat Enterprise Linux ]" alt="[ Powered by AlmaLinux ]"
width="88" height="31" /></a> width="124" height="32" /></a>
</div> </div>
</div> </div>
</body> </body>

30
SOURCES/index.html
View File

@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head> <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" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
body { body {
background-color: #fff; background-color: #FAF5F5;
color: #000; color: #000;
font-size: 0.9em; font-size: 0.9em;
font-family: sans-serif,helvetica; font-family: sans-serif,helvetica;
@ -15,19 +15,19 @@
padding: 0; padding: 0;
} }
:link { :link {
color: #c00; color: #0B2335;
} }
:visited { :visited {
color: #c00; color: #0B2335;
} }
a:hover { a:hover {
color: #f50; color: #0069DA;
} }
h1 { h1 {
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #0B2335;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -39,7 +39,7 @@
} }
h2 { h2 {
text-align: center; text-align: center;
background-color: #900; background-color: #0B2335;
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
@ -58,7 +58,7 @@
} }
img { img {
border: 2px solid #fff; border: 2px solid #FAF5F5;
padding: 2px; padding: 2px;
margin: 2px; margin: 2px;
} }
@ -74,7 +74,7 @@
</head> </head>
<body> <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"> <div class="content">
<p>This page is used to test the proper operation of the <p>This page is used to test the proper operation of the
@ -88,7 +88,7 @@
<div class="content"> <div class="content">
<p>This is the default <tt>index.html</tt> page that <p>This is the default <tt>index.html</tt> page that
is distributed with <strong>nginx</strong> on 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> <tt>/usr/share/nginx/html</tt>.</p>
<p>You should now put your content in a location of <p>You should now put your content in a location of
@ -97,20 +97,20 @@
configuration file configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p> <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> </div>
<div class="logos"> <div class="logos">
<a href="http://nginx.net/"><img <a href="http://nginx.net/"><img
src="nginx-logo.png" src="nginx-logo.png"
alt="[ Powered by nginx ]" alt="[ Powered by nginx ]"
width="121" height="32" /></a> width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img <a href="http://www.almalinux.org/"><img
src="poweredby.png" src="poweredby.png"
alt="[ Powered by Red Hat Enterprise Linux ]" alt="[ Powered by AlmaLinux ]"
width="88" height="31" /></a> width="124" height="32" /></a>
</div> </div>
</div> </div>
</body> </body>

5
SPECS/nginx.spec
View File

@ -19,7 +19,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.16.1 Version: 1.16.1
Release: 2%{?dist}.1 Release: 2%{?dist}.1.alma
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -469,6 +469,9 @@ fi
%changelog %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 * 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 - 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 ngx_resolver_copy() when labels are followed by a pointer to a root