EPEL committee decision to maintain EPEL7 nginx with Fedora, first step is to replace with master branch files.
This commit is contained in:
parent
c18be768fe
commit
793b7e1d28
116
index.html
116
index.html
@ -1,116 +0,0 @@
|
|||||||
<!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>Test Page for the Nginx HTTP Server on Fedora</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: #294172;
|
|
||||||
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: #3C6EB4;
|
|
||||||
font-size: 1.1em;
|
|
||||||
font-weight: bold;
|
|
||||||
color: #fff;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0.5em;
|
|
||||||
border-bottom: 2px solid #294172;
|
|
||||||
}
|
|
||||||
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>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<h1>Welcome to <strong>nginx</strong> on Fedora!</h1>
|
|
||||||
|
|
||||||
<div class="content">
|
|
||||||
<p>This page is used to test the proper operation of the
|
|
||||||
<strong>nginx</strong> HTTP server after it has been
|
|
||||||
installed. If you can read this page, it means that the
|
|
||||||
web server installed at this site is working
|
|
||||||
properly.</p>
|
|
||||||
|
|
||||||
<div class="alert">
|
|
||||||
<h2>Website Administrator</h2>
|
|
||||||
<div class="content">
|
|
||||||
<p>This is the default <tt>index.html</tt> page that
|
|
||||||
is distributed with <strong>nginx</strong> on
|
|
||||||
Fedora. It is located in
|
|
||||||
<tt>/usr/share/nginx/html</tt>.</p>
|
|
||||||
|
|
||||||
<p>You should now put your content in a location of
|
|
||||||
your choice and edit the <tt>root</tt> configuration
|
|
||||||
directive in the <strong>nginx</strong>
|
|
||||||
configuration file
|
|
||||||
<tt>/etc/nginx/nginx.conf</tt>.</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://fedoraproject.org/"><img
|
|
||||||
src="poweredby.png"
|
|
||||||
alt="[ Powered by Fedora ]"
|
|
||||||
width="88" height="31" /></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
13
nginx-1.12.1-logs-perm.patch
Normal file
13
nginx-1.12.1-logs-perm.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||||
|
index aee7a58..bcceecb 100644
|
||||||
|
--- a/src/core/ngx_cycle.c
|
||||||
|
+++ b/src/core/ngx_cycle.c
|
||||||
|
@@ -1108,7 +1108,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user)
|
||||||
|
}
|
||||||
|
|
||||||
|
fd = ngx_open_file(file[i].name.data, NGX_FILE_APPEND,
|
||||||
|
- NGX_FILE_CREATE_OR_OPEN, NGX_FILE_DEFAULT_ACCESS);
|
||||||
|
+ NGX_FILE_CREATE_OR_OPEN, NGX_FILE_DEFAULT_ACCESS | 0220);
|
||||||
|
|
||||||
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||||
|
"reopen file \"%s\", old:%d new:%d",
|
@ -7,7 +7,7 @@ worker_processes auto;
|
|||||||
error_log /var/log/nginx/error.log;
|
error_log /var/log/nginx/error.log;
|
||||||
pid /run/nginx.pid;
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
# Load dynamic modules. See /usr/share/nginx/README.dynamic.
|
# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
|
||||||
include /usr/share/nginx/modules/*.conf;
|
include /usr/share/nginx/modules/*.conf;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/var/log/nginx/*log {
|
/var/log/nginx/*log {
|
||||||
create 0644 nginx nginx
|
create 0664 nginx root
|
||||||
daily
|
daily
|
||||||
rotate 10
|
rotate 10
|
||||||
missingok
|
missingok
|
||||||
|
248
nginx.spec
248
nginx.spec
@ -1,38 +1,42 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%global nginx_user nginx
|
%global nginx_user nginx
|
||||||
|
|
||||||
|
# Disable strict symbol checks in the link editor.
|
||||||
|
# See: https://src.fedoraproject.org/rpms/redhat-rpm-config/c/078af19
|
||||||
|
%undefine _strict_symbol_defs_build
|
||||||
|
|
||||||
|
%bcond_with geoip
|
||||||
|
|
||||||
# gperftools exist only on selected arches
|
# gperftools exist only on selected arches
|
||||||
%ifnarch s390 s390x
|
# gperftools *detection* is failing on ppc64*, possibly only configure
|
||||||
|
# bug, but disable anyway.
|
||||||
|
%ifnarch s390 s390x ppc64 ppc64le
|
||||||
%global with_gperftools 1
|
%global with_gperftools 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global with_aio 1
|
%global with_aio 1
|
||||||
|
|
||||||
%if 0%{?fedora} > 22
|
%if 0%{?fedora} > 22 || 0%{?rhel} >= 8
|
||||||
%global with_mailcap_mimetypes 1
|
%global with_mailcap_mimetypes 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.12.2
|
Version: 1.16.1
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
Group: System Environment/Daemons
|
|
||||||
# BSD License (two clause)
|
# BSD License (two clause)
|
||||||
# http://www.freebsd.org/copyright/freebsd-license.html
|
# http://www.freebsd.org/copyright/freebsd-license.html
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://nginx.org/
|
URL: http://nginx.org/
|
||||||
|
|
||||||
Source0: http://nginx.org/download/nginx-%{version}.tar.gz
|
Source0: https://nginx.org/download/nginx-%{version}.tar.gz
|
||||||
Source1: http://nginx.org/download/nginx-%{version}.tar.gz.asc
|
|
||||||
Source10: nginx.service
|
Source10: nginx.service
|
||||||
Source11: nginx.logrotate
|
Source11: nginx.logrotate
|
||||||
Source12: nginx.conf
|
Source12: nginx.conf
|
||||||
Source13: nginx-upgrade
|
Source13: nginx-upgrade
|
||||||
Source14: nginx-upgrade.8
|
Source14: nginx-upgrade.8
|
||||||
Source100: index.html
|
|
||||||
Source101: poweredby.png
|
|
||||||
Source102: nginx-logo.png
|
Source102: nginx-logo.png
|
||||||
Source103: 404.html
|
Source103: 404.html
|
||||||
Source104: 50x.html
|
Source104: 50x.html
|
||||||
@ -43,6 +47,11 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
|
|||||||
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||||
Patch0: nginx-auto-cc-gcc.patch
|
Patch0: nginx-auto-cc-gcc.patch
|
||||||
|
|
||||||
|
# downstream patch - changing logs permissions to 664 instead
|
||||||
|
# previous 644
|
||||||
|
Patch2: nginx-1.12.1-logs-perm.patch
|
||||||
|
|
||||||
|
BuildRequires: gcc
|
||||||
%if 0%{?with_gperftools}
|
%if 0%{?with_gperftools}
|
||||||
BuildRequires: gperftools-devel
|
BuildRequires: gperftools-devel
|
||||||
%endif
|
%endif
|
||||||
@ -51,8 +60,18 @@ BuildRequires: pcre-devel
|
|||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
||||||
|
%if 0%{?el7}
|
||||||
|
# centos-logos el7 does not provide 'system-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
|
||||||
|
Obsoletes: nginx-mod-http-geoip <= 1:1.16
|
||||||
|
%else
|
||||||
|
Requires: system-logos-httpd
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} || 0%{?fedora} < 24
|
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
||||||
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
|
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
|
||||||
Requires: nginx-all-modules = %{epoch}:%{version}-%{release}
|
Requires: nginx-all-modules = %{epoch}:%{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
@ -76,11 +95,12 @@ IMAP protocols, with a strong focus on high concurrency, performance and low
|
|||||||
memory usage.
|
memory usage.
|
||||||
|
|
||||||
%package all-modules
|
%package all-modules
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: A meta package that installs all available Nginx modules
|
Summary: A meta package that installs all available Nginx modules
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
Requires: nginx-mod-http-geoip = %{epoch}:%{version}-%{release}
|
Requires: nginx-mod-http-geoip = %{epoch}:%{version}-%{release}
|
||||||
|
%endif
|
||||||
Requires: nginx-mod-http-image-filter = %{epoch}:%{version}-%{release}
|
Requires: nginx-mod-http-image-filter = %{epoch}:%{version}-%{release}
|
||||||
Requires: nginx-mod-http-perl = %{epoch}:%{version}-%{release}
|
Requires: nginx-mod-http-perl = %{epoch}:%{version}-%{release}
|
||||||
Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release}
|
Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release}
|
||||||
@ -88,18 +108,9 @@ Requires: nginx-mod-mail = %{epoch}:%{version}-%{release}
|
|||||||
Requires: nginx-mod-stream = %{epoch}:%{version}-%{release}
|
Requires: nginx-mod-stream = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description all-modules
|
%description all-modules
|
||||||
%{summary}.
|
Meta package that installs all available nginx modules.
|
||||||
%if 0%{?rhel}
|
|
||||||
The main nginx package depends on this to ease the upgrade path. After a grace
|
|
||||||
period of several months, modules will become optional.
|
|
||||||
%endif
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} < 24
|
|
||||||
The main nginx package depends on this to ease the upgrade path. Starting from
|
|
||||||
Fedora 24, modules are optional.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package filesystem
|
%package filesystem
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: The basic directory layout for the Nginx server
|
Summary: The basic directory layout for the Nginx server
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
@ -109,8 +120,8 @@ The nginx-filesystem package contains the basic directory layout
|
|||||||
for the Nginx server including the correct permissions for the
|
for the Nginx server including the correct permissions for the
|
||||||
directories.
|
directories.
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
%package mod-http-geoip
|
%package mod-http-geoip
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx HTTP geoip module
|
Summary: Nginx HTTP geoip module
|
||||||
BuildRequires: GeoIP-devel
|
BuildRequires: GeoIP-devel
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
@ -118,9 +129,9 @@ Requires: GeoIP
|
|||||||
|
|
||||||
%description mod-http-geoip
|
%description mod-http-geoip
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
%endif
|
||||||
|
|
||||||
%package mod-http-image-filter
|
%package mod-http-image-filter
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx HTTP image filter module
|
Summary: Nginx HTTP image filter module
|
||||||
BuildRequires: gd-devel
|
BuildRequires: gd-devel
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
@ -130,21 +141,20 @@ Requires: gd
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package mod-http-perl
|
%package mod-http-perl
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx HTTP perl module
|
Summary: Nginx HTTP perl module
|
||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
%if 0%{?fedora} >= 24
|
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 7
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: perl(ExtUtils::Embed)
|
BuildRequires: perl(ExtUtils::Embed)
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||||
|
Requires: perl(constant)
|
||||||
|
|
||||||
%description mod-http-perl
|
%description mod-http-perl
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package mod-http-xslt-filter
|
%package mod-http-xslt-filter
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx XSLT module
|
Summary: Nginx XSLT module
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
@ -153,7 +163,6 @@ Requires: nginx
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package mod-mail
|
%package mod-mail
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx mail modules
|
Summary: Nginx mail modules
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
|
|
||||||
@ -161,7 +170,6 @@ Requires: nginx
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package mod-stream
|
%package mod-stream
|
||||||
Group: System Environment/Daemons
|
|
||||||
Summary: Nginx stream modules
|
Summary: Nginx stream modules
|
||||||
Requires: nginx
|
Requires: nginx
|
||||||
|
|
||||||
@ -172,13 +180,12 @@ Requires: nginx
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
|
%patch2 -p1
|
||||||
|
cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
|
||||||
|
|
||||||
cp %{SOURCE200} .
|
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
||||||
cp %{SOURCE210} .
|
sed -i -e 's#KillMode=.*#KillMode=process#g' nginx.service
|
||||||
|
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10}
|
|
||||||
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' %{SOURCE12}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -188,7 +195,9 @@ sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' %{SOURCE12}
|
|||||||
# to error out. This is is also the reason for the DESTDIR environment
|
# to error out. This is is also the reason for the DESTDIR environment
|
||||||
# variable.
|
# variable.
|
||||||
export DESTDIR=%{buildroot}
|
export DESTDIR=%{buildroot}
|
||||||
./configure \
|
# So the perl module finds its symbols:
|
||||||
|
nginx_ldopts="$RPM_LD_FLAGS -Wl,-E"
|
||||||
|
if ! ./configure \
|
||||||
--prefix=%{_datadir}/nginx \
|
--prefix=%{_datadir}/nginx \
|
||||||
--sbin-path=%{_sbindir}/nginx \
|
--sbin-path=%{_sbindir}/nginx \
|
||||||
--modules-path=%{_libdir}/nginx/modules \
|
--modules-path=%{_libdir}/nginx/modules \
|
||||||
@ -208,14 +217,16 @@ export DESTDIR=%{buildroot}
|
|||||||
--with-file-aio \
|
--with-file-aio \
|
||||||
%endif
|
%endif
|
||||||
--with-ipv6 \
|
--with-ipv6 \
|
||||||
--with-http_auth_request_module \
|
|
||||||
--with-http_ssl_module \
|
--with-http_ssl_module \
|
||||||
--with-http_v2_module \
|
--with-http_v2_module \
|
||||||
--with-http_realip_module \
|
--with-http_realip_module \
|
||||||
|
--with-stream_ssl_preread_module \
|
||||||
--with-http_addition_module \
|
--with-http_addition_module \
|
||||||
--with-http_xslt_module=dynamic \
|
--with-http_xslt_module=dynamic \
|
||||||
--with-http_image_filter_module=dynamic \
|
--with-http_image_filter_module=dynamic \
|
||||||
|
%if %{with geoip}
|
||||||
--with-http_geoip_module=dynamic \
|
--with-http_geoip_module=dynamic \
|
||||||
|
%endif
|
||||||
--with-http_sub_module \
|
--with-http_sub_module \
|
||||||
--with-http_dav_module \
|
--with-http_dav_module \
|
||||||
--with-http_flv_module \
|
--with-http_flv_module \
|
||||||
@ -228,6 +239,7 @@ export DESTDIR=%{buildroot}
|
|||||||
--with-http_slice_module \
|
--with-http_slice_module \
|
||||||
--with-http_stub_status_module \
|
--with-http_stub_status_module \
|
||||||
--with-http_perl_module=dynamic \
|
--with-http_perl_module=dynamic \
|
||||||
|
--with-http_auth_request_module \
|
||||||
--with-mail=dynamic \
|
--with-mail=dynamic \
|
||||||
--with-mail_ssl_module \
|
--with-mail_ssl_module \
|
||||||
--with-pcre \
|
--with-pcre \
|
||||||
@ -239,7 +251,11 @@ export DESTDIR=%{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
--with-debug \
|
--with-debug \
|
||||||
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
|
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
|
||||||
--with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
|
--with-ld-opt="$nginx_ldopts"; then
|
||||||
|
: configure failed
|
||||||
|
cat objs/autoconf.err
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
@ -252,11 +268,14 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f '{}' \;
|
|||||||
find %{buildroot} -type f -empty -exec rm -f '{}' \;
|
find %{buildroot} -type f -empty -exec rm -f '{}' \;
|
||||||
find %{buildroot} -type f -iname '*.so' -exec chmod 0755 '{}' \;
|
find %{buildroot} -type f -iname '*.so' -exec chmod 0755 '{}' \;
|
||||||
|
|
||||||
install -p -D -m 0644 %{SOURCE10} \
|
install -p -D -m 0644 ./nginx.service \
|
||||||
%{buildroot}%{_unitdir}/nginx.service
|
%{buildroot}%{_unitdir}/nginx.service
|
||||||
install -p -D -m 0644 %{SOURCE11} \
|
install -p -D -m 0644 %{SOURCE11} \
|
||||||
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
|
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
|
||||||
|
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/systemd/system/nginx.service.d
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_unitdir}/nginx.service.d
|
||||||
|
|
||||||
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/conf.d
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/conf.d
|
||||||
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/default.d
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/default.d
|
||||||
|
|
||||||
@ -268,12 +287,30 @@ install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/html
|
|||||||
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/modules
|
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/modules
|
||||||
install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
|
install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
|
||||||
|
|
||||||
install -p -m 0644 %{SOURCE12} \
|
install -p -m 0644 ./nginx.conf \
|
||||||
%{buildroot}%{_sysconfdir}/nginx
|
%{buildroot}%{_sysconfdir}/nginx
|
||||||
install -p -m 0644 %{SOURCE100} \
|
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
rm -f %{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
install -p -m 0644 %{SOURCE101} %{SOURCE102} \
|
%if 0%{?el7}
|
||||||
|
ln -s ../../doc/HTML/index.html \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
ln -s ../../doc/HTML/img \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/img
|
||||||
|
ln -s ../../doc/HTML/en-US \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/en-US
|
||||||
|
%else
|
||||||
|
ln -s ../../fedora-testpage/index.html \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
%endif
|
||||||
|
install -p -m 0644 %{SOURCE102} \
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
ln -s nginx-logo.png %{buildroot}%{_datadir}/nginx/html/poweredby.png
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/nginx/html/icons
|
||||||
|
|
||||||
|
# Symlink for the powered-by-$DISTRO image:
|
||||||
|
ln -s ../../../pixmaps/poweredby.png \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/icons/poweredby.png
|
||||||
|
|
||||||
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
|
||||||
@ -281,7 +318,7 @@ install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
|||||||
rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types
|
rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \
|
install -p -D -m 0644 %{_builddir}/nginx-%{version}/objs/nginx.8 \
|
||||||
%{buildroot}%{_mandir}/man8/nginx.8
|
%{buildroot}%{_mandir}/man8/nginx.8
|
||||||
|
|
||||||
install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
|
install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
|
||||||
@ -292,8 +329,10 @@ for i in ftdetect ftplugin indent syntax; do
|
|||||||
%{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim
|
%{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim
|
||||||
done
|
done
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_geoip_module.so";' \
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_geoip_module.so";' \
|
||||||
> %{buildroot}%{_datadir}/nginx/modules/mod-http-geoip.conf
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-geoip.conf
|
||||||
|
%endif
|
||||||
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_image_filter_module.so";' \
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_image_filter_module.so";' \
|
||||||
> %{buildroot}%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
||||||
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_perl_module.so";' \
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_perl_module.so";' \
|
||||||
@ -315,10 +354,12 @@ exit 0
|
|||||||
%post
|
%post
|
||||||
%systemd_post nginx.service
|
%systemd_post nginx.service
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
%post mod-http-geoip
|
%post mod-http-geoip
|
||||||
if [ $1 -eq 1 ]; then
|
if [ $1 -eq 1 ]; then
|
||||||
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
%post mod-http-image-filter
|
%post mod-http-image-filter
|
||||||
if [ $1 -eq 1 ]; then
|
if [ $1 -eq 1 ]; then
|
||||||
@ -389,9 +430,9 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params.default
|
%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params.default
|
||||||
%config(noreplace) %{_sysconfdir}/nginx/win-utf
|
%config(noreplace) %{_sysconfdir}/nginx/win-utf
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx
|
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx
|
||||||
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/lib/nginx
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
|
||||||
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/lib/nginx/tmp
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
|
||||||
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/log/nginx
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/log/nginx
|
||||||
%dir %{_libdir}/nginx/modules
|
%dir %{_libdir}/nginx/modules
|
||||||
|
|
||||||
%files all-modules
|
%files all-modules
|
||||||
@ -402,10 +443,14 @@ fi
|
|||||||
%dir %{_sysconfdir}/nginx
|
%dir %{_sysconfdir}/nginx
|
||||||
%dir %{_sysconfdir}/nginx/conf.d
|
%dir %{_sysconfdir}/nginx/conf.d
|
||||||
%dir %{_sysconfdir}/nginx/default.d
|
%dir %{_sysconfdir}/nginx/default.d
|
||||||
|
%dir %{_sysconfdir}/systemd/system/nginx.service.d
|
||||||
|
%dir %{_unitdir}/nginx.service.d
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
%files mod-http-geoip
|
%files mod-http-geoip
|
||||||
%{_datadir}/nginx/modules/mod-http-geoip.conf
|
%{_datadir}/nginx/modules/mod-http-geoip.conf
|
||||||
%{_libdir}/nginx/modules/ngx_http_geoip_module.so
|
%{_libdir}/nginx/modules/ngx_http_geoip_module.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%files mod-http-image-filter
|
%files mod-http-image-filter
|
||||||
%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
||||||
@ -432,19 +477,112 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue May 07 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.12.2-3
|
* Sun Sep 15 2019 Warren Togami <warren@blockstream.com>
|
||||||
|
- add conditionals for EPEL7, see rhbz#1750857
|
||||||
|
|
||||||
|
* Tue Aug 13 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.1-1
|
||||||
|
- Update to upstream release 1.16.1
|
||||||
|
- Fixes CVE-2019-9511, CVE-2019-9513, CVE-2019-9516
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.16.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.16.0-4
|
||||||
|
- Perl 5.30 rebuild
|
||||||
|
|
||||||
|
* Tue May 14 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.16.0-3
|
||||||
|
- Move to common default index.html
|
||||||
|
- Resolves: rhbz#1636235
|
||||||
|
|
||||||
|
* Tue May 07 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-2
|
||||||
- Add missing directory for vim plugin
|
- Add missing directory for vim plugin
|
||||||
|
|
||||||
* Tue Mar 6 2018 Tadej Janež <tadej.j@nez.si> - 1:1.12.2-2
|
* Fri Apr 26 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-1
|
||||||
- enable building the ngx_http_auth_request_module module (RHBZ #1471107)
|
- Update to upstream release 1.16.0
|
||||||
|
|
||||||
* Wed Oct 18 2017 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.2-1
|
* Mon Mar 04 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.15.9-1
|
||||||
- update to upstream release 1.12.2
|
- Update to upstream release 1.15.9
|
||||||
- Resolves: #1468584 - (CVE-2017-7529) CVE-2017-7529 nginx: Integer
|
- Enable ngx_stream_ssl_preread module
|
||||||
overflow in nginx range filter module leading to memory disclosure
|
- Remove redundant conditionals
|
||||||
|
|
||||||
* Mon Sep 18 2017 Luboš Uhliarik <luhliari@redhat.com> - 1:1.10.2-2
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.14.1-5
|
||||||
- Resolves: #1478662 - rebuild for ALPN support
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1:1.14.1-4
|
||||||
|
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||||
|
|
||||||
|
* Tue Dec 11 2018 Joe Orton <jorton@redhat.com> - 1:1.14.1-3
|
||||||
|
- fix unexpanded paths in nginx(8)
|
||||||
|
|
||||||
|
* Tue Nov 20 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.14.1-2
|
||||||
|
- new version 1.14.1
|
||||||
|
- Resolves: #1584426 - Upstream Nginx 1.14.0 is now available
|
||||||
|
- Resolves: #1647255 - CVE-2018-16845 nginx: Denial of service and memory
|
||||||
|
disclosure via mp4 module
|
||||||
|
- Resolves: #1647259 - CVE-2018-16843 nginx: Excessive memory consumption
|
||||||
|
via flaw in HTTP/2 implementation
|
||||||
|
- Resolves: #1647258 - CVE-2018-16844 nginx: Excessive CPU usage via flaw
|
||||||
|
in HTTP/2 implementation
|
||||||
|
|
||||||
|
* Mon Aug 06 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-14
|
||||||
|
- add requires on perl(constant) for mod-http-perl
|
||||||
|
|
||||||
|
* Mon Jul 30 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-13
|
||||||
|
- don't build with geoip by default
|
||||||
|
|
||||||
|
* Thu Jul 19 2018 Joe Orton <jorton@redhat.com> - 1:1.12.1-12
|
||||||
|
- add build conditional for geoip support
|
||||||
|
|
||||||
|
* Mon Jul 16 2018 Tadej Janež <tadej.j@nez.si> - 1:1.12.1-11
|
||||||
|
- Add gcc to BuildRequires to account for
|
||||||
|
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.12.1-9
|
||||||
|
- Perl 5.28 rebuild
|
||||||
|
|
||||||
|
* Mon May 14 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-8
|
||||||
|
- Related: #1573942 - nginx fails on start
|
||||||
|
|
||||||
|
* Wed May 02 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-7
|
||||||
|
- Resolves: #1573942 - nginx fails on start
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 24 2018 Björn Esser <besser82@fedoraproject.org> - 1:1.12.1-5
|
||||||
|
- Add patch to apply glibc bugfix if really needed only
|
||||||
|
- Disable strict symbol checks in the link editor
|
||||||
|
|
||||||
|
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1:1.12.1-4
|
||||||
|
- Rebuilt for switch to libxcrypt
|
||||||
|
|
||||||
|
* Tue Oct 24 2017 Joe Orton <jorton@redhat.com> - 1:1.12.1-3
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue Sep 19 2017 Remi Collet <remi@fedoraproject.org> - 1:1.12.1-2
|
||||||
|
- own system drop-in directories #1493036
|
||||||
|
|
||||||
|
* Tue Aug 15 2017 Joe Orton <jorton@redhat.com> - 1:1.12.1-1
|
||||||
|
- update to 1.12.1 (#1469924)
|
||||||
|
- enable http_auth_request_module (Tim Niemueller, #1471106)
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.12.0-2
|
||||||
|
- Perl 5.26 rebuild
|
||||||
|
|
||||||
|
* Tue May 30 2017 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.0-1
|
||||||
|
- new version 1.12.0
|
||||||
|
|
||||||
|
* Wed Feb 8 2017 Joe Orton <jorton@redhat.com> - 1:1.10.3-1
|
||||||
|
- update to upstream release 1.10.3
|
||||||
|
|
||||||
* Mon Oct 31 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.2-1
|
* Mon Oct 31 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.2-1
|
||||||
- update to upstream release 1.10.2
|
- update to upstream release 1.10.2
|
||||||
|
BIN
poweredby.png
BIN
poweredby.png
Binary file not shown.
Before Width: | Height: | Size: 2.7 KiB |
3
sources
3
sources
@ -1,2 +1 @@
|
|||||||
SHA512 (nginx-1.12.2.tar.gz) = 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
|
SHA512 (nginx-1.16.1.tar.gz) = 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437
|
||||||
SHA512 (nginx-1.12.2.tar.gz.asc) = 1ecb4024ced5318ac4d72445b9722e041a1ea2da08b04a8aefac6278cd83255682f37aa9bd4815808e628c3b96e720aacbf5809da4d827c3ff35c6b25abf3f36
|
|
||||||
|
Loading…
Reference in New Issue
Block a user