X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=blobdiff_plain;f=cjdns%2FMakefile;h=2674c457c8f63c9c587f82a1b1491239aa0d8e6d;hp=6f7a6af1562130b58d64577fe5c59dab4a62f04f;hb=79a4543cf047b143e9c7df6f78aadd6803c35953;hpb=72276f4ca6303ca590a51400c0e5d7ede699dc09

diff --git a/cjdns/Makefile b/cjdns/Makefile
index 6f7a6af..2674c45 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -17,12 +17,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
-PKG_VERSION:=0.17
+PKG_VERSION:=20.4
 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:=1cf53a812a9b19e5ce883c16d40ac183f61d43f6
+PKG_SOURCE_VERSION:=45cdd8b3eebb18b6239feeef3b787e40d773edfb
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -36,9 +36,9 @@ define Package/cjdns
 	CATEGORY:=Network
 	SUBMENU:=Routing and Redirection
 	TITLE:=Encrypted near-zero-conf mesh routing protocol
-	URL:=https://github.com/hyperboria/cjdns
-	MAINTAINER:=Lars Gierth <larsg@systemli.org>
-	DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
+	URL:=https://github.com/cjdelisle/cjdns
+	MAINTAINER:=William Fleurant <meshnet@protonmail.com>
+	DEPENDS:=@!arc @IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
 		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 
@@ -54,9 +54,9 @@ 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
+	DEPENDS:=+libpthread +librt @!arc
 endef
 
 define Package/cjdns-test/description
@@ -66,7 +66,7 @@ endef
 define Build/Configure
 endef
 
-PKG_DO_VARS:=
+PKG_DO_VARS:=CJDNS_RELEASE_VERSION=$(PKG_SOURCE_VERSION)
 
 ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
 PKG_DO_VARS+= Seccomp_NO=1
@@ -77,18 +77,21 @@ PKG_DO_VARS+= UCLIBC=1
 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)" \
 	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
 	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