cjdns: fix version reporting, riscv64 build and CI runtime tests

cjdns/Makefile

@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=21.1
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-v$(PKG_VERSION)?
@@ -32,13 +32,13 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cjdns
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=Routing and Redirection
-	TITLE:=Encrypted near-zero-conf mesh routing protocol
-	URL:=https://github.com/cjdelisle/cjdns
-	DEPENDS:=@!arc @IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
-		+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=Encrypted near-zero-conf mesh routing protocol
+  URL:=https://github.com/cjdelisle/cjdns
+  DEPENDS:=@!arc @!riscv64 @IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
+    +libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
 endef
 
 define Package/cjdns/description
@@ -49,12 +49,12 @@ define Package/cjdns/description
 endef
 
 define Package/cjdns-tests
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=Routing and Redirection
-	TITLE:=cjdns test cases
-	URL:=https://github.com/cjdelisle/cjdns
-	DEPENDS:=+libpthread +librt @!arc
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=cjdns test cases
+  URL:=https://github.com/cjdelisle/cjdns
+  DEPENDS:=+libpthread +librt @!arc @!riscv64
 endef
 
 define Package/cjdns-test/description
@@ -64,7 +64,7 @@ endef
 define Build/Configure
 endef
 
-PKG_DO_VARS:=CJDNS_RELEASE_VERSION=$(PKG_SOURCE_VERSION)
+PKG_DO_VARS:=CJDNS_RELEASE_VERSION=$(PKG_VERSION)
 
 ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
 PKG_DO_VARS+= Seccomp_NO=1

cjdns/test-version.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# shellcheck shell=busybox
+
+case "$PKG_NAME" in
+cjdns)
+	# cjdroute crashes on some of the emulated CI targets (i386 and
+	# arm) long before it prints anything, so it cannot be executed
+	# here. Check that the packaged version is the one compiled into
+	# the binary, which is what `cjdroute --version` reports.
+	strings /usr/sbin/cjdroute | grep -F "$PKG_VERSION"
+	;;
+
+cjdns-tests)
+	# The test binary does not provide version information
+	exit 0
+	;;
+
+*)
+	echo "Untested package: $PKG_NAME" >&2
+	exit 1
+	;;
+esac