Accepting request 872999 from home:darix:apps

cleanup build conditionals and fix the previous change for the is_opensuse. update to 1.19.7

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

nginx-1.19.6.tar.gz

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

nginx-1.19.6.tar.gz.asc

@@ -1,10 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEcBAABCAAGBQJf2NJhAAoJEFIKmZOhwFL46R4H/0lFIC7mX+NY5fbVFrOAfEyn
-q/bo9n8eeOROkVDSs9kbrhtlAhUoTCu19LNug6BAwMfzB5RuPbjEe6tULO8XUorT
-24rDGVZ1RLsETUucG1d033cl32BMshm7Qx6iv/kVhi2lB7pQk/suh8HzUf9SSbTb
-aNhkYmJ9B2V47+jggltR8lb+UzH2Ln+aiMMCp8hUTFjAZLKOHNck2ruidbi1VbH9
-Ah+Zq+7vSic9frPfVpgZ5N8rq40x8Z6sRXt787G5Ey39clj4wqRaJXcYohgfyT9F
-xFAceJMStq3qhI2HD4kDyevDpIwpzOQHkR+K5HRCSD7sc2xho3oYpEgbpoKxn54=
-=PlO1
------END PGP SIGNATURE-----

nginx-1.19.7.tar.gz

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

nginx-1.19.7.tar.gz.asc

@@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABCAAGBQJgK+wFAAoJEFIKmZOhwFL4tQMIAIpgYaTZuIYidhZ9YzVlzRKl
+U94KBm49k86YPYpb/uUoODPuXR9j1xb/QXHe3J8XGATqEyNmqdTin+yfXqCoyFuo
+eHLB4cDPEvFowZYbxPgiF8PWoG5v6IN2ZgOks4tcPiWhqe2YTrx33B6HOz42TSVY
+XUHnGVwVCsY/J7N6Vr8+TjnEXZgPn4S0YSTwIi14zQj4WuMMRin+yqkaZek2WKjj
+OtWrqzFBaJmykEGJqmllRvxFb/wOVK/vIO4wpPuJxmDJvV/v+byLqo13UvZeu5jq
+HrhvUpZXkoWojxnGkAnK0qGbdDR/cqY7QlEKV/Zh4eMvpVuJvBRFjAVNJkHP/3k=
+=fAVa
+-----END PGP SIGNATURE-----

nginx.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Feb 16 23:40:16 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.19.7
+  * https://nginx.org/en/CHANGES
+  * Change: connections handling in HTTP/2 has been changed to
+    better match HTTP/1.x; the "http2_recv_timeout",
+    "http2_idle_timeout", and "http2_max_requests" directives have
+    been removed, the "keepalive_timeout" and "keepalive_requests"
+    directives should be used instead.
+  * Change: the "http2_max_field_size" and "http2_max_header_size"
+    directives have been removed, the "large_client_header_buffers"
+    directive should be used instead.
+  * Feature: now, if free worker connections are exhausted, nginx
+    starts closing not only keepalive connections, but also
+    connections in lingering close.
+  * Bugfix: "zero size buf in output" alerts might appear in logs
+    if an upstream server returned an incorrect response during
+    unbuffered proxying; the bug had appeared in 1.19.1.
+  * Bugfix: HEAD requests were handled incorrectly if the "return"
+    directive was used with the "image_filter" or "xslt_stylesheet"
+    directives.
+  * Bugfix: in the "add_trailer" directive.
+- Since we only target sle 12 and above we can skip all
+  conditionals which apply to suse_version before 1315
+
+  With changes in nginx itself we will drop support for sysvinit.
+  http2, libatomic support and pcre_jit will always be on now.
+  and we build all binaries with PIE now.
+- Moved the last 2 path macros from nginx.spec to the macros file.
+  (pid and lock path)
+
 -------------------------------------------------------------------
 Wed Dec 23 07:18:28 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 

nginx.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nginx
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,35 +26,14 @@
 %else
 %bcond_with    extra_modules
 %endif
-#
+# keep in sync with %ngx_conditionals
-# keep in sync with ngx_conditionals in nginx-macros
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-%bcond_without ngx_libatomic
-%else
-%bcond_with    ngx_libatomic
-%endif
-%if 0%{?suse_version} > 1220
-%bcond_without ngx_http2
-%bcond_without ngx_pcre_jit
-%bcond_without systemd
-%else
-%bcond_with    ngx_http2
-%bcond_with    ngx_pcre_jit
-%bcond_with    systemd
-%endif
 %bcond_with    ngx_cpp_test
 %bcond_with    ngx_google_perftools
 #
-%if %{with systemd}
+
-%define ngx_pid_path   /run/nginx.pid
-%define ngx_lock_path  /run/nginx.lock
-%else
-%define ngx_pid_path   %{_localstatedir}/run/nginx.pid
-%define ngx_lock_path  %{_localstatedir}/run/nginx.lock
-%endif
 #
 Name:           nginx
-Version:        1.19.6
+Version:        1.19.7
 Release:        0
 Summary:        A HTTP server and IMAP/POP3 proxy server
 License:        BSD-2-Clause
@@ -106,21 +85,13 @@ Provides:       httpd
 BuildRequires:  google-perftools-devel
 %endif
 #
-%if %{with ngx_libatomic}
 BuildRequires:  libatomic-ops-devel
-%endif
 #
-%if %{with systemd}
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_ordering}
 %sysusers_requires
-%else
-Requires(pre):  %fillup_prereq
-Requires(pre):  %insserv_prereq
-Requires(pre):  shadow
-%endif
 
 %description
 nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev.
@@ -154,9 +125,7 @@ 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.
@@ -190,9 +159,7 @@ sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config
   %endif
 
 %make_build
-%if %{with systemd}
 %sysusers_generate_pre %{SOURCE9} nginx
-%endif
 
 %install
 %make_install
@@ -202,14 +169,9 @@ install -dpm0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi}
 
 install -Dpm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{pkg_name}
 
-%if %{with systemd}
+install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service
-install -Dpm0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service
+install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/nginx.conf
 ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnginx
-install -Dpm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/nginx.conf
-%else
-install -Dpm0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
-ln -s -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
-%endif
 
 rm %{buildroot}/srv/www/htdocs/index.html
 
@@ -244,36 +206,17 @@ copydocs() {
 copydocs %{nginx_upstream_check_module_path} \
   doc/*
 
-%post
-%if %{with systemd}
-%service_add_post nginx.service
-%else
-%fillup_and_insserv %{pkg_name}
-%endif
-
-%preun
-%if %{with systemd}
-%service_del_preun nginx.service
-%else
-%stop_on_removal %{pkg_name}
-%endif
-
-%postun
-%if %{with systemd}
-%service_del_postun nginx.service
-%else
-%restart_on_update %{pkg_name}
-%insserv_cleanup
-%endif
-
-%if %{with systemd}
 %pre -f nginx.pre
 %service_add_pre nginx.service
-%else
+
-%pre
+%preun
-%{_sbindir}/groupadd -r %{ngx_user_group} &>/dev/null ||:
+%service_del_preun nginx.service
-%{_sbindir}/useradd -g %{ngx_user_group} -s /bin/false -r -c "user for %{ngx_user_group}" -d %{ngx_home} %{ngx_user_group} &>/dev/null ||:
+
-%endif
+%post
+%service_add_post nginx.service
+
+%postun
+%service_del_postun nginx.service
 
 %files
 %dir %{ngx_conf_dir}/
@@ -319,12 +262,8 @@ copydocs %{nginx_upstream_check_module_path} \
 %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_scgi}
 %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_uwsgi}
 %doc %{ngx_doc_dir}
-%if %{with systemd}
 %{_unitdir}/nginx.service
 %{_sysusersdir}/nginx.conf
-%else
-%{_sysconfdir}/init.d/%{pkg_name}
-%endif
 %{_datadir}/nginx/
 
 %files -n vim-plugin-nginx