Hello community, here is the log from the commit of package nginx for openSUSE:Leap:15.2 checked in at 2020-03-31 07:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/nginx (Old) and /work/SRC/openSUSE:Leap:15.2/.nginx.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nginx" Tue Mar 31 07:22:11 2020 rev:45 rq:788629 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/nginx/nginx.changes 2020-02-09 11:25:20.199296143 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.nginx.new.3160/nginx.changes 2020-03-31 07:22:16.122395391 +0200 @@ -1,0 +2,14 @@ +Tue Mar 24 15:08:07 UTC 2020 - Vítězslav Čížek <[email protected]> + +- Update to stable branch 1.16.1 (jsc#ECO-1401) + * add TLS 1.3 support for SLE-15-SP2 (jsc#SLE-9295, bsc#1150711) +- Replace obsolete GeoIP module with MaxMinDB-based GeoIP2 + (jsc#SLE-11184, bsc#1156202) +- Start nginx after network is online (boo#1155690) +- Drop upstream patches: + * CVE-2019-9511.patch + * CVE-2019-9513.patch + * CVE-2019-9516.patch + * CVE-2019-20372.patch + +-------------------------------------------------------------------- @@ -4 +18 @@ -- CVE-2019-20372: Fixed an HTTP request smuggling with certain error_page +-- CVE-2019-20372: Fixed an HTTP request smuggling with certain error_page @@ -6 +20 @@ - (bsc#1160682). +- (bsc#1160682). @@ -8,2 +22,2 @@ - -------------------------------------------------------------------- +- +-------------------------------------------------------------------- Old: ---- CVE-2019-20372.patch CVE-2019-9511.patch CVE-2019-9513.patch CVE-2019-9516.patch nginx-1.14.2.tar.gz nginx-1.14.2.tar.gz.asc New: ---- nginx-1.16.1.tar.gz nginx-1.16.1.tar.gz.asc ngx_http_geoip2_module-3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx.spec ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.378396371 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.382396373 +0200 @@ -1,7 +1,7 @@ # # spec file for package nginx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,51 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%{!?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 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} %bcond_with cpp_test %bcond_with google_perftools - %if 0%{?is_opensuse} %bcond_without extra_modules %else %bcond_with extra_modules %endif - %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %bcond_without libatomic %else %bcond_with libatomic %endif - %if 0%{?suse_version} > 1220 %bcond_without http2 %bcond_without pcre_jit @@ -40,25 +66,6 @@ %bcond_with pcre_jit %bcond_with systemd %endif - -%{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/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 # %if %{with systemd} %define ngx_pid_path /run/nginx.pid @@ -67,30 +74,15 @@ %define ngx_pid_path %{_localstatedir}/run/nginx.pid %define ngx_lock_path %{_localstatedir}/run/nginx.lock %endif -%define ngx_doc_dir %{_datadir}/doc/packages/%{name} # Name: nginx -Version: 1.14.2 +Version: 1.16.1 Release: 0 -%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 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 src_install_dir /usr/src/%{name} - Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause Group: Productivity/Networking/Web/Proxy -Url: https://nginx.org/ -Source: https://nginx.org/download/nginx-%{version}.tar.gz +URL: https://nginx.org/ +Source: http://nginx.org/download/nginx-%{version}.tar.gz Source1: nginx.init Source2: nginx.logrotate Source3: nginx.service @@ -98,6 +90,7 @@ 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 Source100: nginx.rpmlintrc Source101: http://nginx.org/download/nginx-%{version}.tar.gz.asc Source102: https://nginx.org/keys/mdounin.key#/%{name}.keyring @@ -113,32 +106,24 @@ Patch4: nginx-aio.patch # PATCH-FIX-UPSTREAM check_1.9.2+.patch Patch5: check_1.9.2+.patch -# PATCH-FIX-UPSTREAM CVE-2019-9511.patch -Patch6: CVE-2019-9511.patch -# PATCH-FIX-UPSTREAM CVE-2019-9513.patch -Patch7: CVE-2019-9513.patch -# PATCH-FIX-UPSTREAM CVE-2019-9516.patch -Patch8: CVE-2019-9516.patch -# PATCH-FIX-UPSTREAM CVE-2019-20372.patch -Patch9: CVE-2019-20372.patch BuildRequires: gcc-c++ BuildRequires: gd-devel +# BuildRequires: libxslt-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: vim BuildRequires: zlib-devel +BuildRequires: pkgconfig(libmaxminddb) %requires_eq perl -Requires(pre): pwdutils +Requires(pre): shadow Recommends: logrotate Recommends: vim-plugin-nginx -Conflicts: otherproviders(nginx) +Conflicts: nginx Provides: http_daemon Provides: httpd # -BuildRequires: libGeoIP-devel -# %if %{with google_perftools} BuildRequires: google-perftools-devel %endif @@ -149,7 +134,7 @@ # %if %{with systemd} BuildRequires: pkgconfig(systemd) -%{?systemd_requires} +%{?systemd_ordering} %else Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq @@ -161,11 +146,12 @@ %package -n vim-plugin-nginx Summary: VIM support for nginx config files -Group: Productivity/Editors/Vi +Group: Productivity/Text/Editors +%requires_eq vim %if 0%{?suse_version} > 1110 BuildArch: noarch %endif -%requires_eq vim + %description -n vim-plugin-nginx nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. It has been running on many heavily loaded Russian sites for more than two years. @@ -181,7 +167,7 @@ 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 +%setup -q -n %{pkg_name}-%{version} -a 4 -a 5 -a 6 -a 7 -a 8 %patch0 -p1 %patch1 -p1 %patch2 @@ -190,10 +176,6 @@ %if %{with extra_modules} %patch5 %endif -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl # we just use lib here because nginx loads them relative to _prefix @@ -232,7 +214,6 @@ --with-http_addition_module \ --with-http_xslt_module=dynamic \ --with-http_image_filter_module=dynamic \ - --with-http_geoip_module=dynamic \ --with-http_sub_module \ --with-http_dav_module \ --with-http_flv_module \ @@ -252,7 +233,6 @@ --with-stream=dynamic \ --with-stream_ssl_module \ --with-stream_realip_module \ - --with-stream_geoip_module=dynamic \ --with-stream_ssl_preread_module \ --with-pcre \ %if %{with pcre_jit} @@ -274,13 +254,14 @@ --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 -std=gnu99 -fstack-protector" \ --with-ld-opt="-Wl,-z,relro,-z,now -pie" %else --with-cc-opt="%{optflags}" %endif -make %{?_smp_mflags} +%make_build %install %make_install @@ -394,13 +375,13 @@ %{ngx_sbin_path} %dir %{_libdir}/nginx/ %dir %{ngx_module_dir}/ -%{ngx_module_dir}/ngx_http_geoip_module.so +%{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_geoip_module.so +%{ngx_module_dir}/ngx_stream_geoip2_module.so # external modules %if %{with extra_modules} %{ngx_module_dir}/ngx_http_fancyindex_module.so ++++++ check_1.9.2+.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.402396381 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.402396381 +0200 @@ -1,7 +1,7 @@ Index: src/http/modules/ngx_http_upstream_hash_module.c =================================================================== ---- src/http/modules/ngx_http_upstream_hash_module.c.orig -+++ src/http/modules/ngx_http_upstream_hash_module.c +--- src/http/modules/ngx_http_upstream_hash_module.c.orig 2019-08-13 14:51:43.000000000 +0200 ++++ src/http/modules/ngx_http_upstream_hash_module.c 2020-03-24 17:52:09.156529631 +0100 @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> @@ -12,7 +12,7 @@ typedef struct { uint32_t hash; -@@ -235,6 +238,15 @@ ngx_http_upstream_get_hash_peer(ngx_peer +@@ -238,6 +241,15 @@ ngx_http_upstream_get_hash_peer(ngx_peer goto next; } @@ -28,7 +28,7 @@ if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) -@@ -538,6 +550,15 @@ ngx_http_upstream_get_chash_peer(ngx_pee +@@ -560,6 +572,15 @@ ngx_http_upstream_get_chash_peer(ngx_pee continue; } @@ -46,8 +46,8 @@ != 0) Index: src/http/modules/ngx_http_upstream_ip_hash_module.c =================================================================== ---- src/http/modules/ngx_http_upstream_ip_hash_module.c.orig -+++ src/http/modules/ngx_http_upstream_ip_hash_module.c +--- src/http/modules/ngx_http_upstream_ip_hash_module.c.orig 2019-08-13 14:51:43.000000000 +0200 ++++ src/http/modules/ngx_http_upstream_ip_hash_module.c 2020-03-24 17:52:09.156529631 +0100 @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> @@ -58,7 +58,7 @@ typedef struct { /* the round robin data must be first */ -@@ -205,6 +208,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p +@@ -208,6 +211,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p goto next; } @@ -76,8 +76,8 @@ && now - peer->checked <= peer->fail_timeout) Index: src/http/modules/ngx_http_upstream_least_conn_module.c =================================================================== ---- src/http/modules/ngx_http_upstream_least_conn_module.c.orig -+++ src/http/modules/ngx_http_upstream_least_conn_module.c +--- src/http/modules/ngx_http_upstream_least_conn_module.c.orig 2019-08-13 14:51:43.000000000 +0200 ++++ src/http/modules/ngx_http_upstream_least_conn_module.c 2020-03-24 17:52:09.156529631 +0100 @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> @@ -124,8 +124,8 @@ } Index: src/http/ngx_http_upstream_round_robin.c =================================================================== ---- src/http/ngx_http_upstream_round_robin.c.orig -+++ src/http/ngx_http_upstream_round_robin.c +--- src/http/ngx_http_upstream_round_robin.c.orig 2019-08-13 14:51:43.000000000 +0200 ++++ src/http/ngx_http_upstream_round_robin.c 2020-03-24 17:52:09.156529631 +0100 @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_http.h> @@ -227,8 +227,8 @@ && now - peer->checked <= peer->fail_timeout) Index: src/http/ngx_http_upstream_round_robin.h =================================================================== ---- src/http/ngx_http_upstream_round_robin.h.orig -+++ src/http/ngx_http_upstream_round_robin.h +--- src/http/ngx_http_upstream_round_robin.h.orig 2019-08-13 14:51:43.000000000 +0200 ++++ src/http/ngx_http_upstream_round_robin.h 2020-03-24 17:52:09.156529631 +0100 @@ -38,6 +38,10 @@ struct ngx_http_upstream_rr_peer_s { ngx_msec_t slow_start; ngx_msec_t start_time; ++++++ nginx-1.11.2-html.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.414396386 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.414396386 +0200 @@ -1,7 +1,7 @@ -Index: nginx-1.11.2/auto/install +Index: nginx-1.16.1/auto/install =================================================================== ---- nginx-1.11.2.orig/auto/install -+++ nginx-1.11.2/auto/install +--- nginx-1.16.1.orig/auto/install 2019-08-13 14:51:43.000000000 +0200 ++++ nginx-1.16.1/auto/install 2020-03-24 17:51:56.640467984 +0100 @@ -154,8 +154,7 @@ install: build $NGX_INSTALL_PERL_MODULES test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\ || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' ++++++ nginx-1.11.2-no_Werror.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.422396390 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.422396390 +0200 @@ -1,7 +1,7 @@ -Index: nginx-1.11.2/auto/cc/gcc +Index: nginx-1.16.1/auto/cc/gcc =================================================================== ---- nginx-1.11.2.orig/auto/cc/gcc -+++ nginx-1.11.2/auto/cc/gcc +--- nginx-1.16.1.orig/auto/cc/gcc 2019-08-13 14:51:43.000000000 +0200 ++++ nginx-1.16.1/auto/cc/gcc 2020-03-24 17:51:53.748453742 +0100 @@ -166,7 +166,7 @@ esac @@ -11,10 +11,10 @@ # debug CFLAGS="$CFLAGS -g" -Index: nginx-1.11.2/auto/cc/icc +Index: nginx-1.16.1/auto/cc/icc =================================================================== ---- nginx-1.11.2.orig/auto/cc/icc -+++ nginx-1.11.2/auto/cc/icc +--- nginx-1.16.1.orig/auto/cc/icc 2019-08-13 14:51:43.000000000 +0200 ++++ nginx-1.16.1/auto/cc/icc 2020-03-24 17:51:53.748453742 +0100 @@ -111,7 +111,7 @@ case "$NGX_ICC_VER" in esac ++++++ nginx-1.14.2.tar.gz -> nginx-1.16.1.tar.gz ++++++ ++++ 12814 lines of diff (skipped) ++++++ nginx-1.2.4-perl_vendor_install.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.682396503 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.682396503 +0200 @@ -1,8 +1,8 @@ Index: auto/install =================================================================== ---- auto/install.orig -+++ auto/install -@@ -8,7 +8,7 @@ if [ $USE_PERL = YES ]; then +--- auto/install.orig 2020-03-24 17:51:56.640467984 +0100 ++++ auto/install 2020-03-24 17:51:59.460481873 +0100 +@@ -8,7 +8,7 @@ if [ $USE_PERL != NO ]; then cat << END >> $NGX_MAKEFILE install_perl_modules: ++++++ nginx-1.6.1-default_config.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.694396508 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.694396508 +0200 @@ -1,5 +1,7 @@ ---- conf/nginx.conf.orig 2018-03-28 11:56:48.834012377 +0200 -+++ conf/nginx.conf 2018-03-28 13:16:09.978372767 +0200 +Index: conf/nginx.conf +=================================================================== +--- conf/nginx.conf.orig 2019-08-13 14:51:43.000000000 +0200 ++++ conf/nginx.conf 2020-03-24 17:52:02.116494955 +0100 @@ -1,16 +1,28 @@ -#user nobody; @@ -34,7 +36,7 @@ } -@@ -22,7 +34,7 @@ +@@ -22,7 +34,7 @@ http { # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; @@ -43,7 +45,7 @@ sendfile on; #tcp_nopush on; -@@ -32,16 +44,18 @@ +@@ -32,16 +44,18 @@ http { #gzip on; @@ -64,7 +66,7 @@ index index.html index.htm; } -@@ -51,7 +65,7 @@ +@@ -51,7 +65,7 @@ http { # error_page 500 502 503 504 /50x.html; location = /50x.html { @@ -73,7 +75,7 @@ } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -@@ -63,7 +77,7 @@ +@@ -63,7 +77,7 @@ http { # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # #location ~ \.php$ { @@ -82,7 +84,7 @@ # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; -@@ -87,7 +101,7 @@ +@@ -87,7 +101,7 @@ http { # server_name somename alias another.alias; # location / { @@ -91,7 +93,7 @@ # index index.html index.htm; # } #} -@@ -101,6 +115,10 @@ +@@ -101,6 +115,10 @@ http { # ssl_certificate cert.pem; # ssl_certificate_key cert.key; @@ -102,7 +104,7 @@ # ssl_session_cache shared:SSL:1m; # ssl_session_timeout 5m; -@@ -109,9 +127,11 @@ +@@ -109,9 +127,11 @@ http { # ssl_prefer_server_ciphers on; # location / { ++++++ nginx-aio.patch ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.706396513 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.706396513 +0200 @@ -1,8 +1,8 @@ -Index: nginx-1.11.3/auto/unix +Index: nginx-1.16.1/auto/unix =================================================================== ---- nginx-1.11.3.orig/auto/unix -+++ nginx-1.11.3/auto/unix -@@ -531,7 +531,12 @@ if [ $NGX_FILE_AIO = YES ]; then +--- nginx-1.16.1.orig/auto/unix 2019-08-13 14:51:43.000000000 +0200 ++++ nginx-1.16.1/auto/unix 2020-03-24 17:52:04.832508331 +0100 +@@ -559,7 +559,12 @@ if [ $NGX_FILE_AIO = YES ]; then ngx_feature="Linux AIO support (SYS_eventfd)" ngx_feature_incs="#include <linux/aio_abi.h> #include <sys/syscall.h>" @@ -16,10 +16,10 @@ iocb.aio_lio_opcode = IOCB_CMD_PREAD; iocb.aio_flags = IOCB_FLAG_RESFD; iocb.aio_resfd = -1; -Index: nginx-1.11.3/src/event/modules/ngx_epoll_module.c +Index: nginx-1.16.1/src/event/modules/ngx_epoll_module.c =================================================================== ---- nginx-1.11.3.orig/src/event/modules/ngx_epoll_module.c -+++ nginx-1.11.3/src/event/modules/ngx_epoll_module.c +--- nginx-1.16.1.orig/src/event/modules/ngx_epoll_module.c 2019-08-13 14:51:43.000000000 +0200 ++++ nginx-1.16.1/src/event/modules/ngx_epoll_module.c 2020-03-24 17:52:04.840508370 +0100 @@ -77,9 +77,7 @@ int epoll_wait(int epfd, struct epoll_ev #if (NGX_HAVE_FILE_AIO) ++++++ nginx.service ++++++ --- /var/tmp/diff_new_pack.eGGt59/_old 2020-03-31 07:22:18.778396544 +0200 +++ /var/tmp/diff_new_pack.eGGt59/_new 2020-03-31 07:22:18.778396544 +0200 @@ -1,6 +1,7 @@ [Unit] Description=The nginx HTTP and reverse proxy server -After=network.target remote-fs.target nss-lookup.target +After=network-online.target remote-fs.target nss-lookup.target +Wants=network-online.target [Service] PIDFile=/run/nginx.pid
