Merged with the default branch.
diff --git a/.hgtags b/.hgtags index 4fc5f99..27ecf27 100644 --- a/.hgtags +++ b/.hgtags
@@ -31,13 +31,5 @@ fb1dc5cd91c6b731f56b423d366e929fb9b7928e 1.9.13-1 a0b070b0f3c904b26a4697d8749a7717f971f8b7 1.9.14-1 4464e3eae17739ff1152ec2d6a08f1e3878130a8 1.9.15-1 -d6fde9bb416264b6fedf647dfc49eea9b1a8b413 1.11.0-1 -d6fde9bb416264b6fedf647dfc49eea9b1a8b413 1.11.0-1 -0000000000000000000000000000000000000000 1.11.0-1 -0000000000000000000000000000000000000000 1.11.0-1 -de299eb064a71ed1b4d35e0dce62b7d5493c497c 1.11.0-1 -d3ee0d6b590c882efc967e4c04de8e25c0f68873 1.11.1-1 -cf21a70e46cdeea2cef8a62b77c338effa31d1c2 1.11.2-1 -8bdb51c57eee47b9580df5a23338840fb0b941fa 1.11.3-1 -2bf22dac5b470f0a91de19ab59fa39f1da66a16c 1.11.4-1 -fa656182ba2afd4938a146a4f915901b60aad1ad 1.11.5-1 +1204777f235146a64b77bcf2165e5ac3b4829ab6 1.10.0-1 +690c641b22a6fa4afa5a1e486829ead42d207e75 1.10.1-1
diff --git a/debian/Makefile b/debian/Makefile index 5ba6119..582dd8f 100644 --- a/debian/Makefile +++ b/debian/Makefile
@@ -1,6 +1,6 @@ SHELL= /bin/bash -BASE_VERSION= 1.11.5 +BASE_VERSION= 1.10.1 BASE_RELEASE= 1 BASE_SRC= nginx-$(BASE_VERSION).tar.gz SRCDIR= nginx-$(BASE_VERSION) @@ -23,19 +23,20 @@ MODULE_RELEASE_geoip= 1 MODULE_VERSION_image_filter= $(BASE_VERSION) MODULE_RELEASE_image_filter= 1 -MODULE_VERSION_njs= 0.1.3 +MODULE_SHAID_njs= 1c50334fbea6 +MODULE_VERSION_njs= 0.0.20160414.$(MODULE_SHAID_njs) MODULE_RELEASE_njs= 1 MODULE_VERSION_perl= $(BASE_VERSION) MODULE_RELEASE_perl= 1 MODULE_VERSION_xslt= $(BASE_VERSION) MODULE_RELEASE_xslt= 1 -MODULE_SOURCES_njs= njs-$(MODULE_VERSION_njs).tar.gz +MODULE_SOURCES_njs= njs-$(MODULE_SHAID_njs).tar.gz MODULE_CONFARGS_geoip= --with-http_geoip_module=dynamic \ --with-stream_geoip_module=dynamic MODULE_CONFARGS_image_filter= --with-http_image_filter_module=dynamic -MODULE_CONFARGS_njs= --add-dynamic-module=$(MODSRC_PREFIX)njs-$(MODULE_VERSION_njs)/nginx +MODULE_CONFARGS_njs= --add-dynamic-module=$(MODSRC_PREFIX)njs-$(MODULE_SHAID_njs)/nginx MODULE_CONFARGS_perl= --with-http_perl_module=dynamic MODULE_CONFARGS_xslt= --with-http_xslt_module=dynamic @@ -187,9 +188,9 @@ --http-scgi-temp-path=/var/cache/nginx/scgi_temp \ --user=nginx \ --group=nginx \ - --with-compat \ --with-file-aio \ --with-threads \ + --with-ipv6 \ --with-http_addition_module \ --with-http_auth_request_module \ --with-http_dav_module \ @@ -208,9 +209,7 @@ --with-mail \ --with-mail_ssl_module \ --with-stream \ - --with-stream_realip_module \ - --with-stream_ssl_module \ - --with-stream_ssl_preread_module + --with-stream_ssl_module export CR=\\n
diff --git a/debian/extra/njs-0.1.3.tar.gz b/debian/extra/njs-0.1.3.tar.gz deleted file mode 100644 index 7978c47..0000000 --- a/debian/extra/njs-0.1.3.tar.gz +++ /dev/null Binary files differ
diff --git a/debian/extra/njs-1c50334fbea6.tar.gz b/debian/extra/njs-1c50334fbea6.tar.gz new file mode 100644 index 0000000..9e405df --- /dev/null +++ b/debian/extra/njs-1c50334fbea6.tar.gz Binary files differ
diff --git a/debian/nginx-module-njs.changelog.in b/debian/nginx-module-njs.changelog.in deleted file mode 100644 index d0f100c..0000000 --- a/debian/nginx-module-njs.changelog.in +++ /dev/null
@@ -1,6 +0,0 @@ -nginx-module-njs (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low - - * base version updated to 1.11.5 - * njs module updated to 0.1.3 - - -- Andrei Belov <defan@nginx.com> Mon, 10 Oct 2016 10:15:00 +0300
diff --git a/debian/nginx-module.changelog.in b/debian/nginx-module.changelog.in index e1a51cf..c0be416 100644 --- a/debian/nginx-module.changelog.in +++ b/debian/nginx-module.changelog.in
@@ -1,5 +1,5 @@ nginx-module-%%MODULE%% (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low - * base version updated to 1.11.5-1 + * base version updated to 1.10.1-1 - -- Andrei Belov <defan@nginx.com> Mon, 10 Oct 2016 10:15:00 +0300 + -- Konstantin Pavlov <thresh@nginx.com> Tue, 31 May 2016 16:30:00 +0300
diff --git a/debian/nginx.changelog.in b/debian/nginx.changelog.in index 32adaf0..515fa0f 100644 --- a/debian/nginx.changelog.in +++ b/debian/nginx.changelog.in
@@ -1,44 +1,14 @@ nginx (%%MAIN_VERSION%%-%%MAIN_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low - * 1.11.5 + * 1.10.1 - -- Andrei Belov <defan@nginx.com> Mon, 10 Oct 2016 10:15:00 +0300 + -- Konstantin Pavlov <thresh@nginx.com> Tue, 31 May 2016 16:30:00 +0300 -nginx (1.11.4-1~%%CODENAME%%) %%CODENAME%%; urgency=low +nginx (1.10.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low - * 1.11.4 - * njs updated to 0.1.2. + * 1.10.0 - -- Konstantin Pavlov <thresh@nginx.com> Tue, 13 Sep 2016 14:33:26 +0300 - -nginx (1.11.3-1~%%CODENAME%%) %%CODENAME%%; urgency=low - - * 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. - - -- Konstantin Pavlov <thresh@nginx.com> Tue, 26 Jul 2016 15:03:42 +0300 - -nginx (1.11.2-1~%%CODENAME%%) %%CODENAME%%; urgency=low - - * 1.11.2 - * njs updated to ef2b708510b1. - - -- Konstantin Pavlov <thresh@nginx.com> Tue, 05 Jul 2016 16:25:00 +0300 - -nginx (1.11.1-1~%%CODENAME%%) %%CODENAME%%; urgency=low - - * 1.11.1 - - -- Konstantin Pavlov <thresh@nginx.com> Tue, 31 May 2016 16:25:00 +0300 - -nginx (1.11.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low - - * 1.11.0 - * fixed logrotate error if nginx is not running - - -- Sergey Budnevitch <sb@nginx.com> Tue, 24 May 2016 15:38:00 +0300 + -- Konstantin Pavlov <thresh@nginx.com> Tue, 26 Apr 2016 17:10:00 +0300 nginx (1.9.15-1~%%CODENAME%%) %%CODENAME%%; urgency=low
diff --git a/rpm/SOURCES/njs-0.1.3.tar.gz b/rpm/SOURCES/njs-0.1.3.tar.gz deleted file mode 100644 index 7978c47..0000000 --- a/rpm/SOURCES/njs-0.1.3.tar.gz +++ /dev/null Binary files differ
diff --git a/rpm/SOURCES/njs-1c50334fbea6.tar.gz b/rpm/SOURCES/njs-1c50334fbea6.tar.gz new file mode 100644 index 0000000..9e405df --- /dev/null +++ b/rpm/SOURCES/njs-1c50334fbea6.tar.gz Binary files differ
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile index 230b557..7ee5c73 100644 --- a/rpm/SPECS/Makefile +++ b/rpm/SPECS/Makefile
@@ -1,6 +1,6 @@ SHELL= /bin/bash -BASE_VERSION= 1.11.5 +BASE_VERSION= 1.10.1 BASE_RELEASE= 1 BASE_SRC= nginx-$(BASE_VERSION).tar.gz SRCPATH?= ../SOURCES @@ -17,19 +17,20 @@ MODULE_RELEASE_geoip= 1 MODULE_VERSION_image_filter= $(BASE_VERSION) MODULE_RELEASE_image_filter= 1 -MODULE_VERSION_njs= 0.1.3 +MODULE_SHAID_njs= 1c50334fbea6 +MODULE_VERSION_njs= 0.0.20160414.$(MODULE_SHAID_njs) MODULE_RELEASE_njs= 1 MODULE_VERSION_perl= $(BASE_VERSION) MODULE_RELEASE_perl= 1 MODULE_VERSION_xslt= $(BASE_VERSION) MODULE_RELEASE_xslt= 1 -MODULE_SOURCES_njs= njs-$(MODULE_VERSION_njs).tar.gz +MODULE_SOURCES_njs= njs-$(MODULE_SHAID_njs).tar.gz MODULE_CONFARGS_geoip= --with-http_geoip_module=dynamic \ --with-stream_geoip_module=dynamic MODULE_CONFARGS_image_filter= --with-http_image_filter_module=dynamic -MODULE_CONFARGS_njs= --add-dynamic-module=njs-$(MODULE_VERSION_njs)/nginx +MODULE_CONFARGS_njs= --add-dynamic-module=njs-$(MODULE_SHAID_njs)/nginx MODULE_CONFARGS_perl= --with-http_perl_module=dynamic MODULE_CONFARGS_xslt= --with-http_xslt_module=dynamic @@ -97,7 +98,7 @@ MODULE_VERSION_PREFIX_njs=$(BASE_VERSION). define MODULE_PREINSTALL_njs -%{__install} -m644 %{bdir}/njs-$(MODULE_VERSION_njs)/README \ +%{__install} -m644 %{bdir}/njs-$(MODULE_SHAID_njs)/README \ $$RPM_BUILD_ROOT%{_datadir}/doc/nginx-module-njs/ endef export MODULE_PREINSTALL_njs @@ -214,9 +215,9 @@ --http-scgi-temp-path=%{_localstatedir}/cache/nginx/scgi_temp \ --user=%{nginx_user} \ --group=%{nginx_group} \ - --with-compat \ --with-file-aio \ --with-threads \ + --with-ipv6 \ --with-http_addition_module \ --with-http_auth_request_module \ --with-http_dav_module \ @@ -235,9 +236,7 @@ --with-mail \ --with-mail_ssl_module \ --with-stream \ - --with-stream_realip_module \ - --with-stream_ssl_module \ - --with-stream_ssl_preread_module + --with-stream_ssl_module export CR=\\n
diff --git a/rpm/SPECS/nginx-module-njs.changelog.in b/rpm/SPECS/nginx-module-njs.changelog.in deleted file mode 100644 index 2980cb5..0000000 --- a/rpm/SPECS/nginx-module-njs.changelog.in +++ /dev/null
@@ -1,3 +0,0 @@ -* Mon Oct 10 2016 Andrei Belov <defan@nginx.com> -- base version updated to 1.11.5 -- njs module updated to 0.1.3
diff --git a/rpm/SPECS/nginx-module.changelog.in b/rpm/SPECS/nginx-module.changelog.in index e1c787a..2bdfb08 100644 --- a/rpm/SPECS/nginx-module.changelog.in +++ b/rpm/SPECS/nginx-module.changelog.in
@@ -1,4 +1,4 @@ # default changelog for module packages # -* Mon Oct 10 2016 Andrei Belov <defan@nginx.com> -- base version updated to 1.11.5 +* Tue May 31 2016 Konstantin Pavlov <thresh@nginx.com> +- base version updated to 1.10.1
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in index 9629d01..901c9ce 100644 --- a/rpm/SPECS/nginx.spec.in +++ b/rpm/SPECS/nginx.spec.in
@@ -302,35 +302,17 @@ fi %changelog -* 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 +- 1.10.1 -* Wed May 24 2016 Sergey Budnevitch <sb@nginx.com> -- Fixed logrotate error if nginx is not running -- 1.11.0 +* Tue Apr 26 2016 Konstantin Pavlov <thresh@nginx.com> +- 1.10.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> +* Tue Apr 05 2016 Konstantin Pavlov <thresh@nginx.com> - 1.9.14 * Tue Mar 29 2016 Konstantin Pavlov <thresh@nginx.com>