Accepting request 759769 from home:13ilya

- Refresh spec-file via spec-cleaner.
- Add in service-file Wants=network-online.target (boo#1155690)
- Update to 1.17.7
  * https://nginx.org/en/CHANGES
  * A segmentation fault might occur on start or during
    reconfiguration if the "rewrite" directive with an empty
    replacement string was used in the configuration.
  * A segmentation fault might occur in a worker process if the
    "break" directive was used with the "alias" directive or with
    the "proxy_pass" directive with a URI.
  * The "Location" response header line might contain garbage if
    the request URI was rewritten to the one containing a null character.
  * Requests with bodies were handled incorrectly when returning redirections
    with the "error_page" directive; the bug had appeared in 0.7.12.
  * Socket leak when using HTTP/2.
  * A timeout might occur while handling pipelined requests in an
    SSL connection; the bug had appeared in 1.17.5.
  * Bugfix in the ngx_http_dav_module.

OBS-URL: https://build.opensuse.org/request/show/759769
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=152

nginx-1.17.6.tar.gz

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

nginx-1.17.6.tar.gz.asc

@@ -1,10 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEcBAABAgAGBQJd0/pCAAoJEFIKmZOhwFL4C3kH/3kVWwF+X3rY4EO1H/whX5Uc
-qVS3wpc+AMQISqzlmdNjTmpHFjHtjLjlOyofQfWw0O7fKHErfQy7cEWIhQtlRW4X
-HL1F0FAJIz5dZoHojKwXpJFsIvMfQvoIUTDulMFPhS41mwf0x1h5+UuOKY4/NzZ1
-EpNwDfrKGOuz36+zbLP+HaYIGqWUKnWxSl2mJs57MHe0+20eBQAxOu0TUwN1RD+0
-EbTQ57mec2eDvP6KWVCKenmYosqLqDGTwgUs+Ur9uap07yIfttcJF/R6kWZnoNrY
-Tm0pamtDJbiD+mvGfvdSWPNCsJzPRmA0jqUPDB4VXUtMntIg4e31V6wrzXo6K0Q=
-=Utml
------END PGP SIGNATURE-----

nginx-1.17.7.tar.gz

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

nginx-1.17.7.tar.gz.asc

@@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABAgAGBQJeAihJAAoJEFIKmZOhwFL4DbYH/jeIIEbGJ4TGwu5DTYxrmcA8
+V22Q4MwXnRKKFJtL4/+yYnxTyzWukAlLVOpYerLNvft3370ZSNxRizhjv8Ufgy5Z
+vnTlcX/OV5qfNvYXRJHMi7mWkNDQSBnjC4OYoaAIW/Dw72MQoGHLaMkCQRa3PRSB
+a5Vs8zKF2aRdK8cYpP3qBjXqlrtWtZIL0bn2Z4mQcsfd5krqPjawERQJpLJH5hv5
+Wzsk30evZGYyJuIL0w0pnLm0JxWYdDhbL6Yli3GSTjzmqBX+w/Zl5ve0nroP7v06
+5iqMPitIie5QzJC3wQatwNU7gDQv9IC4fQdzZ0M2aOxd9dbDlwD3MgVhMNk0mK0=
+=niF+
+-----END PGP SIGNATURE-----

nginx.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sat Dec 28 11:03:16 UTC 2019 - Илья Индиго <ilya@ilya.pp.ua>
+
+- Refresh spec-file via spec-cleaner.
+- Add in service-file Wants=network-online.target (boo#1155690)
+- Update to 1.17.7
+  * https://nginx.org/en/CHANGES
+  * A segmentation fault might occur on start or during
+    reconfiguration if the "rewrite" directive with an empty
+    replacement string was used in the configuration.
+  * A segmentation fault might occur in a worker process if the
+    "break" directive was used with the "alias" directive or with
+    the "proxy_pass" directive with a URI.
+  * The "Location" response header line might contain garbage if
+    the request URI was rewritten to the one containing a null character.
+  * Requests with bodies were handled incorrectly when returning redirections
+    with the "error_page" directive; the bug had appeared in 0.7.12.
+  * Socket leak when using HTTP/2.
+  * A timeout might occur while handling pipelined requests in an
+    SSL connection; the bug had appeared in 1.17.5.
+  * Bugfix in the ngx_http_dav_module.
+
 -------------------------------------------------------------------
 Sat Nov 23 20:12:57 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
 

nginx.service

@@ -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

nginx.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nginx
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,33 +16,7 @@
 #
 
 
-%bcond_with    cpp_test
+%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim/%(readlink %{_datadir}/vim/current)}
-%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
-%bcond_without systemd
-%else
-%bcond_with    http2
-%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
@@ -59,6 +33,37 @@
 %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 src_install_dir %{_prefix}/src/%{name}
+%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
+%bcond_without systemd
+%else
+%bcond_with    http2
+%bcond_with    pcre_jit
+%bcond_with    systemd
+%endif
+%bcond_with    cpp_test
+%bcond_with    google_perftools
 #
 %if %{with systemd}
 %define ngx_pid_path   /run/nginx.pid
@@ -67,25 +72,10 @@
 %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.17.6
+Version:        1.17.7
 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
@@ -99,7 +89,7 @@ Source5:        https://github.com/openresty/headers-more-nginx-module/archive/v
 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
 Source100:      nginx.rpmlintrc
-Source101:      http://nginx.org/download/nginx-%{version}.tar.gz.asc
+Source101:      https://nginx.org/download/nginx-%{version}.tar.gz.asc
 Source102:      https://nginx.org/keys/mdounin.key#/%{name}.keyring
 # PATCH-FIX-UPSTREAM nginx-1.11.2-no_Werror.patch
 Patch0:         nginx-1.11.2-no_Werror.patch
@@ -115,6 +105,8 @@ Patch4:         nginx-aio.patch
 Patch5:         check_1.9.2+.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel
+#
+BuildRequires:  libGeoIP-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
@@ -122,15 +114,13 @@ BuildRequires:  pkgconfig
 BuildRequires:  vim
 BuildRequires:  zlib-devel
 %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
@@ -154,10 +144,11 @@ It has been running on many heavily loaded Russian sites for more than two years
 %package -n vim-plugin-nginx
 Summary:        VIM support for nginx config files
 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.
@@ -192,6 +183,7 @@ sed -i "s/\/var\/run/\/run/" conf/nginx.conf
 %endif
 
 %build
+# FIXME: you should use the %%configure macro
 ./configure                                    \
   --prefix=%{ngx_prefix}/                      \
   --sbin-path=%{ngx_sbin_path}                 \