Merge pull request #93 from SeattleMeshnet/master

cjdns: update source version and bump release

cjdns/Makefile

@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
-PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
+PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2138a1f6a94fc009958cde7b002c077a1eee929a
+PKG_SOURCE_VERSION:=55803286b9de8a935dbc86111e312c747ef78318
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)

cjdns/files/cjdns.defaults

@@ -23,7 +23,7 @@ EOF
   fi
 
   # enable auto-peering on ethernet
-  uci show network.lan | grep type=bridge >/dev/null 2>&1
+  uci show network.lan | grep bridge >/dev/null 2>&1
   if [ $? -eq 0 ]; then
     # most routers will set up an ethernet bridge for the lan
     ifname="br-lan"

cjdns/patches/010-fix-musl-build.patch

@@ -1,29 +0,0 @@
-Index: cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-===================================================================
---- cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0.orig/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-+++ cjdns-649e26c7d61ccc66c20e87e1e3d381f9ef0cfcb0/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
-@@ -18,6 +18,8 @@
- #include "util/Hex.h"
- 
- #include <unistd.h>
-+
-+#ifdef __GLIBC__
- #include <sys/sysctl.h>
- 
- static int getUUID(uint64_t output[2])
-@@ -42,6 +44,15 @@ static int get(struct RandomSeed* random
-     return 0;
- }
- 
-+#else
-+
-+static int get(struct RandomSeed* randomSeed, uint64_t output[8])
-+{
-+    return -1;
-+}
-+
-+#endif
-+
- struct RandomSeed* LinuxRandomUuidSysctlRandomSeed_new(struct Allocator* alloc)
- {
-     return Allocator_clone(alloc, (&(struct RandomSeed) {