diff options
| author | Steven Barth | 2015-04-27 19:42:33 +0000 |
|---|---|---|
| committer | Steven Barth | 2015-04-27 19:42:33 +0000 |
| commit | 5c470234366e8c52b9c1f65ff34319aabcd94d4e (patch) | |
| tree | eec04a25f21a2a3b427e55c95cfd195c653ceaf6 | |
| parent | e693e6ac090455c61a5c85a885155704c7f2f0b4 (diff) | |
| parent | aedfe045dab2cf01f9399635d099ea4e91f92520 (diff) | |
| download | routing-5c470234366e8c52b9c1f65ff34319aabcd94d4e.tar.gz | |
Merge pull request #93 from SeattleMeshnet/master
cjdns: update source version and bump release
| -rw-r--r-- | cjdns/Makefile | 6 | ||||
| -rw-r--r-- | cjdns/files/cjdns.defaults | 2 | ||||
| -rw-r--r-- | cjdns/patches/010-fix-musl-build.patch | 29 |
3 files changed, 4 insertions, 33 deletions
diff --git a/cjdns/Makefile b/cjdns/Makefile index 9744d7b..ca9d704 100644 --- a/cjdns/Makefile +++ b/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) diff --git a/cjdns/files/cjdns.defaults b/cjdns/files/cjdns.defaults index fd48269..f6ca772 100644 --- a/cjdns/files/cjdns.defaults +++ b/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" diff --git a/cjdns/patches/010-fix-musl-build.patch b/cjdns/patches/010-fix-musl-build.patch deleted file mode 100644 index aa5648d..0000000 --- a/cjdns/patches/010-fix-musl-build.patch +++ /dev/null @@ -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) { |