|
|
@ -16,10 +16,21 @@
|
|
|
|
%global with_mailcap_mimetypes 1
|
|
|
|
%global with_mailcap_mimetypes 1
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Cf. https://www.nginx.com/blog/creating-installable-packages-dynamic-modules/
|
|
|
|
|
|
|
|
%global nginx_abiversion %{version}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%global nginx_moduledir %{_libdir}/nginx/modules
|
|
|
|
|
|
|
|
%global nginx_moduleconfdir %{_datadir}/nginx/modules
|
|
|
|
|
|
|
|
%global nginx_srcdir %{_usrsrc}/%{name}-%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Do not generate provides/requires from nginx sources
|
|
|
|
|
|
|
|
%global __provides_exclude_from ^%{nginx_srcdir}/.*$
|
|
|
|
|
|
|
|
%global __requires_exclude_from ^%{nginx_srcdir}/.*$
|
|
|
|
|
|
|
|
|
|
|
|
Name: nginx
|
|
|
|
Name: nginx
|
|
|
|
Epoch: 1
|
|
|
|
Epoch: 1
|
|
|
|
Version: 1.20.0
|
|
|
|
Version: 1.20.1
|
|
|
|
Release: 2%{?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
|
|
|
|
Group: System Environment/Daemons
|
|
|
@ -34,6 +45,9 @@ Source11: nginx.logrotate
|
|
|
|
Source12: nginx.conf
|
|
|
|
Source12: nginx.conf
|
|
|
|
Source13: nginx-upgrade
|
|
|
|
Source13: nginx-upgrade
|
|
|
|
Source14: nginx-upgrade.8
|
|
|
|
Source14: nginx-upgrade.8
|
|
|
|
|
|
|
|
Source15: macros.nginxmods.in
|
|
|
|
|
|
|
|
Source16: nginxmods.attr
|
|
|
|
|
|
|
|
Source17: nginxmods.req
|
|
|
|
Source102: nginx-logo.png
|
|
|
|
Source102: nginx-logo.png
|
|
|
|
Source103: 404.html
|
|
|
|
Source103: 404.html
|
|
|
|
Source104: 50x.html
|
|
|
|
Source104: 50x.html
|
|
|
@ -87,6 +101,8 @@ BuildRequires: systemd
|
|
|
|
Requires(post): systemd
|
|
|
|
Requires(post): systemd
|
|
|
|
Requires(preun): systemd
|
|
|
|
Requires(preun): systemd
|
|
|
|
Requires(postun): systemd
|
|
|
|
Requires(postun): systemd
|
|
|
|
|
|
|
|
# For external nginx modules
|
|
|
|
|
|
|
|
Provides: nginx(abi) = %{nginx_abiversion}
|
|
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
%description
|
|
|
|
Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
|
|
|
|
Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
|
|
|
@ -126,7 +142,7 @@ directories.
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Nginx HTTP geoip module
|
|
|
|
Summary: Nginx HTTP geoip module
|
|
|
|
BuildRequires: GeoIP-devel
|
|
|
|
BuildRequires: GeoIP-devel
|
|
|
|
Requires: nginx
|
|
|
|
Requires: nginx(abi) = %{nginx_abiversion}
|
|
|
|
Requires: GeoIP
|
|
|
|
Requires: GeoIP
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-http-geoip
|
|
|
|
%description mod-http-geoip
|
|
|
@ -137,7 +153,7 @@ Requires: GeoIP
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
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(abi) = %{nginx_abiversion}
|
|
|
|
Requires: gd
|
|
|
|
Requires: gd
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-http-image-filter
|
|
|
|
%description mod-http-image-filter
|
|
|
@ -151,7 +167,7 @@ BuildRequires: perl-devel
|
|
|
|
BuildRequires: perl-generators
|
|
|
|
BuildRequires: perl-generators
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
BuildRequires: perl(ExtUtils::Embed)
|
|
|
|
BuildRequires: perl(ExtUtils::Embed)
|
|
|
|
Requires: nginx
|
|
|
|
Requires: nginx(abi) = %{nginx_abiversion}
|
|
|
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
|
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
|
|
Requires: perl(constant)
|
|
|
|
Requires: perl(constant)
|
|
|
|
|
|
|
|
|
|
|
@ -162,7 +178,7 @@ Requires: perl(constant)
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Nginx XSLT module
|
|
|
|
Summary: Nginx XSLT module
|
|
|
|
BuildRequires: libxslt-devel
|
|
|
|
BuildRequires: libxslt-devel
|
|
|
|
Requires: nginx
|
|
|
|
Requires: nginx(abi) = %{nginx_abiversion}
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-http-xslt-filter
|
|
|
|
%description mod-http-xslt-filter
|
|
|
|
%{summary}.
|
|
|
|
%{summary}.
|
|
|
@ -170,7 +186,7 @@ Requires: nginx
|
|
|
|
%package mod-mail
|
|
|
|
%package mod-mail
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Nginx mail modules
|
|
|
|
Summary: Nginx mail modules
|
|
|
|
Requires: nginx
|
|
|
|
Requires: nginx(abi) = %{nginx_abiversion}
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-mail
|
|
|
|
%description mod-mail
|
|
|
|
%{summary}.
|
|
|
|
%{summary}.
|
|
|
@ -178,11 +194,33 @@ Requires: nginx
|
|
|
|
%package mod-stream
|
|
|
|
%package mod-stream
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Summary: Nginx stream modules
|
|
|
|
Summary: Nginx stream modules
|
|
|
|
Requires: nginx
|
|
|
|
Requires: nginx(abi) = %{nginx_abiversion}
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-stream
|
|
|
|
%description mod-stream
|
|
|
|
%{summary}.
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%package mod-devel
|
|
|
|
|
|
|
|
Summary: Nginx module development files
|
|
|
|
|
|
|
|
Requires: nginx = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
Requires: make
|
|
|
|
|
|
|
|
Requires: gcc
|
|
|
|
|
|
|
|
Requires: gd-devel
|
|
|
|
|
|
|
|
%if 0%{?with_gperftools}
|
|
|
|
|
|
|
|
Requires: gperftools-devel
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%if %{with geoip}
|
|
|
|
|
|
|
|
Requires: GeoIP-devel
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
Requires: libxslt-devel
|
|
|
|
|
|
|
|
Requires: openssl-devel
|
|
|
|
|
|
|
|
Requires: pcre-devel
|
|
|
|
|
|
|
|
Requires: perl-devel
|
|
|
|
|
|
|
|
Requires: perl(ExtUtils::Embed)
|
|
|
|
|
|
|
|
Requires: zlib-devel
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description mod-devel
|
|
|
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%setup -q
|
|
|
|
%setup -q
|
|
|
@ -200,6 +238,10 @@ sed -i -e 's#KillMode=.*#KillMode=process#g' nginx.service
|
|
|
|
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
|
|
|
|
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Prepare sources for installation
|
|
|
|
|
|
|
|
cp -a ../%{name}-%{version} ../%{name}-%{version}-%{release}-src
|
|
|
|
|
|
|
|
mv ../%{name}-%{version}-%{release}-src .
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
# nginx does not utilize a standard configure script. It has its own
|
|
|
|
# nginx does not utilize a standard configure script. It has its own
|
|
|
@ -210,7 +252,7 @@ export DESTDIR=%{buildroot}
|
|
|
|
./configure \
|
|
|
|
./configure \
|
|
|
|
--prefix=%{_datadir}/nginx \
|
|
|
|
--prefix=%{_datadir}/nginx \
|
|
|
|
--sbin-path=%{_sbindir}/nginx \
|
|
|
|
--sbin-path=%{_sbindir}/nginx \
|
|
|
|
--modules-path=%{_libdir}/nginx/modules \
|
|
|
|
--modules-path=%{nginx_moduledir} \
|
|
|
|
--conf-path=%{_sysconfdir}/nginx/nginx.conf \
|
|
|
|
--conf-path=%{_sysconfdir}/nginx/nginx.conf \
|
|
|
|
--error-log-path=%{_localstatedir}/log/nginx/error.log \
|
|
|
|
--error-log-path=%{_localstatedir}/log/nginx/error.log \
|
|
|
|
--http-log-path=%{_localstatedir}/log/nginx/access.log \
|
|
|
|
--http-log-path=%{_localstatedir}/log/nginx/access.log \
|
|
|
@ -291,8 +333,8 @@ install -p -d -m 0700 %{buildroot}%{_localstatedir}/lib/nginx/tmp
|
|
|
|
install -p -d -m 0700 %{buildroot}%{_localstatedir}/log/nginx
|
|
|
|
install -p -d -m 0700 %{buildroot}%{_localstatedir}/log/nginx
|
|
|
|
|
|
|
|
|
|
|
|
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/html
|
|
|
|
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/html
|
|
|
|
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/modules
|
|
|
|
install -p -d -m 0755 %{buildroot}%{nginx_moduleconfdir}
|
|
|
|
install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
|
|
|
|
install -p -d -m 0755 %{buildroot}%{nginx_moduledir}
|
|
|
|
|
|
|
|
|
|
|
|
install -p -m 0644 ./nginx.conf \
|
|
|
|
install -p -m 0644 ./nginx.conf \
|
|
|
|
%{buildroot}%{_sysconfdir}/nginx
|
|
|
|
%{buildroot}%{_sysconfdir}/nginx
|
|
|
@ -328,19 +370,35 @@ for i in ftdetect indent syntax; do
|
|
|
|
done
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with geoip}
|
|
|
|
%if %{with geoip}
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_geoip_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_http_geoip_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-geoip.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-geoip.conf
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_image_filter_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_http_image_filter_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-image-filter.conf
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_perl_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_http_perl_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-perl.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-perl.conf
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_xslt_filter_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_http_xslt_filter_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-http-xslt-filter.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-xslt-filter.conf
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_mail_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_mail_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-mail.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-mail.conf
|
|
|
|
echo 'load_module "%{_libdir}/nginx/modules/ngx_stream_module.so";' \
|
|
|
|
echo 'load_module "%{nginx_moduledir}/ngx_stream_module.so";' \
|
|
|
|
> %{buildroot}%{_datadir}/nginx/modules/mod-stream.conf
|
|
|
|
> %{buildroot}%{nginx_moduleconfdir}/mod-stream.conf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Install files for supporting nginx module builds
|
|
|
|
|
|
|
|
## Install source files
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}%{_usrsrc}
|
|
|
|
|
|
|
|
mv %{name}-%{version}-%{release}-src %{buildroot}%{nginx_srcdir}
|
|
|
|
|
|
|
|
## Install rpm macros
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}%{_rpmmacrodir}
|
|
|
|
|
|
|
|
sed -e "s|@@NGINX_ABIVERSION@@|%{nginx_abiversion}|g" \
|
|
|
|
|
|
|
|
-e "s|@@NGINX_MODDIR@@|%{nginx_moduledir}|g" \
|
|
|
|
|
|
|
|
-e "s|@@NGINX_MODCONFDIR@@|%{nginx_moduleconfdir}|g" \
|
|
|
|
|
|
|
|
-e "s|@@NGINX_SRCDIR@@|%{nginx_srcdir}|g" \
|
|
|
|
|
|
|
|
%{SOURCE15} > %{buildroot}%{_rpmmacrodir}/macros.nginxmods
|
|
|
|
|
|
|
|
## Install dependency generator
|
|
|
|
|
|
|
|
install -Dpm0644 -t %{buildroot}%{_fileattrsdir} %{SOURCE16}
|
|
|
|
|
|
|
|
install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} %{SOURCE17}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%pre filesystem
|
|
|
|
%pre filesystem
|
|
|
|
getent group %{nginx_user} > /dev/null || groupadd -r %{nginx_user}
|
|
|
|
getent group %{nginx_user} > /dev/null || groupadd -r %{nginx_user}
|
|
|
@ -430,7 +488,8 @@ fi
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/log/nginx
|
|
|
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/log/nginx
|
|
|
|
%dir %{_libdir}/nginx/modules
|
|
|
|
%dir %{nginx_moduledir}
|
|
|
|
|
|
|
|
%dir %{nginx_moduleconfdir}
|
|
|
|
|
|
|
|
|
|
|
|
%files all-modules
|
|
|
|
%files all-modules
|
|
|
|
|
|
|
|
|
|
|
@ -445,35 +504,51 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with geoip}
|
|
|
|
%if %{with geoip}
|
|
|
|
%files mod-http-geoip
|
|
|
|
%files mod-http-geoip
|
|
|
|
%{_datadir}/nginx/modules/mod-http-geoip.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-http-geoip.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_http_geoip_module.so
|
|
|
|
%{nginx_moduledir}/ngx_http_geoip_module.so
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-http-image-filter
|
|
|
|
%files mod-http-image-filter
|
|
|
|
%{_datadir}/nginx/modules/mod-http-image-filter.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-http-image-filter.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_http_image_filter_module.so
|
|
|
|
%{nginx_moduledir}/ngx_http_image_filter_module.so
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-http-perl
|
|
|
|
%files mod-http-perl
|
|
|
|
%{_datadir}/nginx/modules/mod-http-perl.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-http-perl.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_http_perl_module.so
|
|
|
|
%{nginx_moduledir}/ngx_http_perl_module.so
|
|
|
|
%dir %{perl_vendorarch}/auto/nginx
|
|
|
|
%dir %{perl_vendorarch}/auto/nginx
|
|
|
|
%{perl_vendorarch}/nginx.pm
|
|
|
|
%{perl_vendorarch}/nginx.pm
|
|
|
|
%{perl_vendorarch}/auto/nginx/nginx.so
|
|
|
|
%{perl_vendorarch}/auto/nginx/nginx.so
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-http-xslt-filter
|
|
|
|
%files mod-http-xslt-filter
|
|
|
|
%{_datadir}/nginx/modules/mod-http-xslt-filter.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-http-xslt-filter.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_http_xslt_filter_module.so
|
|
|
|
%{nginx_moduledir}/ngx_http_xslt_filter_module.so
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-mail
|
|
|
|
%files mod-mail
|
|
|
|
%{_datadir}/nginx/modules/mod-mail.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-mail.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_mail_module.so
|
|
|
|
%{nginx_moduledir}/ngx_mail_module.so
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-stream
|
|
|
|
%files mod-stream
|
|
|
|
%{_datadir}/nginx/modules/mod-stream.conf
|
|
|
|
%{nginx_moduleconfdir}/mod-stream.conf
|
|
|
|
%{_libdir}/nginx/modules/ngx_stream_module.so
|
|
|
|
%{nginx_moduledir}/ngx_stream_module.so
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files mod-devel
|
|
|
|
|
|
|
|
%{_rpmmacrodir}/macros.nginxmods
|
|
|
|
|
|
|
|
%{_fileattrsdir}/nginxmods.attr
|
|
|
|
|
|
|
|
%{_rpmconfigdir}/nginxmods.req
|
|
|
|
|
|
|
|
%{nginx_srcdir}/
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Tue Dec 21 2021 Joe Orton <jorton@redhat.com> - 1:1.20.1-1
|
|
|
|
|
|
|
|
- rebase to 1.20.1 (addressing CVE-2021-23017)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Dec 1 2021 Joe Orton <jorton@redhat.com> - 1:1.20.0-4
|
|
|
|
|
|
|
|
- add delaycompress to logrotate config (#2015243)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Sep 10 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.0-3
|
|
|
|
|
|
|
|
- Add -mod-devel subpackage for building external nginx modules (Neal Gompa)
|
|
|
|
|
|
|
|
Resolves: #1991787
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Aug 20 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.0-2
|
|
|
|
* Fri Aug 20 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.0-2
|
|
|
|
- Resolves: #1991796 - build nginx with --with-compat
|
|
|
|
- Resolves: #1991796 - build nginx with --with-compat
|
|
|
|
|
|
|
|
|
|
|
|