Updated njs to 0.4.0
diff --git a/alpine/Makefile b/alpine/Makefile
index 92512cb..81c2ecd 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -27,7 +27,7 @@
MODULE_RELEASE_geoip= 1
MODULE_VERSION_image_filter= $(BASE_VERSION)
MODULE_RELEASE_image_filter= 1
-MODULE_VERSION_njs= 0.3.9
+MODULE_VERSION_njs= 0.4.0
MODULE_RELEASE_njs= 1
MODULE_VERSION_perl= $(BASE_VERSION)
MODULE_RELEASE_perl= 1
@@ -106,7 +106,6 @@
MODULE_VERSION_PREFIX_njs=$(BASE_VERSION).
MODULE_BUILD_DEPENDS_njs=libedit-dev
-MODULE_PATCHES_njs=extra-patch-njs-fix-build-with-gcc.diff
define MODULE_ADD_CONTROL_TAGS_njs
replaces="nginx-mod-http-js"
diff --git a/alpine/src/extra-patch-njs-fix-build-with-gcc.diff b/alpine/src/extra-patch-njs-fix-build-with-gcc.diff
deleted file mode 100644
index b9ba65a..0000000
--- a/alpine/src/extra-patch-njs-fix-build-with-gcc.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Dmitry Volyntsev <xeioex@nginx.com>
-# Date 1583255688 -10800
-# Tue Mar 03 20:14:48 2020 +0300
-# Node ID 65f4b11e3302358ac965857fb744c72316d45952
-# Parent c5c6aab76bb43ad36fc9f06e48a2ccbb3fc6d02a
-Fixed compilation with gcc.
-
-diff --git a/src/njs_fs.c b/src/njs_fs.c
---- a/njs-0.3.9/src/njs_fs.c
-+++ b/njs-0.3.9/src/njs_fs.c
-@@ -818,6 +818,9 @@ njs_fs_mode(njs_vm_t *vm, njs_value_t *v
- uint32_t u32;
- njs_int_t ret;
-
-+ /* GCC complains about uninitialized u32. */
-+ u32 = 0;
-+
- if (njs_is_undefined(value)) {
- return default_mode;
- }
-
diff --git a/alpine/src/njs-0.3.9.tar.gz b/alpine/src/njs-0.3.9.tar.gz
deleted file mode 100644
index e3d9997..0000000
--- a/alpine/src/njs-0.3.9.tar.gz
+++ /dev/null
Binary files differ
diff --git a/alpine/src/njs-0.4.0.tar.gz b/alpine/src/njs-0.4.0.tar.gz
new file mode 100644
index 0000000..68490eb
--- /dev/null
+++ b/alpine/src/njs-0.4.0.tar.gz
Binary files differ
diff --git a/debian/Makefile b/debian/Makefile
index 8179fb3..32f97b0 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -42,7 +42,7 @@
MODULE_RELEASE_geoip= 1
MODULE_VERSION_image_filter= $(BASE_VERSION)
MODULE_RELEASE_image_filter= 1
-MODULE_VERSION_njs= 0.3.9
+MODULE_VERSION_njs= 0.4.0
MODULE_RELEASE_njs= 1
MODULE_VERSION_perl= $(BASE_VERSION)
MODULE_RELEASE_perl= 1
diff --git a/debian/extra/njs-0.3.9.tar.gz b/debian/extra/njs-0.3.9.tar.gz
deleted file mode 100644
index e3d9997..0000000
--- a/debian/extra/njs-0.3.9.tar.gz
+++ /dev/null
Binary files differ
diff --git a/debian/extra/njs-0.4.0.tar.gz b/debian/extra/njs-0.4.0.tar.gz
new file mode 100644
index 0000000..68490eb
--- /dev/null
+++ b/debian/extra/njs-0.4.0.tar.gz
Binary files differ
diff --git a/debian/nginx-module-njs.changelog.in b/debian/nginx-module-njs.changelog.in
index 06bd71c..b39f52a 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
+ * njs updated to 0.4.0
+
+ -- Konstantin Pavlov <thresh@nginx.com> Thu, 23 Apr 2020 16:32:21 +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/rpm/SOURCES/njs-0.3.9.tar.gz b/rpm/SOURCES/njs-0.3.9.tar.gz
deleted file mode 100644
index e3d9997..0000000
--- a/rpm/SOURCES/njs-0.3.9.tar.gz
+++ /dev/null
Binary files differ
diff --git a/rpm/SOURCES/njs-0.4.0.tar.gz b/rpm/SOURCES/njs-0.4.0.tar.gz
new file mode 100644
index 0000000..68490eb
--- /dev/null
+++ b/rpm/SOURCES/njs-0.4.0.tar.gz
Binary files differ
diff --git a/rpm/SOURCES/njs-fix-integer-constant.patch b/rpm/SOURCES/njs-fix-integer-constant.patch
deleted file mode 100644
index 929daf7..0000000
--- a/rpm/SOURCES/njs-fix-integer-constant.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Dmitry Volyntsev <xeioex@nginx.com>
-# Date 1583251254 -10800
-# Tue Mar 03 19:00:54 2020 +0300
-# Node ID c5c6aab76bb43ad36fc9f06e48a2ccbb3fc6d02a
-# Parent ef30d99ea2bef62594c9209413fcb61713bb7897
-Fixed integer constant is too large compilation error by gcc 4.4.
-
-diff -r ef30d99ea2be -r c5c6aab76bb4 src/njs_number.c
---- a/njs-0.3.9.orig/src/njs_number.c Tue Mar 03 18:57:15 2020 +0300
-+++ b/njs-0.3.9/src/njs_number.c Tue Mar 03 19:00:54 2020 +0300
-@@ -236,7 +236,7 @@ njs_uint64_to_string(njs_vm_t *vm, njs_v
- u_char *dst, *p;
- u_char buf[128];
-
-- if (njs_fast_path(u64 < 0x3fffffffffff)) {
-+ if (njs_fast_path(u64 < 0x3fffffffffffULL)) {
- /* Fits to short_string. */
- dst = njs_string_short_start(value);
-
-diff -r ef30d99ea2be -r c5c6aab76bb4 src/njs_number.h
---- a/njs-0.3.9.orig/src/njs_number.h Tue Mar 03 18:57:15 2020 +0300
-+++ b/njs-0.3.9/src/njs_number.h Tue Mar 03 19:00:54 2020 +0300
-@@ -8,7 +8,7 @@
- #define _NJS_NUMBER_H_INCLUDED_
-
-
--#define NJS_MAX_LENGTH (0x1fffffffffffff)
-+#define NJS_MAX_LENGTH (0x1fffffffffffffULL)
-
-
- double njs_key_to_index(const njs_value_t *value);
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 9837eb5..177e1bd 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -37,7 +37,7 @@
MODULE_RELEASE_geoip= 1
MODULE_VERSION_image_filter= $(BASE_VERSION)
MODULE_RELEASE_image_filter= 1
-MODULE_VERSION_njs= 0.3.9
+MODULE_VERSION_njs= 0.4.0
MODULE_RELEASE_njs= 1
MODULE_VERSION_perl= $(BASE_VERSION)
MODULE_RELEASE_perl= 1
@@ -116,8 +116,6 @@
MODULE_VERSION_PREFIX_njs=$(BASE_VERSION).
-MODULE_PATCHES_njs=njs-fix-integer-constant.patch
-
define MODULE_DEFINITIONS_njs
BuildRequires: libedit-devel
endef
diff --git a/rpm/SPECS/nginx-module-njs.changelog.in b/rpm/SPECS/nginx-module-njs.changelog.in
index 2f52e86..aa7b5e7 100644
--- a/rpm/SPECS/nginx-module-njs.changelog.in
+++ b/rpm/SPECS/nginx-module-njs.changelog.in
@@ -1,3 +1,6 @@
+* Thu Apr 23 2020 Konstantin Pavlov <thresh@nginx.com>
+- njs module updated to 0.4.0
+
* Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
- base version updated to 1.17.10
