diff options
| author | William Fleurant <meshnet@protonmail.com> | 2022-06-18 19:01:00 +0200 |
|---|---|---|
| committer | Nick Hainke <vincent@systemli.org> | 2022-06-20 23:31:17 +0200 |
| commit | 2c3cf7fbe040dc9a4c70a071e2b84df27125160b (patch) | |
| tree | fa16eb4f66dbe60d385149b9db77bcad63e43601 | |
| parent | 4b2b6b3d2b0178d254943409cfb4bdce0edbbda4 (diff) | |
cjdns: bump v21.1 and patch find-python (#883)
* cjdns: bump source from v21 to v21.1
* cjdns: bump release with patch to prefer python2
* cjdns: refresh patches and remove patch musl
Signed-off-by: William Fleurant <meshnet@protonmail.com>
(cherry picked from commit 217330bb5e7c17cc2e9f116f8a853f2e5fb86697)
Signed-off-by: Nick Hainke <vincent@systemli.org>
| -rw-r--r-- | cjdns/Makefile | 4 | ||||
| -rw-r--r-- | cjdns/patches/001-five-mins-builder-zonk.patch | 10 | ||||
| -rw-r--r-- | cjdns/patches/010-musl-12x.patch | 11 | ||||
| -rw-r--r-- | cjdns/patches/020-prefer-python2.patch | 11 |
4 files changed, 18 insertions, 18 deletions
diff --git a/cjdns/Makefile b/cjdns/Makefile index 61ecf92..b926bc7 100644 --- a/cjdns/Makefile +++ b/cjdns/Makefile @@ -17,12 +17,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cjdns -PKG_VERSION:=v21 +PKG_VERSION:=v21.1 PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? -PKG_HASH:=6dfb1fe18c9689324f36c8d33e660972aac5af4579fcaa9c4730179bc8d67c69 +PKG_HASH:=a6158ce7847159aa44e86f74ccc7b6ded6910a230ed8f3830db53cda5838f0b0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com> diff --git a/cjdns/patches/001-five-mins-builder-zonk.patch b/cjdns/patches/001-five-mins-builder-zonk.patch index 3128fb8..c53c62f 100644 --- a/cjdns/patches/001-five-mins-builder-zonk.patch +++ b/cjdns/patches/001-five-mins-builder-zonk.patch @@ -1,13 +1,13 @@ --- a/node_build/builder.js +++ b/node_build/builder.js -@@ -215,8 +215,8 @@ var execJs = function (js, builder, file - js = qs.join("'"); +@@ -277,8 +277,8 @@ const execJs = function (js, ctx, file, + js = '"use strict";' + qs.join("'"); - var to = setTimeout(function () { + const to = setTimeout(function () { - throw new Error("Inline JS did not return after 120 seconds [" + js + "]"); - }, 120000); + throw new Error("Inline JS did not return after 5 minutes [" + js + "]"); + }, 300000); - var REQUIRE = function (str) { - if (typeof(str) !== 'string') { + nThen(function (waitFor) { + diff --git a/cjdns/patches/010-musl-12x.patch b/cjdns/patches/010-musl-12x.patch deleted file mode 100644 index d82a144..0000000 --- a/cjdns/patches/010-musl-12x.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/memory/Allocator.c -+++ b/memory/Allocator.c -@@ -57,7 +57,7 @@ static void unroll(struct Allocator_pvt* - struct Allocator_Allocation_pvt* allocation = context->allocations; - while (allocation && includeAllocations) { - writeUnroller(&childUnroller); -- fprintf(stderr, "%s:%ld [%lu] bytes at [0x%lx]\n", -+ fprintf(stderr, "%s:%tu [%tu] bytes at [0x%lx]\n", - allocation->fileName, - allocation->lineNum, - allocation->pub.size, diff --git a/cjdns/patches/020-prefer-python2.patch b/cjdns/patches/020-prefer-python2.patch new file mode 100644 index 0000000..5bb8624 --- /dev/null +++ b/cjdns/patches/020-prefer-python2.patch @@ -0,0 +1,11 @@ +--- a/node_build/FindPython.js ++++ b/node_build/FindPython.js +@@ -23,7 +23,7 @@ var Fs = require('fs'); + // de-prioritize because the testing script accepts ANY python3 version + // (as of this writing, we don't know what python3 versions actually work) + // whereas we know that python2.7 is the only working python2 version. +-var PYTHONS = ["python3.7", "python3", "python2.7", "python2", "python"]; ++var PYTHONS = ["python2", "python2.7", "python3.7", "python3.8", "python3.9", "python3"] + + var SCRIPT = [ + 'import sys', |