cjdns: update source version and bump release
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>
This commit is contained in:
parent
2a6a5d6084
commit
aedfe045da
2 changed files with 3 additions and 32 deletions
|
@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=cjdns
|
PKG_NAME:=cjdns
|
||||||
PKG_VERSION:=0.16
|
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_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=2138a1f6a94fc009958cde7b002c077a1eee929a
|
PKG_SOURCE_VERSION:=55803286b9de8a935dbc86111e312c747ef78318
|
||||||
PKG_LICENSE:=GPL-3.0
|
PKG_LICENSE:=GPL-3.0
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||||
|
|
|
@ -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) {
|
|
Loading…
Reference in a new issue