Updated nginx to 1.18.0
diff --git a/alpine/Makefile b/alpine/Makefile
index 92512cb..81614c9 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -1,6 +1,6 @@
SHELL= /bin/bash
-BASE_VERSION= 1.17.10
+BASE_VERSION= 1.18.0
BASE_RELEASE= 1
PLUS_VERSION= 21
PLUS_RELEASE= ${BASE_RELEASE}
diff --git a/debian/Makefile b/debian/Makefile
index 8179fb3..ff313d1 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,6 +1,6 @@
SHELL= /bin/bash
-BASE_VERSION= 1.17.10
+BASE_VERSION= 1.18.0
BASE_RELEASE= 1
PLUS_VERSION= 21
BASE_SRC= nginx-$(BASE_VERSION).tar.gz
diff --git a/debian/nginx-module-geoip.changelog.in b/debian/nginx-module-geoip.changelog.in
index dbb71ae..ec8882e 100644
--- a/debian/nginx-module-geoip.changelog.in
+++ b/debian/nginx-module-geoip.changelog.in
@@ -1,5 +1,11 @@
nginx-module-geoip (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * base version updated to 1.18.0-1
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx-module-geoip (1.17.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* base version updated to 1.17.10-1
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/debian/nginx-module-image-filter.changelog.in b/debian/nginx-module-image-filter.changelog.in
index 9dabe87..ef41811 100644
--- a/debian/nginx-module-image-filter.changelog.in
+++ b/debian/nginx-module-image-filter.changelog.in
@@ -1,5 +1,11 @@
nginx-module-image-filter (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * base version updated to 1.18.0-1
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx-module-image-filter (1.17.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* base version updated to 1.17.10-1
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/debian/nginx-module-njs.changelog.in b/debian/nginx-module-njs.changelog.in
index 06bd71c..81fcf19 100644
--- a/debian/nginx-module-njs.changelog.in
+++ b/debian/nginx-module-njs.changelog.in
@@ -1,5 +1,11 @@
nginx-module-njs (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * base version updated to 1.18.0-1
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx-module-njs (1.17.10.0.3.9-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* base version updated to 1.17.10-1
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/debian/nginx-module-perl.changelog.in b/debian/nginx-module-perl.changelog.in
index 44666d1..69824e5 100644
--- a/debian/nginx-module-perl.changelog.in
+++ b/debian/nginx-module-perl.changelog.in
@@ -1,5 +1,11 @@
nginx-module-perl (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * base version updated to 1.18.0-1
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx-module-perl (1.17.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* base version updated to 1.17.10-1
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/debian/nginx-module-xslt.changelog.in b/debian/nginx-module-xslt.changelog.in
index ff6f9df..6d51874 100644
--- a/debian/nginx-module-xslt.changelog.in
+++ b/debian/nginx-module-xslt.changelog.in
@@ -1,5 +1,11 @@
nginx-module-xslt (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * base version updated to 1.18.0-1
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx-module-xslt (1.17.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* base version updated to 1.17.10-1
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/debian/nginx.changelog.in b/debian/nginx.changelog.in
index f1992b3..bf5e1da 100644
--- a/debian/nginx.changelog.in
+++ b/debian/nginx.changelog.in
@@ -1,5 +1,11 @@
nginx (%%BASE_VERSION%%-%%BASE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
+ * 1.18.0
+
+ -- Konstantin Pavlov <thresh@nginx.com> Tue, 21 Apr 2020 15:43:12 +0300
+
+nginx (1.17.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
* 1.17.10
-- Konstantin Pavlov <thresh@nginx.com> Tue, 14 Apr 2020 17:34:25 +0300
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 9837eb5..315a840 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -1,6 +1,6 @@
SHELL= /bin/bash
-BASE_VERSION= 1.17.10
+BASE_VERSION= 1.18.0
BASE_RELEASE= 1
PLUS_VERSION= 21
BASE_SRC= nginx-$(BASE_VERSION).tar.gz
diff --git a/rpm/SPECS/nginx-module-njs.changelog.in b/rpm/SPECS/nginx-module-njs.changelog.in
index 2f52e86..5e85942 100644
--- a/rpm/SPECS/nginx-module-njs.changelog.in
+++ b/rpm/SPECS/nginx-module-njs.changelog.in
@@ -1,3 +1,6 @@
+* Tue Apr 21 2020 Konstantin Pavlov <thresh@nginx.com>
+- base version updated to 1.18.0
+
* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
- base version updated to 1.17.10
diff --git a/rpm/SPECS/nginx-module.changelog.in b/rpm/SPECS/nginx-module.changelog.in
index 9ca3733..547871d 100644
--- a/rpm/SPECS/nginx-module.changelog.in
+++ b/rpm/SPECS/nginx-module.changelog.in
@@ -1,5 +1,8 @@
# default changelog for module packages
#
+* Tue Apr 21 2020 Konstantin Pavlov <thresh@nginx.com>
+- base version updated to 1.18.0
+
* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
- base version updated to 1.17.10
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in
index acadd9c..df72af7 100644
--- a/rpm/SPECS/nginx.spec.in
+++ b/rpm/SPECS/nginx.spec.in
@@ -335,6 +335,9 @@
fi
%changelog
+* Tue Apr 21 2020 Konstantin Pavlov <thresh@nginx.com>
+- 1.18.0
+
* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
- 1.17.10
