From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 20 Aug 2018 03:33:50 +0000 (-0400)
Subject: update cjdns
X-Git-Tag: v1.4.5~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75ebc3179a77e80c1a59559d249f3d17c1139b31;p=librecmc%2Flibrecmc.git

update cjdns
---

diff --git a/package/network/services/cjdns/Makefile b/package/network/services/cjdns/Makefile
index 8efd2821dd..cd5ca90557 100644
--- a/package/network/services/cjdns/Makefile
+++ b/package/network/services/cjdns/Makefile
@@ -17,12 +17,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
-PKG_VERSION:=0.17
-PKG_RELEASE:=3
+PKG_VERSION:=20.2
+PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
+PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=40e87d9419c19063e772e39c7c59a8a8771c5ee8
+PKG_SOURCE_VERSION:=77259a49e5bc7ca7bc6dca5bd423e02be563bdc5
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -36,7 +36,7 @@ define Package/cjdns
 	CATEGORY:=Network
 	SUBMENU:=Routing and Redirection
 	TITLE:=Encrypted near-zero-conf mesh routing protocol
-	URL:=https://github.com/hyperboria/cjdns
+	URL:=https://github.com/cjdelisle/cjdns
 	MAINTAINER:=Lars Gierth <larsg@systemli.org>
 	DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
 		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
@@ -54,7 +54,7 @@ define Package/cjdns-tests
 	CATEGORY:=Network
 	SUBMENU:=Routing and Redirection
 	TITLE:=cjdns test cases
-	URL:=https://github.com/hyperboria/cjdns
+	URL:=https://github.com/cjdelisle/cjdns
 	MAINTAINER:=Lars Gierth <larsg@systemli.org>
 	DEPENDS:=+libpthread +librt
 endef
@@ -78,11 +78,12 @@ endif
 
 define Build/Compile
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
+	(cd $(PKG_BUILD_DIR) && \
 	CROSS="true" \
 	CC="$(TARGET_CC)" \
 	AR="$(TARGET_AR)" \
 	RANLIB="$(TARGET_RANLIB)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	SYSTEM="linux" \
 	TARGET_ARCH="$(CONFIG_ARCH)" \
@@ -90,7 +91,7 @@ define Build/Compile
 	GYP_ADDITIONAL_ARGS="-f make-linux" \
 	CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \
 	$(PKG_DO_VARS) \
-	$(PKG_BUILD_DIR)/do
+	exec ./do)
 endef
 
 define Package/cjdns/install
diff --git a/package/network/services/cjdns/lua/cjdns/uci.lua b/package/network/services/cjdns/lua/cjdns/uci.lua
index 0127f44109..f4716b772b 100644
--- a/package/network/services/cjdns/lua/cjdns/uci.lua
+++ b/package/network/services/cjdns/lua/cjdns/uci.lua
@@ -19,6 +19,7 @@ function UCI.defaults()
       { setupComplete = 1 }
     },
     router = {
+        supernodes = {},
         ipTunnel = { outgoingConnections = {}, allowedConnections = {} },
         interface = { type = "TUNInterface" }
     },