From 3eb78e2dbcc2369f5b8c96a4fd1c2e15729eef26 Mon Sep 17 00:00:00 2001 From: William Fleurant Date: Sun, 3 Nov 2019 13:21:20 -0500 Subject: [PATCH] cjdns: luci-app-cjdns: fix up Makefiles, bump pkg vers Signed-off-by: William Fleurant --- cjdns/Makefile | 18 ++++++++---------- luci-app-cjdns/Makefile | 12 +++++------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/cjdns/Makefile b/cjdns/Makefile index 267c4af..28fd792 100644 --- a/cjdns/Makefile +++ b/cjdns/Makefile @@ -18,18 +18,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cjdns PKG_VERSION:=20.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git -PKG_SOURCE_PROTO:=git -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) +PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git +PKG_SOURCE_VERSION:=45cdd8b3eebb18b6239feeef3b787e40d773edfb +PKG_SOURCE_PROTO:=git PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) -include $(INCLUDE_DIR)/package.mk +PKG_MAINTAINER:=William Fleurant +PKG_LICENSE:=GPL-3.0 +include $(INCLUDE_DIR)/package.mk define Package/cjdns SECTION:=net @@ -37,7 +38,6 @@ define Package/cjdns SUBMENU:=Routing and Redirection TITLE:=Encrypted near-zero-conf mesh routing protocol URL:=https://github.com/cjdelisle/cjdns - MAINTAINER:=Lars Gierth DEPENDS:=@!arc @IPV6 +kmod-tun +libnl-tiny +libpthread +librt \ +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2 endef @@ -55,12 +55,11 @@ define Package/cjdns-tests SUBMENU:=Routing and Redirection TITLE:=cjdns test cases URL:=https://github.com/cjdelisle/cjdns - MAINTAINER:=Lars Gierth DEPENDS:=+libpthread +librt @!arc endef define Package/cjdns-test/description - cjdns test cases + Builds cjdns test cases binary test_testcjdroute_c endef define Build/Configure @@ -132,7 +131,6 @@ define Package/cjdns/postinst #!/bin/sh if [ -z $${IPKG_INSTROOT} ] ; then ( . /etc/uci-defaults/cjdns ) && rm -f /etc/uci-defaults/cjdns - # TODO: we should have an 'Enable' button instead /etc/init.d/cjdns enabled || /etc/init.d/cjdns enable exit 0 fi diff --git a/luci-app-cjdns/Makefile b/luci-app-cjdns/Makefile index 9c92151..f1260fb 100644 --- a/luci-app-cjdns/Makefile +++ b/luci-app-cjdns/Makefile @@ -18,8 +18,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-cjdns PKG_VERSION:=1.3 -PKG_RELEASE:=6 +PKG_RELEASE:=7 +PKG_MAINTAINER:=William Fleurant PKG_LICENSE:=GPL-3.0 include $(INCLUDE_DIR)/package.mk @@ -30,16 +31,13 @@ define Package/luci-app-cjdns SUBMENU:=3. Applications TITLE:=Encrypted near-zero-conf mesh routing protocol URL:=https://github.com/cjdelisle/cjdns - MAINTAINER:=Lars Gierth DEPENDS:=+cjdns +luci-base endef define Package/luci-app-cjdns/description - This package allows you to configure and inspect cjdns networking using LuCI. - - Cjdns implements an encrypted IPv6 network using public-key cryptography - for address allocation and a distributed hash table for routing. - This provides near-zero-configuration networking, and prevents many + Cjdns implements an encrypted IPv6 network using public-key cryptography \ + for address allocation and a distributed hash table for routing. \ + This provides near-zero-configuration networking, and prevents many \ of the security and scalability issues that plague existing networks. endef