cjdns: update source version and bump release 93/head
authorLars Gierth <larsg@systemli.org>
Thu, 23 Apr 2015 02:33:13 +0000 (04:33 +0200)
committerDaniel Golle <daniel@makrotopia.org>
Mon, 27 Apr 2015 12:41:29 +0000 (14:41 +0200)
Use hyperboria/cjdns source and squash changes from meshbox:
422062d cjdns: update source version
17fedb6 cjdns: bump release
bc113ec cjdns: remove musl patch

This includes fixes to build on aarch64 and mips64 targets.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
cjdns/Makefile
cjdns/patches/010-fix-musl-build.patch [deleted file]

index 9744d7b..ca9d704 100644 (file)
@@ -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/patches/010-fix-musl-build.patch b/cjdns/patches/010-fix-musl-build.patch
deleted file mode 100644 (file)
index aa5648d..0000000
+++ /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) {