OpenWrt/coolsnowwolf-routing
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/routing synced 2025-01-08 11:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

cjdns: bump version

Browse Source
This commit is contained in:
coolsnowwolf 2022-12-15 13:30:22 +08:00
parent 5437d2c91f
commit 160eae1216
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cjdns/Makefile
View File

@ -17,12 +17,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cjdns PKG_NAME:=cjdns
PKG_VERSION:=v21 PKG_VERSION:=v21.1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com> PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
@ -81,7 +81,7 @@ define Build/Compile
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
AR="$(TARGET_AR)" \ AR="$(TARGET_AR)" \
RANLIB="$(TARGET_RANLIB)" \ RANLIB="$(TARGET_RANLIB)" \
CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -Wno-error=array-bounds -Wno-error=stringop-overflow" \ CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -Wno-error=array-bounds -Wno-error=stringop-overflow -Wno-error=stringop-overread" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
SYSTEM="linux" \ SYSTEM="linux" \
TARGET_ARCH="$(CONFIG_ARCH)" \ TARGET_ARCH="$(CONFIG_ARCH)" \

4
cjdns/lua/cjdns/uci.lua
View File

@ -53,6 +53,10 @@ function UCI.get()
obj.router.interface.tunDevice = config.tun_device obj.router.interface.tunDevice = config.tun_device
end end
cursor:foreach("cjdns", "supernodes", function(supernodes)
table.insert(obj.router.supernodes, supernodes.public_key)
end)
for i,section in pairs(obj.security) do for i,section in pairs(obj.security) do
if type(section.seccomp) == "number" then if type(section.seccomp) == "number" then
obj.security[i].seccomp = tonumber(config.seccomp) obj.security[i].seccomp = tonumber(config.seccomp)

10
cjdns/patches/001-five-mins-builder-zonk.patch
View File

@ -1,13 +1,13 @@
--- a/node_build/builder.js --- a/node_build/builder.js
+++ b/node_build/builder.js +++ b/node_build/builder.js
@@ -215,8 +215,8 @@ var execJs = function (js, builder, file @@ -277,8 +277,8 @@ const execJs = function (js, ctx, file,
js = qs.join("'"); 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 + "]"); - throw new Error("Inline JS did not return after 120 seconds [" + js + "]");
- }, 120000); - }, 120000);
+ throw new Error("Inline JS did not return after 5 minutes [" + js + "]"); + throw new Error("Inline JS did not return after 5 minutes [" + js + "]");
+ }, 300000); + }, 300000);
var REQUIRE = function (str) { nThen(function (waitFor) {
if (typeof(str) !== 'string') {

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

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

11
cjdns/patches/020-prefer-python2.patch Normal file
View File

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