Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cjdns: update to version 0.20

Browse source 
Signed-off-by: Alexander Krupenkin <mail@akru.me>
This commit is contained in:
Moritz Warning 2017-12-16 02:31:59 +01:00 committed by Alexander Krupenkin
commit 5bc404ccc1
No known key found for this signature in database
GPG key ID: 0D0A7FA67911873E
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cjdns/Makefile
View file

@ -17,12 +17,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cjdns PKG_NAME:=cjdns
PKG_VERSION:=0.17 PKG_VERSION:=0.20
PKG_RELEASE:=3 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_PROTO:=git
PKG_SOURCE_VERSION:=40e87d9419c19063e772e39c7c59a8a8771c5ee8 PKG_SOURCE_VERSION:=efd7d7f82be405fe47f6806b6cc9c0043885bc2e
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)
@ -36,7 +36,7 @@ define Package/cjdns
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
TITLE:=Encrypted near-zero-conf mesh routing protocol TITLE:=Encrypted near-zero-conf mesh routing protocol
URL:=https://github.com/hyperboria/cjdns URL:=https://github.com/cjdelisle/cjdns
MAINTAINER:=Lars Gierth <larsg@systemli.org> MAINTAINER:=Lars Gierth <larsg@systemli.org>
DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \ DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2 +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
@ -54,7 +54,7 @@ define Package/cjdns-tests
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
TITLE:=cjdns test cases TITLE:=cjdns test cases
URL:=https://github.com/hyperboria/cjdns URL:=https://github.com/cjdelisle/cjdns
MAINTAINER:=Lars Gierth <larsg@systemli.org> MAINTAINER:=Lars Gierth <larsg@systemli.org>
DEPENDS:=+libpthread +librt DEPENDS:=+libpthread +librt
endef endef
@ -78,6 +78,7 @@ endif
define Build/Compile define Build/Compile
$(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp $(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
(cd $(PKG_BUILD_DIR) && \
CROSS="true" \ CROSS="true" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
AR="$(TARGET_AR)" \ AR="$(TARGET_AR)" \
@ -90,7 +91,7 @@ define Build/Compile
GYP_ADDITIONAL_ARGS="-f make-linux" \ GYP_ADDITIONAL_ARGS="-f make-linux" \
CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \ CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \
$(PKG_DO_VARS) \ $(PKG_DO_VARS) \
$(PKG_BUILD_DIR)/do exec ./do)
endef endef
define Package/cjdns/install define Package/cjdns/install

1
cjdns/lua/cjdns/uci.lua
View file

@ -19,6 +19,7 @@ function UCI.defaults()
{ setupComplete = 1 } { setupComplete = 1 }
}, },
router = { router = {
supernodes = {},
ipTunnel = { outgoingConnections = {}, allowedConnections = {} }, ipTunnel = { outgoingConnections = {}, allowedConnections = {} },
interface = { type = "TUNInterface" } interface = { type = "TUNInterface" }
}, },

2
mcproxy/patches/0001-add-cmake.patch
View file

@ -7,7 +7,7 @@
+project(mcproxy CXX) +project(mcproxy CXX)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11")
+add_definitions(-Wall -Wextra -pedantic) +add_definitions(-Wall -Wextra)
+include_directories(${CMAKE_SOURCE_DIR}/mcproxy) +include_directories(${CMAKE_SOURCE_DIR}/mcproxy)
+ +
+ +