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

Update to 1.10.0

Browse Source
This commit is contained in:
Jamie Nguyen 2016-04-19 09:34:43 +01:00
parent 2260d65fbc
commit 8ce940ba30
4 changed files with 241 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.fedora Normal file
View File

@ -0,0 +1,20 @@
###############
Dynamic modules
###############
Dynamic modules are loaded using the "load_modules" directive. The RPM package
for each module has a '.conf' file in the /usr/share/nginx/modules directory.
The '.conf' file contains a single "load_modules" directive.
This means that whenever a new dynamic module is installed, it will
automatically be enabled and Nginx will be reloaded.
--------------------------------------------------------
Prevent dynamic modules from being enabled automatically
--------------------------------------------------------
You may want to avoid dynamic modules being enabled automatically. Simply
remove this line from the top of /etc/nginx/nginx.conf:
include /usr/lib64/nginx/modules/*.conf;

3
nginx.conf
View File

@ -7,6 +7,9 @@ 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.fedora.
include /usr/share/nginx/modules/*.conf;
events { events {
worker_connections 1024; worker_connections 1024;
} }

288
nginx.spec
View File

@ -1,12 +1,5 @@
%global _hardened_build 1 %global _hardened_build 1
%global nginx_user nginx %global nginx_user nginx
%global nginx_group %{nginx_user}
%global nginx_home %{_localstatedir}/lib/nginx
%global nginx_home_tmp %{nginx_home}/tmp
%global nginx_confdir %{_sysconfdir}/nginx
%global nginx_datadir %{_datadir}/nginx
%global nginx_logdir %{_localstatedir}/log/nginx
%global nginx_webroot %{nginx_datadir}/html
# gperftools exist only on selected arches # gperftools exist only on selected arches
%ifarch %{ix86} x86_64 ppc ppc64 %{arm} aarch64 %ifarch %{ix86} x86_64 ppc ppc64 %{arm} aarch64
@ -24,8 +17,8 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.8.1 Version: 1.10.0
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
@ -46,29 +39,26 @@ Source101: poweredby.png
Source102: nginx-logo.png Source102: nginx-logo.png
Source103: 404.html Source103: 404.html
Source104: 50x.html Source104: 50x.html
Source200: README.fedora
# removes -Werror in upstream build scripts. -Werror conflicts with # removes -Werror in upstream build scripts. -Werror conflicts with
# -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
BuildRequires: GeoIP-devel
BuildRequires: gd-devel
%if 0%{?with_gperftools} %if 0%{?with_gperftools}
BuildRequires: gperftools-devel BuildRequires: gperftools-devel
%endif %endif
BuildRequires: libxslt-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: perl-devel
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: zlib-devel BuildRequires: zlib-devel
Requires: nginx-filesystem = %{epoch}:%{version}-%{release} Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
Requires: GeoIP
Requires: gd # Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
Requires: nginx-all-modules = %{epoch}:%{version}-%{release}
Requires: openssl Requires: openssl
Requires: pcre Requires: pcre
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires(pre): nginx-filesystem Requires(pre): nginx-filesystem
%if 0%{?with_mailcap_mimetypes} %if 0%{?with_mailcap_mimetypes}
Requires: nginx-mimetypes Requires: nginx-mimetypes
@ -85,6 +75,21 @@ Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
IMAP protocols, with a strong focus on high concurrency, performance and low IMAP protocols, with a strong focus on high concurrency, performance and low
memory usage. memory usage.
%package all-modules
Group: System Environment/Daemons
Summary: A meta package that installs all available Nginx modules
BuildArch: noarch
Requires: nginx-mod-http-geoip = %{epoch}:%{version}-%{release}
Requires: nginx-mod-http-image-filter = %{epoch}:%{version}-%{release}
Requires: nginx-mod-http-perl = %{epoch}:%{version}-%{release}
Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release}
Requires: nginx-mod-mail = %{epoch}:%{version}-%{release}
Requires: nginx-mod-stream = %{epoch}:%{version}-%{release}
%description all-modules
%{summary}.
%package filesystem %package filesystem
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: The basic directory layout for the Nginx server Summary: The basic directory layout for the Nginx server
@ -96,10 +101,67 @@ 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.
%package mod-http-geoip
Group: System Environment/Daemons
Summary: Nginx HTTP geoip module
BuildRequires: GeoIP-devel
Requires: nginx
Requires: GeoIP
%description mod-http-geoip
%{summary}.
%package mod-http-image-filter
Group: System Environment/Daemons
Summary: Nginx HTTP image filter module
BuildRequires: gd-devel
Requires: nginx
Requires: gd
%description mod-http-image-filter
%{summary}.
%package mod-http-perl
Group: System Environment/Daemons
Summary: Nginx HTTP perl module
BuildRequires: perl-devel
BuildRequires: perl(ExtUtils::Embed)
Requires: nginx
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description mod-http-perl
%{summary}.
%package mod-http-xslt-filter
Group: System Environment/Daemons
Summary: Nginx XSLT module
BuildRequires: libxslt-devel
Requires: nginx
%description mod-http-xslt-filter
%{summary}.
%package mod-mail
Group: System Environment/Daemons
Summary: Nginx mail modules
Requires: nginx
%description mod-mail
%{summary}.
%package mod-stream
Group: System Environment/Daemons
Summary: Nginx stream modules
Requires: nginx
%description mod-stream
%{summary}.
%prep %prep
%setup -q %setup -q
%patch0 -p0 %patch0 -p0
cp %{SOURCE200} .
%build %build
@ -109,31 +171,32 @@ directories.
# variable. # variable.
export DESTDIR=%{buildroot} export DESTDIR=%{buildroot}
./configure \ ./configure \
--prefix=%{nginx_datadir} \ --prefix=%{_datadir}/nginx \
--sbin-path=%{_sbindir}/nginx \ --sbin-path=%{_sbindir}/nginx \
--conf-path=%{nginx_confdir}/nginx.conf \ --modules-path=%{_libdir}/nginx/modules \
--error-log-path=%{nginx_logdir}/error.log \ --conf-path=%{_sysconfdir}/nginx/nginx.conf \
--http-log-path=%{nginx_logdir}/access.log \ --error-log-path=%{_localstatedir}/log/nginx/error.log \
--http-client-body-temp-path=%{nginx_home_tmp}/client_body \ --http-log-path=%{_localstatedir}/log/nginx/access.log \
--http-proxy-temp-path=%{nginx_home_tmp}/proxy \ --http-client-body-temp-path=%{_localstatedir}/lib/nginx/tmp/client_body \
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \ --http-proxy-temp-path=%{_localstatedir}/lib/nginx/tmp/proxy \
--http-uwsgi-temp-path=%{nginx_home_tmp}/uwsgi \ --http-fastcgi-temp-path=%{_localstatedir}/lib/nginx/tmp/fastcgi \
--http-scgi-temp-path=%{nginx_home_tmp}/scgi \ --http-uwsgi-temp-path=%{_localstatedir}/lib/nginx/tmp/uwsgi \
--http-scgi-temp-path=%{_localstatedir}/lib/nginx/tmp/scgi \
--pid-path=/run/nginx.pid \ --pid-path=/run/nginx.pid \
--lock-path=/run/lock/subsys/nginx \ --lock-path=/run/lock/subsys/nginx \
--user=%{nginx_user} \ --user=%{nginx_user} \
--group=%{nginx_group} \ --group=%{nginx_user} \
%if 0%{?with_aio} %if 0%{?with_aio}
--with-file-aio \ --with-file-aio \
%endif %endif
--with-ipv6 \ --with-ipv6 \
--with-http_ssl_module \ --with-http_ssl_module \
--with-http_spdy_module \ --with-http_v2_module \
--with-http_realip_module \ --with-http_realip_module \
--with-http_addition_module \ --with-http_addition_module \
--with-http_xslt_module \ --with-http_xslt_module=dynamic \
--with-http_image_filter_module \ --with-http_image_filter_module=dynamic \
--with-http_geoip_module \ --with-http_geoip_module=dynamic \
--with-http_sub_module \ --with-http_sub_module \
--with-http_dav_module \ --with-http_dav_module \
--with-http_flv_module \ --with-http_flv_module \
@ -143,12 +206,15 @@ export DESTDIR=%{buildroot}
--with-http_random_index_module \ --with-http_random_index_module \
--with-http_secure_link_module \ --with-http_secure_link_module \
--with-http_degradation_module \ --with-http_degradation_module \
--with-http_slice_module \
--with-http_stub_status_module \ --with-http_stub_status_module \
--with-http_perl_module \ --with-http_perl_module=dynamic \
--with-mail \ --with-mail=dynamic \
--with-mail_ssl_module \ --with-mail_ssl_module \
--with-pcre \ --with-pcre \
--with-pcre-jit \ --with-pcre-jit \
--with-stream=dynamic \
--with-stream_ssl_module \
%if 0%{?with_gperftools} %if 0%{?with_gperftools}
--with-google_perftools_module \ --with-google_perftools_module \
%endif %endif
@ -166,27 +232,31 @@ find %{buildroot} -type f -name .packlist -exec rm -f '{}' \;
find %{buildroot} -type f -name perllocal.pod -exec rm -f '{}' \; 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 %{SOURCE10} \
%{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}%{nginx_confdir}/conf.d install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/conf.d
install -p -d -m 0755 %{buildroot}%{nginx_confdir}/default.d install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/default.d
install -p -d -m 0700 %{buildroot}%{nginx_home}
install -p -d -m 0700 %{buildroot}%{nginx_home_tmp} install -p -d -m 0700 %{buildroot}%{_localstatedir}/lib/nginx
install -p -d -m 0700 %{buildroot}%{nginx_logdir} install -p -d -m 0700 %{buildroot}%{_localstatedir}/lib/nginx/tmp
install -p -d -m 0755 %{buildroot}%{nginx_webroot} 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/modules
install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
install -p -m 0644 %{SOURCE12} \ install -p -m 0644 %{SOURCE12} \
%{buildroot}%{nginx_confdir} %{buildroot}%{_sysconfdir}/nginx
install -p -m 0644 %{SOURCE100} \ install -p -m 0644 %{SOURCE100} \
%{buildroot}%{nginx_webroot} %{buildroot}%{_datadir}/nginx/html
install -p -m 0644 %{SOURCE101} %{SOURCE102} \ install -p -m 0644 %{SOURCE101} %{SOURCE102} \
%{buildroot}%{nginx_webroot} %{buildroot}%{_datadir}/nginx/html
install -p -m 0644 %{SOURCE103} %{SOURCE104} \ install -p -m 0644 %{SOURCE103} %{SOURCE104} \
%{buildroot}%{nginx_webroot} %{buildroot}%{_datadir}/nginx/html
%if 0%{?with_mailcap_mimetypes} %if 0%{?with_mailcap_mimetypes}
rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types
@ -203,17 +273,59 @@ for i in ftdetect indent syntax; do
%{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim %{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim
done done
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_geoip_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-http-geoip.conf
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_image_filter_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-http-image-filter.conf
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_perl_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-http-perl.conf
echo 'load_module "%{_libdir}/nginx/modules/ngx_http_xslt_filter_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-http-xslt-filter.conf
echo 'load_module "%{_libdir}/nginx/modules/ngx_mail_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-mail.conf
echo 'load_module "%{_libdir}/nginx/modules/ngx_stream_module.so";' \
> %{buildroot}%{_datadir}/nginx/modules/mod-stream.conf
%pre filesystem %pre filesystem
getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group} getent group %{nginx_user} > /dev/null || groupadd -r %{nginx_user}
getent passwd %{nginx_user} > /dev/null || \ getent passwd %{nginx_user} > /dev/null || \
useradd -r -d %{nginx_home} -g %{nginx_group} \ useradd -r -d %{_localstatedir}/lib/nginx -g %{nginx_user} \
-s /sbin/nologin -c "Nginx web server" %{nginx_user} -s /sbin/nologin -c "Nginx web server" %{nginx_user}
exit 0 exit 0
%post %post
%systemd_post nginx.service %systemd_post nginx.service
%post mod-http-geoip
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%post mod-http-image-filter
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%post mod-http-perl
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%post mod-http-xslt-filter
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%post mod-mail
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%post mod-stream
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%preun %preun
%systemd_preun nginx.service %systemd_preun nginx.service
@ -225,8 +337,8 @@ fi
%files %files
%license LICENSE %license LICENSE
%doc CHANGES README %doc CHANGES README README.fedora
%{nginx_datadir}/html/* %{_datadir}/nginx/html/*
%{_bindir}/nginx-upgrade %{_bindir}/nginx-upgrade
%{_sbindir}/nginx %{_sbindir}/nginx
%{_datadir}/vim/vimfiles/ftdetect/nginx.vim %{_datadir}/vim/vimfiles/ftdetect/nginx.vim
@ -236,40 +348,72 @@ fi
%{_mandir}/man8/nginx.8* %{_mandir}/man8/nginx.8*
%{_mandir}/man8/nginx-upgrade.8* %{_mandir}/man8/nginx-upgrade.8*
%{_unitdir}/nginx.service %{_unitdir}/nginx.service
%config(noreplace) %{nginx_confdir}/fastcgi.conf %config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf
%config(noreplace) %{nginx_confdir}/fastcgi.conf.default %config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf.default
%config(noreplace) %{nginx_confdir}/fastcgi_params %config(noreplace) %{_sysconfdir}/nginx/fastcgi_params
%config(noreplace) %{nginx_confdir}/fastcgi_params.default %config(noreplace) %{_sysconfdir}/nginx/fastcgi_params.default
%config(noreplace) %{nginx_confdir}/koi-utf %config(noreplace) %{_sysconfdir}/nginx/koi-utf
%config(noreplace) %{nginx_confdir}/koi-win %config(noreplace) %{_sysconfdir}/nginx/koi-win
%if ! 0%{?with_mailcap_mimetypes} %if ! 0%{?with_mailcap_mimetypes}
%config(noreplace) %{nginx_confdir}/mime.types %config(noreplace) %{_sysconfdir}/nginx/mime.types
%endif %endif
%config(noreplace) %{nginx_confdir}/mime.types.default %config(noreplace) %{_sysconfdir}/nginx/mime.types.default
%config(noreplace) %{nginx_confdir}/nginx.conf %config(noreplace) %{_sysconfdir}/nginx/nginx.conf
%config(noreplace) %{nginx_confdir}/nginx.conf.default %config(noreplace) %{_sysconfdir}/nginx/nginx.conf.default
%config(noreplace) %{nginx_confdir}/scgi_params %config(noreplace) %{_sysconfdir}/nginx/scgi_params
%config(noreplace) %{nginx_confdir}/scgi_params.default %config(noreplace) %{_sysconfdir}/nginx/scgi_params.default
%config(noreplace) %{nginx_confdir}/uwsgi_params %config(noreplace) %{_sysconfdir}/nginx/uwsgi_params
%config(noreplace) %{nginx_confdir}/uwsgi_params.default %config(noreplace) %{_sysconfdir}/nginx/uwsgi_params.default
%config(noreplace) %{nginx_confdir}/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(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/lib/nginx/tmp
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/log/nginx
%dir %{_libdir}/nginx/modules
%files all-modules
%files filesystem
%dir %{_datadir}/nginx
%dir %{_datadir}/nginx/html
%dir %{_sysconfdir}/nginx
%dir %{_sysconfdir}/nginx/conf.d
%dir %{_sysconfdir}/nginx/default.d
%files mod-http-geoip
%{_datadir}/nginx/modules/mod-http-geoip.conf
%{_libdir}/nginx/modules/ngx_http_geoip_module.so
%files mod-http-image-filter
%{_datadir}/nginx/modules/mod-http-image-filter.conf
%{_libdir}/nginx/modules/ngx_http_image_filter_module.so
%files mod-http-perl
%{_datadir}/nginx/modules/mod-http-perl.conf
%{_libdir}/nginx/modules/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
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_home}
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
%files filesystem %files mod-http-xslt-filter
%dir %{nginx_datadir} %{_datadir}/nginx/modules/mod-http-xslt-filter.conf
%dir %{nginx_datadir}/html %{_libdir}/nginx/modules/ngx_http_xslt_filter_module.so
%dir %{nginx_confdir}
%dir %{nginx_confdir}/conf.d %files mod-mail
%dir %{nginx_confdir}/default.d %{_datadir}/nginx/modules/mod-mail.conf
%{_libdir}/nginx/modules/ngx_mail_module.so
%files mod-stream
%{_datadir}/nginx/modules/mod-stream.conf
%{_libdir}/nginx/modules/ngx_stream_module.so
%changelog %changelog
* Wed Apr 27 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.0-1
- update to upstream release 1.10.0
- split dynamic modules into subpackages
- spec file cleanup
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.1-2 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
2e91695074dbdfbf1bcec0ada9fda462 nginx-1.8.1.tar.gz c184c873d2798c5ba92be95ed1209c02 nginx-1.10.0.tar.gz
d42b5f2607ab8ab3b766f77e342c7f80 nginx-1.8.1.tar.gz.asc 5eafa8539af1c55bb82f80b5f180470d nginx-1.10.0.tar.gz.asc