From 0907cf0a94085cd5b13a1bb8adf74c7588316852 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 10 Dec 2020 19:07:44 -0800
Subject: [PATCH] cjdns: update to 21

Fixed compilation with musl 1.2.x , mostly.

Added a patch fixing compilation on 32-bit platforms.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 cjdns/Makefile                                 |  6 +++---
 cjdns/patches/001-five-mins-builder-zonk.patch |  8 ++++----
 cjdns/patches/010-musl-12x.patch               | 11 +++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 cjdns/patches/010-musl-12x.patch

diff --git a/cjdns/Makefile b/cjdns/Makefile
index e9def01..ae5fdb3 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -17,13 +17,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
-PKG_VERSION:=v20.4
-PKG_RELEASE:=3
+PKG_VERSION:=v21
+PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
-PKG_MIRROR_HASH:=5e0036660626c3acf0050cf2e47aa87d262474184efb9d69538dbab4512113f8
+PKG_MIRROR_HASH:=ee22f5a94b56ac75ff8e3bc7bfaa70c45985c3dcf2a260c03e7754f4102da46a
 
 PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/cjdns/patches/001-five-mins-builder-zonk.patch b/cjdns/patches/001-five-mins-builder-zonk.patch
index afd2d45..3128fb8 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
-@@ -203,8 +203,8 @@
-     // # 74 "./wire/Message.h"
-     js = js.replace(/\n#.*\n/g, '');
+@@ -215,8 +215,8 @@ var execJs = function (js, builder, file
+     js = qs.join("'");
+ 
      var 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') {
diff --git a/cjdns/patches/010-musl-12x.patch b/cjdns/patches/010-musl-12x.patch
new file mode 100644
index 0000000..d82a144
--- /dev/null
+++ b/cjdns/patches/010-musl-12x.patch
@@ -0,0 +1,11 @@
+--- 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,
-- 
2.30.2