From b181fb133471a25d29f3a6a1b8d0b1a2f6eff97e Mon Sep 17 00:00:00 2001 From: William Fleurant Date: Sat, 18 Jun 2022 17:23:13 +0200 Subject: [PATCH] cjdns: bump source from v21 to v21.1 Signed-off-by: William Fleurant --- cjdns/Makefile | 6 +++--- cjdns/patches/001-five-mins-builder-zonk.patch | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cjdns/Makefile b/cjdns/Makefile index 61ecf92..d69386e 100644 --- a/cjdns/Makefile +++ b/cjdns/Makefile @@ -17,12 +17,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cjdns -PKG_VERSION:=v21 -PKG_RELEASE:=3 +PKG_VERSION:=v21.1 +PKG_RELEASE:=1 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 diff --git a/cjdns/patches/001-five-mins-builder-zonk.patch b/cjdns/patches/001-five-mins-builder-zonk.patch index 3128fb8..607582e 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, fileName, callback, thisObj) { + 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) { +