From 836c2b4ffbf639221362a42f94ce71dec074e1de Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 10 Jan 2021 14:12:54 +0100
Subject: [PATCH] testing/lowjs: upgrade to 1.6.0

---
 testing/lowjs/APKBUILD               | 14 +++++++-------
 testing/lowjs/make-flags.patch       |  4 ++--
 testing/lowjs/unbundle-c-ares.patch  | 19 ++++++++++---------
 testing/lowjs/unbundle-mbedtls.patch | 18 +++++++++---------
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/testing/lowjs/APKBUILD b/testing/lowjs/APKBUILD
index 1c03c096623..a4b6cd59d58 100644
--- a/testing/lowjs/APKBUILD
+++ b/testing/lowjs/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=lowjs
-pkgver=1.5.3.1
+pkgver=1.6.0
 # Keep in sync with submodules in deps/.
-_gitrev_open62541="9f1cbfa96fd050220c86d3e5939d88cab1b680ce"
+_gitrev_open62541="8828fa712d7076962aa67d2a0542d7892c34d964"
 _gitrev_duktape="10486db548732957ba9fc8c9e4ad01a857d268bd"
 pkgrel=0
 pkgdesc="A port of Node.JS with far lower system requirements"
@@ -81,13 +81,13 @@ package() {
 	install -D -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="6237d809bbed0bb6c7088273f4814010caa096b55668bd467e00cb21765ac35b0bcb84054106ad901871783b6ac7527b36039e49e8d033d36c88b754a8663f38  lowjs-1.5.3.1.tar.gz
-7c71ff0ce8cda56e4a4cc8e416172fd847f7289d45c4e44e54e56f3081b914d9401c86341ae3d0a4bccd7b6e9c3b274c92892e67e3cd300824bf900cd9f02ac1  open62541-9f1cbfa96fd050220c86d3e5939d88cab1b680ce.tar.gz
+sha512sums="f23b4265b08ff97b7ab77357983f08d2d06457a29c98970e0a4b502b419f1e16e14d88a278763c252edb460452da8d70e24007784350db9f87d5663ed934c7d5  lowjs-1.6.0.tar.gz
+8d992a3a8fdf1717af2497c0d2d5e9e27e490b29253da78ecd64a6ff866fcef4f7114cb7cb073a8a862efff16eddfcb9416a9c64a2659b3bc9c2294e4cec3734  open62541-8828fa712d7076962aa67d2a0542d7892c34d964.tar.gz
 7f34ae3f6f0d9bfd039ef3ba14939eb4d59cf513b5c7fac7e9aec915cb3551751a95c2e8d91d56bae9343d2a834a572516827a7997cf8596cb3e9b127e1f32d5  duktape-10486db548732957ba9fc8c9e4ad01a857d268bd.tar.gz
 432fd215e034beafc07270a6aa8b726d5a16ef8946a95c1db9a34b4f492bbe2089dffbb1ce856d3e8153ec18ac943973a23e3aa9283d53ee0b2e7ba5dcd3d317  pyaml-20.4.0.tar.gz
 b8aecec6aa87eb2ab7ffecaca1989f922042ee534612229872bad10bc0e304951cb66a1d1aa3ba4e76384ca2ea28b8c5b7176eacf6b7df3d59ea7435b7894a48  use-npm-ci.patch
 c2c7f10d327d2e56d2824db02c647c05773c652179f40eff7b376dfbf7eecd72b7d07c18458d59fd195993b261cb9a48e9f521ccb1a519807270c036ed8d5746  open62541-gcc9.patch
-4298f2a26716a01a7bc1175a6f272f3681a6bcb29d916805d825f214b8bf9b7d2ed02d2c51b1c149109118a38391fd3ec8e6ac17c9c72ab926ea12dae5259835  unbundle-c-ares.patch
-4d761c495d09c555b664a0bda9b4bc4d01793bcdce161e16a54f786478a15bbab9feda4c139f38e179158786305399d0edac8348785981c98747c1eca0433b26  unbundle-mbedtls.patch
-002833f2adef30e29fde97f06aa29f4d9ab7244a5cfddd77e9565f898c8a04a7c496bec617492937a54548586da44abf5dd2e979365a44ccfe186b7b654039d0  make-flags.patch
+37d8810d8e89354ed8d908395ba21b7795049ff990f2d6d795d2458f511c4a9352c734f989c9eb2a54f8a06475769abe4051056d4c92e613d12103168790d361  unbundle-c-ares.patch
+bc0d847cabf195911b127768ac99d7876a2c43b0bb7ed359c9691f525560b302c3ee404fb16a0245acf9d04b912dabb89dd6f9584bafeeb6fe3b07eeaaac7cdb  unbundle-mbedtls.patch
+6a7771e749bf567819bb028738cf38da71ab7a397211de410e2406dc3a2e87bc8d4e4c4804e25f0a76b2dc96836b020ac91d8a32c806eb2874fe65deee2c51f9  make-flags.patch
 9ee7d585c9ce17ca00e86e0f74976883fa14e70f3728cf230256f2570dafdaa3adeae1922de5f0dcb74bba8577f9394c54441bc3729c1bb58bb6a298c26651d0  test.js"
diff --git a/testing/lowjs/make-flags.patch b/testing/lowjs/make-flags.patch
index 1d6aad622c4..a19b50b3f48 100644
--- a/testing/lowjs/make-flags.patch
+++ b/testing/lowjs/make-flags.patch
@@ -9,8 +9,8 @@
 +CFLAGS += $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low
  
  CXX = g++
--CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
-+CXXFLAGS += $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
+-CXXFLAGS = $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
++CXXFLAGS += $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
  
  LD = g++
 -LDFLAGS = $(FLAGS) -lm -ldl -lpthread -lcares -lmbedcrypto -lmbedtls -lmbedx509 deps/open62541/build/bin/libopen62541.a -lresolv
diff --git a/testing/lowjs/unbundle-c-ares.patch b/testing/lowjs/unbundle-c-ares.patch
index f94cc588a90..935e6483e3e 100644
--- a/testing/lowjs/unbundle-c-ares.patch
+++ b/testing/lowjs/unbundle-c-ares.patch
@@ -1,7 +1,7 @@
 --- a/Makefile
 +++ b/Makefile
 @@ -7,7 +7,7 @@
- CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
+ CXXFLAGS = $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
  
  LD = g++
 -LDFLAGS = $(FLAGS) -lm -ldl -lpthread deps/open62541/build/bin/libopen62541.a -lresolv
@@ -9,22 +9,23 @@
  
  OBJECTS_LOW =						\
  	app/main.o						\
-@@ -50,13 +50,12 @@
+@@ -52,14 +52,12 @@
  
  clean:
  	rm -rf */*.o */*.d bin/* deps/duktape/src-low lib lib_js/build node_modules util/dukc test/duk_crash
 -	cd deps/c-ares && make clean
  	cd deps/mbedtls && make clean
  	cd deps/open62541 && rm -rf build
+-	rm deps/c-ares/configure
  
  bin/low: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark
  	mkdir -p bin
 -	 $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o deps/c-ares/libcares_la-*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
 +	 $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
- util/dukc: deps/duktape/src-low/duktape.o util/dukc.o
- 	 $(LD) -o util/dukc deps/duktape/src-low/duktape.o util/dukc.o $(LDFLAGS)
  
-@@ -70,7 +69,7 @@
+ obj_lowjs_serv: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark util/dukc
+ 
+@@ -76,7 +74,7 @@
  	$(CXX) $(CXXFLAGS) -MMD -o $@ -c $<
  %.o : %.c Makefile
  	$(C) $(CFLAGS) -MMD -o $@ -c $<
@@ -33,20 +34,20 @@
  	$(CXX) $(CXXFLAGS) -MMD -o $@ -c $<
  
  -include $(OBJECTS:.o=.d) $(OBJECTS_LOW:.o=.d)
-@@ -110,13 +109,6 @@
- 		-DDUK_USE_SYMBOL_BUILTIN	\
+@@ -117,13 +115,6 @@
  		-DDUK_USE_SECTION_B \
  		-DDUK_USE_CPP_EXCEPTIONS
--
+ 
 -deps/c-ares/configure:
 -	cd deps/c-ares && . ./buildconf
 -deps/c-ares/Makefile: deps/c-ares/configure
 -	cd deps/c-ares && ./configure
 -deps/c-ares/.libs/libcares.a: deps/c-ares/Makefile
 -	cd deps/c-ares && make
- 
+-
  deps/mbedtls/programs/test/benchmark:
  	cd deps/mbedtls && make
+ 
 --- a/src/LowDNSResolver.cpp
 +++ b/src/LowDNSResolver.cpp
 @@ -13,7 +13,7 @@
diff --git a/testing/lowjs/unbundle-mbedtls.patch b/testing/lowjs/unbundle-mbedtls.patch
index a84206c7ad7..bda5b6b7877 100644
--- a/testing/lowjs/unbundle-mbedtls.patch
+++ b/testing/lowjs/unbundle-mbedtls.patch
@@ -8,8 +8,8 @@
 +CFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low
  
  CXX = g++
--CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
-+CXXFLAGS = $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
+-CXXFLAGS = $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/mbedtls/include -Ideps/mbedtls/crypto/include -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
++CXXFLAGS = $(CXXFLAGS_SERV) $(FLAGS) -Isrc -Iapp -Ideps/duktape/src-low -Ideps/open62541/build/src_generated -Ideps/open62541/include -Ideps/open62541/arch -Ideps/open62541/plugins/include -Ideps/open62541/src/client -Ideps/open62541/deps -Ideps/open62541/src --std=c++11
  
  LD = g++
 -LDFLAGS = $(FLAGS) -lm -ldl -lpthread -lcares deps/open62541/build/bin/libopen62541.a -lresolv
@@ -17,7 +17,7 @@
  
  OBJECTS_LOW =						\
  	app/main.o						\
-@@ -50,12 +50,11 @@
+@@ -52,12 +52,11 @@
  
  clean:
  	rm -rf */*.o */*.d bin/* deps/duktape/src-low lib lib_js/build node_modules util/dukc test/duk_crash
@@ -29,16 +29,16 @@
  	mkdir -p bin
 -	 $(LD) -o bin/low deps/mbedtls/library/*.o deps/mbedtls/crypto/library/*.o $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
 +	 $(LD) -o bin/low $(OBJECTS) $(OBJECTS_LOW) $(LDFLAGS)
- util/dukc: deps/duktape/src-low/duktape.o util/dukc.o
- 	 $(LD) -o util/dukc deps/duktape/src-low/duktape.o util/dukc.o $(LDFLAGS)
  
-@@ -109,9 +108,6 @@
- 		-DDUK_USE_SYMBOL_BUILTIN	\
+ obj_lowjs_serv: $(OBJECTS) $(OBJECTS_LOW) deps/mbedtls/programs/test/benchmark util/dukc
+ 
+@@ -115,9 +114,6 @@
  		-DDUK_USE_SECTION_B \
  		-DDUK_USE_CPP_EXCEPTIONS
--
+ 
 -deps/mbedtls/programs/test/benchmark:
 -	cd deps/mbedtls && make
- 
+-
  deps/open62541/build/bin/libopen62541.a:
  	cd deps/open62541 && rm -rf build && mkdir build
+ 	cd deps/open62541/build && cmake ..