pool/nginx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 850600 from server:http

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/850600
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nginx?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2020-11-25 18:28:29 +00:00 committed by Git OBS Bridge
commit 3d7f4b02ac
10 changed files with 92 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers-more-nginx-module-0.33.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3dcbab117a9c103bc1ea5200fc00a7b7d2af97ff7fd525f16f8ac2632e30fbf
size 28130

3
nginx-1.19.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61df546927905a0d624f9396bb7a8bc7ca7fd26522ce9714d56a78b73284000e
size 1054974

10
nginx-1.19.4.tar.gz.asc
View File

@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABCAAGBQJfmDhvAAoJEFIKmZOhwFL44k0H/AvIpc8b9WTE00sJP9aWK44x
wsamkMUC3B3woy8aRA45zlJ+MaynZAU5lXxT+EAnyKB0bfLURSwnayAuIqjhRJEG
r2iMwbLXMv4pjTpBAtrF92x46I1Ax5DUQWWKXOheKV7kDiSJnI0+O9NYe8CEMckv
qBh52Oh6kchlHSizekcSa5oKgVxBPKXppOxeVXuPkePe/IfO7wpawDsfrIkZApAM
SOLsMpnVEfdGyrNZ782KUE+iu0fTfz5FuF/COGvp3jgKNyMfosUcXlhvJido1DA6
QnIxH0a14OWMplhAHi8bGEHpxKWL0a3dMtZYKbR5aE4yEF5INX1IiQO0GYOfQNk=
=Kk5F
-----END PGP SIGNATURE-----

3
nginx-1.19.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c0a46afd6c452d4443f6ec0767f4d5c3e7c499e55a60cd6542b35a61eda799c
size 1055590

10
nginx-1.19.5.tar.gz.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABCAAGBQJfvSHZAAoJEFIKmZOhwFL4vOIH+gPDE887ImLKTSJQI5CTeYC2
28zXBaNDVcjjp9QdHwSmOP4IHeaHqIXzpgvU7fl4dnmNFzwd/LCOsr4Mxb5H3ifs
hP+Z2sQbx1zoLsW8PLLr3krn4JEJXCOJotYGNqoG9h7gLxlb7vaHnzuurvyMTILb
mDATh0K8Pz0wNsUzcc4S7enAj1BDCKg3YUi2H5A9UoOhPQ7/I8r3jOABQFbsxCtj
xiqY3/UVSa2RQmX4uIV1DiLcVaN0o3BSJ92HnmJZcoBQpiyfOgJl1HfxqjTenRZP
+uh9AN+4N/k93JUSiOuMlqv+x5nPCqlNF1K8BHBxRitPN7i9TcCUQrpxO/FLAWE=
=H1ah
-----END PGP SIGNATURE-----

3
nginx-rtmp-module-1.2.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37
size 519919

34
nginx.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Nov 24 19:30:01 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- Update to 1.19.5
* https://nginx.org/en/CHANGES
* Add the -e switch.
* The same source files can now be specified in different modules
while building addon modules.
* Fix SSL shutdown did not work when lingering close was used.
* Fix "upstream sent frame for closed stream" errors might occur
when working with gRPC backends.
* Fix in request body filters internal API.
-------------------------------------------------------------------
Mon Nov 9 11:07:07 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- Refresh spec-file via spec-cleaner and manual optimizations.
-------------------------------------------------------------------
Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
@ -8,6 +26,22 @@ Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
* Add the "ssl_reject_handshake" directive.
* Add the "proxy_smtp_auth" directive in mail proxy.
-------------------------------------------------------------------
Fri Oct 2 04:14:33 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- Use the ngx_* macros from the nginx-macros package to simplify
the spec file.
-------------------------------------------------------------------
Fri Oct 2 01:58:09 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- Moved all the modules that support dynamic modules into their own
modules:
* nginx-module-geoip2
* nginx-module-fancyindex
* nginx-module-headers-more
- The rtmp module is replaced with nginx-module-http-flv
-------------------------------------------------------------------
Wed Sep 30 11:28:16 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>

185
nginx.spec
View File

@ -17,55 +17,33 @@
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim/%(readlink %{_datadir}/vim/current)}
%define pkg_name nginx
%define ngx_prefix %{_prefix}
%define ngx_sbin_path %{_sbindir}/nginx
%define ngx_module_dir %{_libdir}/nginx/modules
%define ngx_conf_dir %{_sysconfdir}/nginx
%define ngx_conf_path %{ngx_conf_dir}/nginx.conf
%define ngx_log_dir %{_localstatedir}/log/nginx
%define ngx_error_log %{ngx_log_dir}/error.log
%define ngx_access_log %{ngx_log_dir}/access.log
%define ngx_home %{_localstatedir}/lib/nginx
%define ngx_tmp_http %{ngx_home}/tmp/
%define ngx_tmp_proxy %{ngx_home}/proxy/
%define ngx_tmp_fcgi %{ngx_home}/fastcgi/
%define ngx_tmp_scgi %{ngx_home}/scgi/
%define ngx_tmp_uwsgi %{ngx_home}/uwsgi/
%define ngx_user_group nginx
%define ngx_doc_dir %{_docdir}/%{name}
%define ngx_fancyindex_version 0.4.2
%define ngx_fancyindex_module_path ngx-fancyindex-%{ngx_fancyindex_version}
%define headers_more_nginx_version 0.33
%define headers_more_nginx_module_path headers-more-nginx-module-%{headers_more_nginx_version}
%define pkg_name nginx
%define nginx_upstream_check_version 0.3.0
%define nginx_upstream_check_module_path nginx_upstream_check_module-%{nginx_upstream_check_version}
%define nginx_rtmp_version 1.2.1
%define nginx_rtmp_module_path nginx-rtmp-module-%{nginx_rtmp_version}
%define nginx_geoip2_version 3.3
%define nginx_geoip2_module_path ngx_http_geoip2_module-%{nginx_geoip2_version}
%define src_install_dir %{_prefix}/src/%{name}
%if 0%{?is_opensuse}
%bcond_without extra_modules
%else
%bcond_with extra_modules
%endif
#
# keep in sync with ngx_conditionals in nginx-macros
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%bcond_without libatomic
%bcond_without ngx_libatomic
%else
%bcond_with libatomic
%bcond_with ngx_libatomic
%endif
%if 0%{?suse_version} > 1220
%bcond_without http2
%bcond_without pcre_jit
%bcond_without ngx_http2
%bcond_without ngx_pcre_jit
%bcond_without systemd
%else
%bcond_with http2
%bcond_with pcre_jit
%bcond_with ngx_http2
%bcond_with ngx_pcre_jit
%bcond_with systemd
%endif
%bcond_with cpp_test
%bcond_with google_perftools
%bcond_with ngx_cpp_test
%bcond_with ngx_google_perftools
#
%if %{with systemd}
%define ngx_pid_path /run/nginx.pid
@ -76,7 +54,7 @@
%endif
#
Name: nginx
Version: 1.19.4
Version: 1.19.5
Release: 0
Summary: A HTTP server and IMAP/POP3 proxy server
License: BSD-2-Clause
@ -86,11 +64,7 @@ Source0: https://nginx.org/download/%{name}-%{version}.tar.gz
Source1: nginx.init
Source2: nginx.logrotate
Source3: nginx.service
Source4: https://github.com/aperezdc/ngx-fancyindex/archive/v%{ngx_fancyindex_version}/%{ngx_fancyindex_module_path}.tar.gz
Source5: https://github.com/openresty/headers-more-nginx-module/archive/v%{headers_more_nginx_version}/%{headers_more_nginx_module_path}.tar.gz
Source6: https://github.com/yaoweibin/nginx_upstream_check_module/archive/v%{nginx_upstream_check_version}/%{nginx_upstream_check_module_path}.tar.gz
Source7: https://github.com/arut/nginx-rtmp-module/archive/v%{nginx_rtmp_version}/%{nginx_rtmp_module_path}.tar.gz
Source8: https://github.com/leev/ngx_http_geoip2_module/archive/%{nginx_geoip2_version}.tar.gz#/%{nginx_geoip2_module_path}.tar.gz
Source4: https://github.com/yaoweibin/nginx_upstream_check_module/archive/v%{nginx_upstream_check_version}/%{nginx_upstream_check_module_path}.tar.gz
Source9: nginx.sysusers
Source100: nginx.rpmlintrc
Source101: https://nginx.org/download/%{name}-%{version}.tar.gz.asc
@ -107,27 +81,32 @@ Patch3: nginx-1.6.1-default_config.patch
Patch4: nginx-aio.patch
# PATCH-FIX-UPSTREAM check_1.9.2+.patch
Patch5: check_1.9.2+.patch
# keep Buildrequires for the libraries and everything in sync with the requires in the nginx-source package
BuildRequires: gcc-c++
BuildRequires: gd-devel
#
BuildRequires: libxslt-devel
BuildRequires: nginx-macros
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: vim
BuildRequires: zlib-devel
BuildRequires: pkgconfig(libmaxminddb)
%requires_eq perl
#
Recommends: logrotate
Recommends: nginx-module-fancyindex
Recommends: nginx-module-geoip2
Recommends: nginx-module-headers-more
Recommends: nginx-module-http-flv
Recommends: vim-plugin-nginx
Provides: http_daemon
Provides: httpd
#
%if %{with google_perftools}
%if %{with ngx_google_perftools}
BuildRequires: google-perftools-devel
%endif
#
%if %{with libatomic}
%if %{with ngx_libatomic}
BuildRequires: libatomic-ops-devel
%endif
#
@ -164,19 +143,32 @@ This package holds the VIM support for nginx config files.
%package -n nginx-source
Summary: The nginx source
Group: Development/Sources
Requires: gcc-c++
Requires: gd-devel
Requires: libxslt-devel
Requires: nginx = %{version}
Requires: openssl-devel
Requires: pcre-devel
Requires: pkgconfig
Requires: vim
Requires: zlib-devel
%requires_ge nginx-macros
BuildArch: noarch
%if %{with ngx_libatomic}
Requires: libatomic-ops-devel
%endif
%description -n nginx-source
The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server.
%prep
%setup -q -n %{pkg_name}-%{version} -a 4 -a 5 -a 6 -a 7 -a 8
%setup -q -n %{pkg_name}-%{version} -a 4
%patch0 -p1
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%if %{with extra_modules}
%if %{with ngx_extra_modules}
%patch5
%endif
@ -192,81 +184,11 @@ sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config
%build
# FIXME: you should use the %%configure macro
./configure \
--prefix=%{ngx_prefix}/ \
--sbin-path=%{ngx_sbin_path} \
--modules-path=%{ngx_module_dir} \
--conf-path=%{ngx_conf_path} \
--error-log-path=%{ngx_error_log} \
--http-log-path=%{ngx_access_log} \
--pid-path=%{ngx_pid_path} \
--lock-path=%{ngx_lock_path} \
--http-client-body-temp-path=%{ngx_tmp_http} \
--http-proxy-temp-path=%{ngx_tmp_proxy} \
--http-fastcgi-temp-path=%{ngx_tmp_fcgi} \
--http-uwsgi-temp-path=%{ngx_tmp_uwsgi} \
--http-scgi-temp-path=%{ngx_tmp_scgi} \
--user=nginx --group=nginx \
--without-select_module \
--without-poll_module \
--with-threads \
--with-file-aio \
--with-ipv6 \
--with-http_ssl_module \
%if %{with http2}
--with-http_v2_module \
%endif
--with-http_realip_module \
--with-http_addition_module \
--with-http_xslt_module=dynamic \
--with-http_image_filter_module=dynamic \
--with-http_sub_module \
--with-http_dav_module \
--with-http_flv_module \
--with-http_mp4_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_auth_request_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_degradation_module \
--with-http_slice_module \
--with-http_stub_status_module \
--with-http_perl_module=dynamic \
--with-perl=%{_bindir}/perl \
--with-mail=dynamic \
--with-mail_ssl_module \
--with-stream=dynamic \
--with-stream_ssl_module \
--with-stream_realip_module \
--with-stream_ssl_preread_module \
--with-pcre \
%if %{with pcre_jit}
--with-pcre-jit \
%endif
%if %{with libatomic}
--with-libatomic \
%endif
%if %{with google_perftools}
--with-google_perftools_module \
%endif
%if %{with cpp_test}
--with-cpp_test_module \
%endif
--with-compat \
%if %{with extra_modules}
%{ngx_configure} \
%if %{with ngx_extra_modules}
--add-module=%{nginx_upstream_check_module_path} \
--add-dynamic-module=%{ngx_fancyindex_module_path} \
--add-dynamic-module=%{headers_more_nginx_module_path} \
--add-dynamic-module=%{nginx_rtmp_module_path} \
%endif
--add-dynamic-module=%{nginx_geoip2_module_path} \
%if 0%{?suse_version} > 1220
--with-cc-opt="%{optflags} -fPIC -D_GNU_SOURCE" \
--with-ld-opt="-Wl,-z,relro,-z,now -pie"
%else
--with-cc-opt="%{optflags}"
%endif
%make_build
%if %{with systemd}
%sysusers_generate_pre %{SOURCE9} nginx
@ -276,16 +198,16 @@ sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config
%make_install
%perl_process_packlist
install -d -m 0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi}
install -dpm0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi}
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{pkg_name}
install -Dpm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{pkg_name}
%if %{with systemd}
install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service
install -Dpm0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service
ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnginx
install -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/nginx.conf
install -Dpm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/nginx.conf
%else
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
install -Dpm0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
ln -s -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
%endif
@ -319,18 +241,9 @@ copydocs() {
popd
}
copydocs %{ngx_fancyindex_module_path} \
template* LICENSE *.rst
copydocs %{headers_more_nginx_module_path} \
README.markdown
copydocs %{nginx_upstream_check_module_path} \
doc/*
copydocs %{nginx_rtmp_module_path} \
AUTHORS LICENSE README.md stat.xsl
%post
%if %{with systemd}
%service_add_post nginx.service
@ -386,19 +299,11 @@ copydocs %{nginx_rtmp_module_path} \
%{ngx_sbin_path}
%dir %{_libdir}/nginx/
%dir %{ngx_module_dir}/
%{ngx_module_dir}/ngx_http_geoip2_module.so
%{ngx_module_dir}/ngx_http_image_filter_module.so
%{ngx_module_dir}/ngx_http_perl_module.so
%{ngx_module_dir}/ngx_http_xslt_filter_module.so
%{ngx_module_dir}/ngx_mail_module.so
%{ngx_module_dir}/ngx_stream_module.so
%{ngx_module_dir}/ngx_stream_geoip2_module.so
# external modules
%if %{with extra_modules}
%{ngx_module_dir}/ngx_http_fancyindex_module.so
%{ngx_module_dir}/ngx_http_headers_more_filter_module.so
%{ngx_module_dir}/ngx_rtmp_module.so
%endif
%{_mandir}/man3/nginx.3pm*
/srv/www/htdocs/50x.html
%if 0%{?suse_version} && 0%{?suse_version} < 1140

3
ngx-fancyindex-0.4.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8327150864ca267b735d550d3304030efbbd863fdddfe0a94e970f249a8827ee
size 22047

3
ngx_http_geoip2_module-3.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7
size 8509