新增：nginx-1.19.4

LICENSE

@@ -1,25 +1,26 @@
 BSD 2-Clause License
 
-Copyright (c) 2019, 呉真
+Copyright (C) 2002-2020 Igor Sysoev
+Copyright (C) 2011-2020 Nginx, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

nginx.spec

@@ -63,10 +63,10 @@ Requires(pre): shadow-utils
 
 %define openssl_version 1.1.1h
 
-%define main_version 1.19.3
-%define main_release 1%{?dist}.ngx
+%define base_version 1.19.4
+%define base_release 1%{?dist}.ngx
 
-%define bdir %{_builddir}/%{name}-%{main_version}
+%define bdir %{_builddir}/%{name}-%{base_version}
 
 %define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
 %define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
@@ -75,8 +75,8 @@ Requires(pre): shadow-utils
 
 Summary: High performance web server
 Name: nginx
-Version: %{main_version}
-Release: %{main_release}
+Version: %{base_version}
+Release: %{base_release}
 Vendor: Nginx, Inc.
 URL: http://nginx.org/
 Group: %{_group}
@@ -92,17 +92,18 @@ Source8: nginx.service
 Source9: nginx.upgrade.sh
 Source10: nginx.suse.logrotate
 Source11: nginx-debug.service
-Source12: COPYRIGHT
+Source12: nginx.copyright
 Source13: nginx.check-reload.sh
 Source14: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz
 
 License: 2-clause BSD-like license
 
-BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{main_release}-root
+BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
 BuildRequires: zlib-devel
 BuildRequires: pcre-devel
 
 Provides: webserver
+Provides: nginx-r%{base_version}
 
 %description
 nginx [engine x] is an HTTP and reverse proxy server, as well as
@@ -154,9 +155,9 @@ make %{?_smp_mflags}
 cd $RPM_BUILD_ROOT%{_sysconfdir}/nginx && \
     %{__ln_s} ../..%{_libdir}/nginx/modules modules && cd -
 
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{main_version}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{base_version}
 %{__install} -m 644 -p %{SOURCE12} \
-    $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{main_version}/
+    $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{base_version}/COPYRIGHT
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/nginx.conf
@@ -260,8 +261,8 @@ cat /dev/null > debugsourcefiles.list
 %attr(0755,root,root) %dir %{_localstatedir}/cache/nginx
 %attr(0755,root,root) %dir %{_localstatedir}/log/nginx
 
-%dir %{_datadir}/doc/%{name}-%{main_version}
-%doc %{_datadir}/doc/%{name}-%{main_version}/COPYRIGHT
+%dir %{_datadir}/doc/%{name}-%{base_version}
+%doc %{_datadir}/doc/%{name}-%{base_version}/COPYRIGHT
 %{_mandir}/man8/nginx.8*
 
 %pre
@@ -341,405 +342,342 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
-* Tue Sep 29 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Oct 27 2020 Andrei Belov <defan@nginx.com> - 1.19.4-1%{?dist}.ngx
+- 1.19.4-1
+
+* Tue Sep 29 2020 Konstantin Pavlov <thresh@nginx.com> - 1.19.3-1%{?dist}.ngx
 - 1.19.3
 
-* Tue Aug 11 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Aug 11 2020 Konstantin Pavlov <thresh@nginx.com> - 1.19.2-1%{?dist}.ngx
 - 1.19.2
 
-* Tue Jul 07 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul  7 2020 Konstantin Pavlov <thresh@nginx.com> - 1.19.1-1%{?dist}.ngx
 - 1.19.1
 
-* Tue May 26 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue May 26 2020 Konstantin Pavlov <thresh@nginx.com> - 1.19.0-1%{?dist}.ngx
 - 1.19.0
 
-* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com> - 1.17.10-1%{?dist}.ngx
 - 1.17.10
 
-* Tue Mar 03 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Mar  3 2020 Konstantin Pavlov <thresh@nginx.com> - 1.17.9-1%{?dist}.ngx
 - 1.17.9
 
-* Tue Jan 21 2020 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jan 21 2020 Konstantin Pavlov <thresh@nginx.com> - 1.17.8-1%{?dist}.ngx
 - 1.17.8
 
-* Tue Dec 24 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec 24 2019 Konstantin Pavlov <thresh@nginx.com> - 1.17.7-1%{?dist}.ngx
 - 1.17.7
 
-* Tue Nov 19 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Nov 19 2019 Konstantin Pavlov <thresh@nginx.com> - 1.17.6-1%{?dist}.ngx
 - 1.17.6
 
-* Tue Oct 22 2019 Andrei Belov <defan@nginx.com>
+* Tue Oct 22 2019 Andrei Belov <defan@nginx.com> - 1.17.5-1%{?dist}.ngx
 - 1.17.5
 
-* Tue Sep 24 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Sep 24 2019 Konstantin Pavlov <thresh@nginx.com> - 1.17.4-1%{?dist}.ngx
 - 1.17.4
 
-* Tue Aug 13 2019 Andrei Belov <defan@nginx.com>
+* Tue Aug 13 2019 Andrei Belov <defan@nginx.com> - 1.17.3-1%{?dist}.ngx
 - 1.17.3
 
-* Tue Jul 23 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul 23 2019 Konstantin Pavlov <thresh@nginx.com> - 1.17.2-1%{?dist}.ngx
 - 1.17.2
 
-* Tue Jun 25 2019 Andrei Belov <defan@nginx.com>
+* Tue Jun 25 2019 Andrei Belov <defan@nginx.com> - 1.17.1-1%{?dist}.ngx
 - 1.17.1
 
-* Tue May 21 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue May 21 2019 Konstantin Pavlov <thresh@nginx.com> - 1.17.0-1%{?dist}.ngx
 - 1.17.0
 
-* Tue Apr 16 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr 16 2019 Konstantin Pavlov <thresh@nginx.com> - 1.15.12-1%{?dist}.ngx
 - 1.15.12
 
-* Tue Apr 09 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr  9 2019 Konstantin Pavlov <thresh@nginx.com> - 1.15.11-1%{?dist}.ngx
 - 1.15.11
 
-* Tue Mar 26 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Mar 26 2019 Konstantin Pavlov <thresh@nginx.com> - 1.15.10-1%{?dist}.ngx
 - 1.15.10
 
-* Tue Feb 26 2019 Konstantin Pavlov <thresh@nginx.com>
+* Tue Feb 26 2019 Konstantin Pavlov <thresh@nginx.com> - 1.15.9-1%{?dist}.ngx
 - 1.15.9
 
-* Tue Dec 25 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec 25 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.8-1%{?dist}.ngx
 - 1.15.8
 
-* Tue Nov 27 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Nov 27 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.7-1%{?dist}.ngx
 - 1.15.7
 
-* Tue Nov 06 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Nov  6 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.6-1%{?dist}.ngx
 - 1.15.6
-- Fixes CVE-2018-16843
-- Fixes CVE-2018-16844
-- Fixes CVE-2018-16845
+- Security: fixes CVE-2018-16843.
+- Security: fixes CVE-2018-16844.
+- Security: fixes CVE-2018-16845.
 
-* Tue Oct 02 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Oct  2 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.5-1%{?dist}.ngx
 - 1.15.5
 
-* Tue Sep 25 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Sep 25 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.4-1%{?dist}.ngx
 - 1.15.4
 
-* Tue Aug 28 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Aug 28 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.3-1%{?dist}.ngx
 - 1.15.3
 
-* Tue Jul 24 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul 24 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.2-1%{?dist}.ngx
 - 1.15.2
 
-* Tue Jul 03 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul  3 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.1-1%{?dist}.ngx
 - 1.15.1
 
-* Tue Jun 05 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jun  5 2018 Konstantin Pavlov <thresh@nginx.com> - 1.15.0-1%{?dist}.ngx
 - 1.15.0
 
-* Mon Apr 09 2018 Konstantin Pavlov <thresh@nginx.com>
+* Mon Apr  9 2018 Konstantin Pavlov <thresh@nginx.com> - 1.13.12-1%{?dist}.ngx
 - 1.13.12
 
-* Tue Apr 03 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr  3 2018 Konstantin Pavlov <thresh@nginx.com> - 1.13.11-1%{?dist}.ngx
 - 1.13.11
 
-* Tue Mar 20 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Mar 20 2018 Konstantin Pavlov <thresh@nginx.com> - 1.13.10-1%{?dist}.ngx
 - 1.13.10
 
-* Tue Feb 20 2018 Konstantin Pavlov <thresh@nginx.com>
+* Tue Feb 20 2018 Konstantin Pavlov <thresh@nginx.com> - 1.13.9-1%{?dist}.ngx
 - 1.13.9
 
-* Tue Dec 26 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec 26 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.8-1%{?dist}.ngx
 - 1.13.8
 
-* Tue Nov 21 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Nov 21 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.7-1%{?dist}.ngx
 - 1.13.7
 
-* Tue Oct 10 2017 Konstantin Pavlov <thresh@nginx.com>
+* Thu Sep 14 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.6-1%{?dist}.ngx
 - 1.13.6
+- Bugfix: in systemd service support
+  (https://trac.nginx.org/nginx/ticket/1380).
 
-* Tue Sep  5 2017 Konstantin Pavlov <thresh@nginx.com>
+* Thu Sep 14 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.5-1%{?dist}.ngx
 - 1.13.5
 
-* Tue Aug  8 2017 Sergey Budnevitch <sb@nginx.com>
+* Tue Aug  8 2017 Sergey Budnevitch <sb@nginx.com> - 1.13.4-1%{?dist}.ngx
 - 1.13.4
 
-* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.3-1%{?dist}.ngx
 - 1.13.3
-- Fixes CVE-2017-7529
+- Security: fixes CVE-2017-7529.
 
-* Tue Jun 27 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jun 27 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.2-1%{?dist}.ngx
 - 1.13.2
 
-* Tue May 30 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue May 30 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.1-1%{?dist}.ngx
 - 1.13.1
 
-* Tue Apr 25 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr 25 2017 Konstantin Pavlov <thresh@nginx.com> - 1.13.0-1%{?dist}.ngx
 - 1.13.0
 
-* Tue Apr  4 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr  4 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.13-1%{?dist}.ngx
 - 1.11.13
-- CentOS7/RHEL7: made upgrade loops/timeouts configurable via
-  /etc/sysconfig/nginx.
-- Bumped upgrade defaults to five loops one second each.
+- Made upgrade loops/timeouts configurable via /etc/defaults/nginx.
 
-* Fri Mar 24 2017 Konstantin Pavlov <thresh@nginx.com>
+* Fri Mar 24 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.12-1%{?dist}.ngx
 - 1.11.12
 
-* Tue Mar 21 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Mar 21 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.11-1%{?dist}.ngx
 - 1.11.11
 
-* Tue Feb 14 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Feb 14 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.10-1%{?dist}.ngx
 - 1.11.10
 
-* Tue Jan 24 2017 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jan 24 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.9-1%{?dist}.ngx
 - 1.11.9
 - Extended hardening build flags.
 - Added check-reload target to init script / systemd service.
 
-* Tue Dec 27 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec 27 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.8-1%{?dist}.ngx
 - 1.11.8
 
-* Tue Dec 13 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec 13 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.7-1%{?dist}.ngx
 - 1.11.7
 
-* Tue Nov 15 2016 Konstantin Pavlov <thresh@nginx.com>
+* Fri Nov 25 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.6-1%{?dist}.ngx
 - 1.11.6
 
-* Mon Oct 10 2016 Andrei Belov <defan@nginx.com>
+* Mon Oct 10 2016 Andrei Belov <defan@nginx.com> - 1.11.5-1%{?dist}.ngx
 - 1.11.5
 
-* Tue Sep 13 2016 Konstantin Pavlov <thresh@nginx.com>
-- 1.11.4.
+* Tue Sep 13 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.4-1%{?dist}.ngx
+- 1.11.4
 - njs updated to 0.1.2.
 
-* Tue Jul 26 2016 Konstantin Pavlov <thresh@nginx.com>
-- 1.11.3.
+* Tue Jul 26 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.3-1%{?dist}.ngx
+- 1.11.3
 - njs updated to 0.1.0.
 - njs stream dynamic module added to nginx-module-njs package.
 - geoip stream dynamic module added to nginx-module-geoip package.
 
-* Tue Jul  5 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jul  5 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.2-1%{?dist}.ngx
 - 1.11.2
 - njs updated to ef2b708510b1.
 
-* Tue May 31 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue May 31 2016 Konstantin Pavlov <thresh@nginx.com> - 1.11.1-1%{?dist}.ngx
 - 1.11.1
 
-* Tue May 24 2016 Sergey Budnevitch <sb@nginx.com>
-- Fixed logrotate error if nginx is not running
+* Tue May 24 2016 Sergey Budnevitch <sb@nginx.com> - 1.11.0-1%{?dist}.ngx
 - 1.11.0
+- Bugfix: fixed logrotate error if nginx is not running.
 
-* Tue Apr 19 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr 19 2016 Konstantin Pavlov <thresh@nginx.com> - 1.9.15-1%{?dist}.ngx
 - 1.9.15
 - njs updated to 1c50334fbea6.
 
-* Tue Apr  5 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Apr  5 2016 Konstantin Pavlov <thresh@nginx.com> - 1.9.14-1%{?dist}.ngx
 - 1.9.14
 
-* Tue Mar 29 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Mar 29 2016 Konstantin Pavlov <thresh@nginx.com> - 1.9.13-1%{?dist}.ngx
 - 1.9.13
-- Added perl and njs dynamic modules
-- Fixed Requires section for dynamic modules on CentOS7/RHEL7
+- Fixed modules path
+- Added perl and njs dynamic modules subpackages
 
-* Wed Feb 24 2016 Sergey Budnevitch <sb@nginx.com>
-- common configure args are now in macros
-- xslt, image-filter and geoip dynamic modules added
+* Wed Feb 24 2016 Sergey Budnevitch <sb@nginx.com> - 1.9.12-1%{?dist}.ngx
 - 1.9.12
+- common configure args are now in variable
+- xslt, image-filter and geoip dynamic modules added
 
-* Tue Feb  9 2016 Sergey Budnevitch <sb@nginx.com>
-- dynamic modules path and symlink in %{_sysconfdir}/nginx added
+* Tue Feb  9 2016 Sergey Budnevitch <sb@nginx.com> - 1.9.11-1%{?dist}.ngx
 - 1.9.11
+- dynamic modules path and symlink in /etc/nginx added
 
-* Tue Jan 26 2016 Konstantin Pavlov <thresh@nginx.com>
+* Tue Jan 26 2016 Konstantin Pavlov <thresh@nginx.com> - 1.9.10-1%{?dist}.ngx
 - 1.9.10
 
-* Wed Dec  9 2015 Konstantin Pavlov <thresh@nginx.com>
+* Wed Dec  9 2015 Konstantin Pavlov <thresh@nginx.com> - 1.9.9-1%{?dist}.ngx
 - 1.9.9
 
-* Tue Dec  8 2015 Konstantin Pavlov <thresh@nginx.com>
+* Tue Dec  8 2015 Konstantin Pavlov <thresh@nginx.com> - 1.9.8-1%{?dist}.ngx
 - 1.9.8
 - http_slice module enabled
 
-* Tue Nov 17 2015 Konstantin Pavlov <thresh@nginx.com>
+* Tue Nov 17 2015 Konstantin Pavlov <thresh@nginx.com> - 1.9.7-1%{?dist}.ngx
 - 1.9.7
 
-* Tue Oct 27 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Oct 27 2015 Sergey Budnevitch <sb@nginx.com> - 1.9.6-1%{?dist}.ngx
 - 1.9.6
 
-* Tue Sep 22 2015 Andrei Belov <defan@nginx.com>
+* Tue Sep 22 2015 Andrei Belov <defan@nginx.com> - 1.9.5-1%{?dist}.ngx
 - 1.9.5
 - http_spdy module replaced with http_v2 module
 
-* Tue Aug 18 2015 Konstantin Pavlov <thresh@nginx.com>
+* Tue Aug 18 2015 Konstantin Pavlov <thresh@nginx.com> - 1.9.4-1%{?dist}.ngx
 - 1.9.4
 
-* Tue Jul 14 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Jul 14 2015 Sergey Budnevitch <sb@nginx.com> - 1.9.3-1%{?dist}.ngx
 - 1.9.3
 
-* Tue May 26 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Jun 16 2015 Sergey Budnevitch <sb@nginx.com> - 1.9.2-1%{?dist}.ngx
+- 1.9.2
+
+* Tue May 26 2015 Sergey Budnevitch <sb@nginx.com> - 1.9.1-1%{?dist}.ngx
 - 1.9.1
 
-* Tue Apr 28 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Apr 28 2015 Sergey Budnevitch <sb@nginx.com> - 1.9.0-1%{?dist}.ngx
 - 1.9.0
 - thread pool support added
 - stream module added
 - example_ssl.conf removed
 
-* Tue Apr  7 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Apr  7 2015 Sergey Budnevitch <sb@nginx.com> - 1.7.12-1%{?dist}.ngx
 - 1.7.12
 
-* Tue Mar 24 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Mar 24 2015 Sergey Budnevitch <sb@nginx.com> - 1.7.11-1%{?dist}.ngx
 - 1.7.11
 
-* Tue Feb 10 2015 Sergey Budnevitch <sb@nginx.com>
+* Tue Feb 10 2015 Sergey Budnevitch <sb@nginx.com> - 1.7.10-1%{?dist}.ngx
 - 1.7.10
 
-* Tue Dec 23 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Dec 23 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.9-1%{?dist}.ngx
 - 1.7.9
+- init-script now sends signal only to the PID derived from pidfile
 
-* Tue Dec  2 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Dec  2 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.8-1%{?dist}.ngx
 - 1.7.8
+- package with debug symbols added
 
-* Tue Sep 30 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Oct 28 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.7-1%{?dist}.ngx
+- 1.7.7
+
+* Tue Sep 30 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.6-1%{?dist}.ngx
 - 1.7.6
 
-* Tue Sep 16 2014 Sergey Budnevitch <sb@nginx.com>
-- epoch added to the EPEL7/CentOS7 spec to override EPEL one
+* Tue Sep 16 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.5-1%{?dist}.ngx
 - 1.7.5
 
-* Tue Aug  5 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Aug  5 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.4-1%{?dist}.ngx
 - 1.7.4
+- init-script now returns 0 on stop command if nginx is not running
 
-* Tue Jul  8 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Jul  8 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.3-1%{?dist}.ngx
 - 1.7.3
 
-* Tue Jun 17 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Jun 17 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.2-1%{?dist}.ngx
 - 1.7.2
 
-* Tue May 27 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue May 27 2014 Sergey Budnevitch <sb@nginx.com> - 1.7.1-1%{?dist}.ngx
 - 1.7.1
-- incorrect sysconfig filename finding in the initscript fixed
 
-* Thu Apr 24 2014 Konstantin Pavlov <thresh@nginx.com>
+* Thu Apr 24 2014 Konstantin Pavlov <thresh@nginx.com> - 1.7.0-1%{?dist}.ngx
 - 1.7.0
 
-* Tue Apr  8 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Apr  8 2014 Sergey Budnevitch <sb@nginx.com> - 1.5.13-1%{?dist}.ngx
 - 1.5.13
-- built spdy module on rhel/centos 6
 
-* Tue Mar 18 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Mar 18 2014 Sergey Budnevitch <sb@nginx.com> - 1.5.12-1%{?dist}.ngx
 - 1.5.12
-- spec cleanup
-- openssl version dependence added
-- upgrade() function in the init script improved
 - warning added when binary upgrade returns non-zero exit code
 
-* Tue Mar  4 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Mar  4 2014 Sergey Budnevitch <sb@nginx.com> - 1.5.11-1%{?dist}.ngx
 - 1.5.11
 
-* Tue Feb  4 2014 Sergey Budnevitch <sb@nginx.com>
+* Tue Feb  4 2014 Sergey Budnevitch <sb@nginx.com> - 1.5.10-1%{?dist}.ngx
 - 1.5.10
 
-* Wed Jan 22 2014 Sergey Budnevitch <sb@nginx.com>
+* Wed Jan 22 2014 Sergey Budnevitch <sb@nginx.com> - 1.5.9-1%{?dist}.ngx
 - 1.5.9
 
-* Tue Dec 17 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Dec 17 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.8-1%{?dist}.ngx
 - 1.5.8
-- fixed invalid week days in the changelog
 
-* Tue Nov 19 2013 Sergey Budnevitch <sb@nginx.com>
+* Fri Nov 29 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.7-1%{?dist}.ngx
 - 1.5.7
+- init script now honours additional options sourced from /etc/default/nginx
 
-* Tue Oct  1 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Oct  1 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.6-1%{?dist}.ngx
 - 1.5.6
 
-* Tue Sep 17 2013 Andrei Belov <defan@nginx.com>
+* Tue Sep 17 2013 Andrei Belov <defan@nginx.com> - 1.5.5-1%{?dist}.ngx
 - 1.5.5
 
-* Tue Aug 27 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Aug 27 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.4-1%{?dist}.ngx
 - 1.5.4
 - auth request module added
 
-* Tue Jul 30 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Jul 30 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.3-1%{?dist}.ngx
 - 1.5.3
 
-* Tue Jul  2 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Jul  2 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.2-1%{?dist}.ngx
 - 1.5.2
 
-* Tue Jun  4 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Jun  4 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.1-1%{?dist}.ngx
 - 1.5.1
+- dpkg-buildflags options now passed by --with-{cc,ld}-opt
 
-* Mon May  6 2013 Sergey Budnevitch <sb@nginx.com>
+* Mon May  6 2013 Sergey Budnevitch <sb@nginx.com> - 1.5.0-1%{?dist}.ngx
 - 1.5.0
+- fixed openssl version detection with dash as /bin/sh
 
-* Tue Apr 16 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Apr 16 2013 Sergey Budnevitch <sb@nginx.com> - 1.3.16-1%{?dist}.ngx
 - 1.3.16
 
-* Tue Mar 26 2013 Sergey Budnevitch <sb@nginx.com>
+* Tue Mar 26 2013 Sergey Budnevitch <sb@nginx.com> - 1.3.15-1%{?dist}.ngx
 - 1.3.15
 - gunzip module added
+- spdy module added if openssl version >= 1.0.1
 - set permissions on default log files at installation
-
-* Tue Feb 12 2013 Sergey Budnevitch <sb@nginx.com>
-- excess slash removed from --prefix
-- 1.2.7
-
-* Tue Dec 11 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.6
-
-* Tue Nov 13 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.5
-
-* Tue Sep 25 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.4
-
-* Tue Aug  7 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.3
-- nginx-debug package now actually contains non stripped binary
-
-* Tue Jul  3 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.2
-
-* Tue Jun  5 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.1
-
-* Mon Apr 23 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.2.0
-
-* Thu Apr 12 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.0.15
-
-* Thu Mar 15 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.0.14
-- OpenSUSE init script and SuSE specific changes to spec file added
-
-* Mon Mar  5 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.0.13
-
-* Mon Feb  6 2012 Sergey Budnevitch <sb@nginx.com>
-- 1.0.12
-- banner added to install script
-
-* Thu Dec 15 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.11
-- init script enhancements (thanks to Gena Makhomed)
-- one second sleep during upgrade replaced with 0.1 sec usleep
-
-* Tue Nov 15 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.10
-
-* Tue Nov  1 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.9
-- nginx-debug package added
-
-* Tue Oct 11 2011 Sergey Budnevitch <sb@nginx.com>
-- spec file cleanup (thanks to Yury V. Zaytsev)
-- log dir permitions fixed
-- logrotate creates new logfiles with nginx owner
-- "upgrade" argument to init-script added (based on fedora one)
-
-* Sat Oct  1 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.8
-- built with mp4 module
-
-* Fri Sep 30 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.7
-
-* Tue Aug 30 2011 Sergey Budnevitch <sb@nginx.com>
-- 1.0.6
-- replace "conf.d/*" config include with "conf.d/*.conf" in default nginx.conf
-
-* Wed Aug 10 2011 Sergey Budnevitch
-- Initial release