Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cjdns: update to 21

Browse source 
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>
This commit is contained in:
Rosen Penev 2020-12-10 19:07:44 -08:00 committed by Moritz Warning
parent 4407369e70
commit 0907cf0a94
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cjdns/Makefile
View file

@ -17,13 +17,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cjdns PKG_NAME:=cjdns
PKG_VERSION:=v20.4 PKG_VERSION:=v21
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.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_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later

6
cjdns/patches/001-five-mins-builder-zonk.patch
View file

@ -1,8 +1,8 @@
--- a/node_build/builder.js --- a/node_build/builder.js
+++ b/node_build/builder.js +++ b/node_build/builder.js
@@ -203,8 +203,8 @@ @@ -215,8 +215,8 @@ var execJs = function (js, builder, file
// # 74 "./wire/Message.h" js = qs.join("'");
js = js.replace(/\n#.*\n/g, '');
var to = setTimeout(function () { var to = setTimeout(function () {
- throw new Error("Inline JS did not return after 120 seconds [" + js + "]"); - throw new Error("Inline JS did not return after 120 seconds [" + js + "]");
- }, 120000); - }, 120000);

11
cjdns/patches/010-musl-12x.patch Normal file
View file

@ -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,