Fixed unfinished graft.
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in index 78debb5..2cffcd6 100644 --- a/rpm/SPECS/nginx.spec.in +++ b/rpm/SPECS/nginx.spec.in
@@ -336,399 +336,3 @@ fi %changelog -<<<<<<< local -* Tue Apr 21 2020 Konstantin Pavlov <thresh@nginx.com> -- 1.18.0 - -* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com> -- 1.17.10 - -* Tue Mar 03 2020 Konstantin Pavlov <thresh@nginx.com> -- 1.17.9 - -* Tue Jan 21 2020 Konstantin Pavlov <thresh@nginx.com> -- 1.17.8 - -* Tue Dec 24 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.17.7 - -* Tue Nov 19 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.17.6 - -* Tue Oct 22 2019 Andrei Belov <defan@nginx.com> -- 1.17.5 - -* Tue Sep 24 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.17.4 - -* Tue Aug 13 2019 Andrei Belov <defan@nginx.com> -- 1.17.3 - -* Tue Jul 23 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.17.2 - -* Tue Jun 25 2019 Andrei Belov <defan@nginx.com> -- 1.17.1 - -* Tue May 21 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.17.0 - -* Tue Apr 16 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.15.12 - -* Tue Apr 09 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.15.11 - -* Tue Mar 26 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.15.10 - -* Tue Feb 26 2019 Konstantin Pavlov <thresh@nginx.com> -- 1.15.9 - -* Tue Dec 25 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.8 - -* Tue Nov 27 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.7 - -* Tue Nov 06 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.6 -- Fixes CVE-2018-16843 -- Fixes CVE-2018-16844 -- Fixes CVE-2018-16845 - -* Tue Oct 02 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.5 - -* Tue Sep 25 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.4 - -* Tue Aug 28 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.3 - -* Tue Jul 24 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.2 - -* Tue Jul 03 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.1 - -* Tue Jun 05 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.15.0 - -* Mon Apr 09 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.13.12 - -* Tue Apr 03 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.13.11 - -* Tue Mar 20 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.13.10 - -* Tue Feb 20 2018 Konstantin Pavlov <thresh@nginx.com> -- 1.13.9 - -* Tue Dec 26 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.8 - -* Tue Nov 21 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.7 - -* Tue Oct 10 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.6 - -* Tue Sep 5 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.5 - -* Tue Aug 8 2017 Sergey Budnevitch <sb@nginx.com> -- 1.13.4 - -* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.3 -- Fixes CVE-2017-7529 - -* Tue Jun 27 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.2 - -* Tue May 30 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.1 - -* Tue Apr 25 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.13.0 - -* Tue Apr 4 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.11.13 -- CentOS7/RHEL7: made upgrade loops/timeouts configurable via - /etc/sysconfig/nginx. -- Bumped upgrade defaults to five loops one second each. - -* Fri Mar 24 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.11.12 - -* Tue Mar 21 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.11.11 - -* Tue Feb 14 2017 Konstantin Pavlov <thresh@nginx.com> -- 1.11.10 - -* Tue Jan 24 2017 Konstantin Pavlov <thresh@nginx.com> -- 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> -- 1.11.8 - -* Tue Dec 13 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.11.7 - -* Tue Nov 15 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.11.6 - -* Mon Oct 10 2016 Andrei Belov <defan@nginx.com> -- 1.11.5 - -* Tue Sep 13 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.11.4. -- njs updated to 0.1.2. - -* Tue Jul 26 2016 Konstantin Pavlov <thresh@nginx.com> -- 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> -- 1.11.2 -- njs updated to ef2b708510b1. - -* Tue May 31 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.11.1 - -* Tue May 24 2016 Sergey Budnevitch <sb@nginx.com> -- Fixed logrotate error if nginx is not running -- 1.11.0 - -* Tue Apr 19 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.9.15 -- njs updated to 1c50334fbea6. - -* Tue Apr 5 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.9.14 - -* Tue Mar 29 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.9.13 -- Added perl and njs dynamic modules -- Fixed Requires section for dynamic modules on CentOS7/RHEL7 - -* Wed Feb 24 2016 Sergey Budnevitch <sb@nginx.com> -- common configure args are now in macros -- xslt, image-filter and geoip dynamic modules added -- 1.9.12 - -* Tue Feb 9 2016 Sergey Budnevitch <sb@nginx.com> -- dynamic modules path and symlink in %{_sysconfdir}/nginx added -- 1.9.11 - -* Tue Jan 26 2016 Konstantin Pavlov <thresh@nginx.com> -- 1.9.10 - -* Wed Dec 9 2015 Konstantin Pavlov <thresh@nginx.com> -- 1.9.9 - -* Tue Dec 8 2015 Konstantin Pavlov <thresh@nginx.com> -- 1.9.8 -- http_slice module enabled - -* Tue Nov 17 2015 Konstantin Pavlov <thresh@nginx.com> -- 1.9.7 - -* Tue Oct 27 2015 Sergey Budnevitch <sb@nginx.com> -- 1.9.6 - -* Tue Sep 22 2015 Andrei Belov <defan@nginx.com> -- 1.9.5 -- http_spdy module replaced with http_v2 module - -* Tue Aug 18 2015 Konstantin Pavlov <thresh@nginx.com> -- 1.9.4 - -* Tue Jul 14 2015 Sergey Budnevitch <sb@nginx.com> -- 1.9.3 - -* Tue May 26 2015 Sergey Budnevitch <sb@nginx.com> -- 1.9.1 - -* Tue Apr 28 2015 Sergey Budnevitch <sb@nginx.com> -- 1.9.0 -- thread pool support added -- stream module added -- example_ssl.conf removed - -* Tue Apr 7 2015 Sergey Budnevitch <sb@nginx.com> -- 1.7.12 - -* Tue Mar 24 2015 Sergey Budnevitch <sb@nginx.com> -- 1.7.11 - -* Tue Feb 10 2015 Sergey Budnevitch <sb@nginx.com> -- 1.7.10 - -* Tue Dec 23 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.9 - -* Tue Dec 2 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.8 - -* Tue Sep 30 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.6 - -* Tue Sep 16 2014 Sergey Budnevitch <sb@nginx.com> -- epoch added to the EPEL7/CentOS7 spec to override EPEL one -- 1.7.5 - -* Tue Aug 5 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.4 - -* Tue Jul 8 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.3 - -* Tue Jun 17 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.2 - -* Tue May 27 2014 Sergey Budnevitch <sb@nginx.com> -- 1.7.1 -- incorrect sysconfig filename finding in the initscript fixed - -* Thu Apr 24 2014 Konstantin Pavlov <thresh@nginx.com> -- 1.7.0 - -* Tue Apr 8 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.13 -- built spdy module on rhel/centos 6 - -* Tue Mar 18 2014 Sergey Budnevitch <sb@nginx.com> -- 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> -- 1.5.11 - -* Tue Feb 4 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.10 - -* Wed Jan 22 2014 Sergey Budnevitch <sb@nginx.com> -- 1.5.9 - -* Tue Dec 17 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.8 -- fixed invalid week days in the changelog - -* Tue Nov 19 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.7 - -* Tue Oct 1 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.6 - -* Tue Sep 17 2013 Andrei Belov <defan@nginx.com> -- 1.5.5 - -* Tue Aug 27 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.4 -- auth request module added - -* Tue Jul 30 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.3 - -* Tue Jul 2 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.2 - -* Tue Jun 4 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.1 - -* Mon May 6 2013 Sergey Budnevitch <sb@nginx.com> -- 1.5.0 - -* Tue Apr 16 2013 Sergey Budnevitch <sb@nginx.com> -- 1.3.16 - -* Tue Mar 26 2013 Sergey Budnevitch <sb@nginx.com> -- 1.3.15 -- gunzip module added -- 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 -======= ->>>>>>> graft