From 85b868b3413a29da0bd6ecd3518c2d34a6ffb788 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 17 Jun 2025 13:53:59 +0200 Subject: [PATCH] hnetd: remove it as the development is stalled Development of hnetd is stalled [1]. Last commit in the upstream repository is 7 years ago and currently, hnetd is not compiled in snapshot builds due to errors from GCC 14 [2] [1] https://github.com/sbyx/hnetd/issues/67 [2] https://github.com/openwrt/routing/issues/1119 Signed-off-by: Josef Schlehofer --- hnetd/Makefile | 165 --------------------- hnetd/files/hnet.config | 29 ---- hnetd/files/hnetd.defaults | 12 -- hnetd/files/hnetd.init | 127 ---------------- hnetd/patches/010-openssl-deprecated.patch | 43 ------ hnetd/patches/020-unused.patch | 10 -- 6 files changed, 386 deletions(-) delete mode 100644 hnetd/Makefile delete mode 100644 hnetd/files/hnet.config delete mode 100644 hnetd/files/hnetd.defaults delete mode 100644 hnetd/files/hnetd.init delete mode 100644 hnetd/patches/010-openssl-deprecated.patch delete mode 100644 hnetd/patches/020-unused.patch diff --git a/hnetd/Makefile b/hnetd/Makefile deleted file mode 100644 index 9adcc68..0000000 --- a/hnetd/Makefile +++ /dev/null @@ -1,165 +0,0 @@ -# -# Copyright (C) 2012-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=hnetd -PKG_SOURCE_DATE:=2018-12-21 -PKG_SOURCE_VERSION:=c43766610ed30194b048bc070a3c433aec731c40 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/sbyx/hnetd -PKG_MIRROR_HASH:=3b3bfff16b99dfd23b74932ac6a74af18cb9f8fd029980f1bd3788ddfb0414bb - -PKG_MAINTAINER:=Steven Barth -PKG_LICENSE:=GPL-2.0-only -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -# Spammy debug builds for now -CMAKE_OPTIONS += -DL_LEVEL=7 - -# OpenWRT target -CMAKE_OPTIONS += -DBACKEND=openwrt - -ifeq ($(BUILD_VARIANT),openssl) -CMAKE_OPTIONS += -DDTLS_OPENSSL=1 -endif - -define Package/hnetd/Default - SECTION:=net - CATEGORY:=Network - TITLE:=HNCP Homenet daemon - $(2) - URL:=https://github.com/sbyx/hnetd - DEPENDS:=+odhcpd +odhcp6c +netifd $(3) - DEPENDS+=@IPV6 - VARIANT:=$1 -endef - -Package/hnetd-nossl=$(call Package/hnetd/Default,nossl,no authentication) -Package/hnetd-openssl=$(call Package/hnetd/Default,openssl,authentication via OpenSSL,+libopenssl) - -define Package/hnet-full - SECTION:=net - CATEGORY:=Network - TITLE:=HNCP Homenet metapackage - URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-nossl +luci-app-hnet +ip - # Routing - DEPENDS+=+babeld - # Service discovery - DEPENDS+=+ohybridproxy +zonestitcher - # Distributed PCP support - DEPENDS+=+miniupnpd +minimalist-pcproxy -endef - -define Package/hnet-full-secure - SECTION:=net - CATEGORY:=Network - TITLE:=HNCP Homenet metapackage (w/ SSL) - URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-openssl +luci-app-hnet +ip - # Routing - DEPENDS+=+babeld - # Service discovery - DEPENDS+=+ohybridproxy +zonestitcher - # Distributed PCP support - DEPENDS+=+miniupnpd +minimalist-pcproxy -endef - -define Package/hnet-full-l2tp - SECTION:=net - CATEGORY:=Network - TITLE:=HNCP Homenet metapackage (w/ L2TP) - URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-nossl +luci-app-hnet +ip-full +kmod-l2tp-eth - # Routing - DEPENDS+=+babeld - # Service discovery - DEPENDS+=+ohybridproxy +zonestitcher - # Distributed PCP support - DEPENDS+=+miniupnpd +minimalist-pcproxy -endef - -define Package/luci-app-hnet - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=HNCP Homenet configuration and visualization -# DEPENDS:=+hnetd -# TBD - how to express dependency on 'some' hnetd? -endef - -define Package/hnetd-$(BUILD_VARIANT)/description -This package provides a daemon which implementats distributed prefix assignment -and service discovery for a home network consisting of multiple routers -connected to multiple service providers. It provides a netifd protocol "hnet" -for use in /etc/config/network. -endef - -define Package/hnetd-$(BUILD_VARIANT)/install - $(INSTALL_DIR) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hnetd $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/lib/netifd/proto - $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/hnet.sh $(1)/lib/netifd/proto - ln -s hnetd $(1)/usr/sbin/hnet-ifresolve - ln -s hnetd $(1)/usr/sbin/hnet-trust - ln -s hnetd $(1)/usr/sbin/hnet-dump - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/hnetd.init $(1)/etc/init.d/hnetd - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/hnet.config $(1)/etc/config/hnet - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ohp.script $(1)/usr/sbin/hnetd-ohp-script - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ddz.script $(1)/usr/sbin/hnetd-ddz-script - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/pcp.script $(1)/usr/sbin/hnetd-pcp-script - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/hnetd-routing $(1)/usr/sbin/hnetd-routing - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/hnetd.defaults $(1)/etc/uci-defaults/x-hnetd.defaults - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/multicast.script $(1)/usr/sbin/hnet-multicast - $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/autowifi.script $(1)/usr/sbin/autowifi -endef - -define Package/hnet-full/install - true -endef - -define Package/hnet-full-secure/install - true -endef - -define Package/hnet-full-l2tp/install - $(INSTALL_DIR) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/tunnel.script $(1)/usr/sbin/hnetd-tunnel -endef - -define Package/luci-app-hnet/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci - $(INSTALL_DIR) $(1)/www - $(CP) -R $(PKG_BUILD_DIR)/openwrt/luci/luasrc/* $(1)/usr/lib/lua/luci/ - $(CP) -R $(PKG_BUILD_DIR)/openwrt/luci/htdocs/* $(1)/www/ -endef - -define Package/hnetd-$(BUILD_VARIANT)/postinst -#!/bin/sh -[ -n "$${IPKG_INSTROOT}" ] || { - (. /etc/uci-defaults/x-hnetd.defaults) && rm -f /etc/uci-defaults/x-hnetd.defaults - [ -x /etc/init.d/dnsmasq ] && /etc/init.d/dnsmasq restart - /etc/init.d/hnetd enable - /etc/init.d/hnetd start -} -endef - -$(eval $(call BuildPackage,hnetd-nossl)) -$(eval $(call BuildPackage,hnetd-openssl)) -$(eval $(call BuildPackage,hnet-full)) -$(eval $(call BuildPackage,hnet-full-secure)) -$(eval $(call BuildPackage,hnet-full-l2tp)) -$(eval $(call BuildPackage,luci-app-hnet)) diff --git a/hnetd/files/hnet.config b/hnetd/files/hnet.config deleted file mode 100644 index f2a7ab7..0000000 --- a/hnetd/files/hnet.config +++ /dev/null @@ -1,29 +0,0 @@ -config security security -# Simplest security mode: -# option password foo -# Trust consensus and CA-based share these options: -# option certificate_file /etc/hnetd-cert.pem -# option private_key_file /etc/hnetd-key.pem -# Then to enable trust consensus: -# option trust_store /etc/hnetd-trust.dat -# Or CA-based authentication: -# option trust_certificate_file /etc/ca-cert.pem - -config pa pa -# option ip4prefix 10.0.0.0/8 -# option ip4mode ifuplink -# option ulaprefix fd12:3456:789A::/48 -# option ulamode off - option persistent_store /etc/hnet-pa.store - -config sd sd -# option router_name openwrt -# option domain_name home. - - -# Wifi allows for very basic wifi autoconfiguration -# Warning: This feature is unstable -config wifi wifi -# option enable 0 -# option ssid ssidtest -# option password test diff --git a/hnetd/files/hnetd.defaults b/hnetd/files/hnetd.defaults deleted file mode 100644 index 5ca7388..0000000 --- a/hnetd/files/hnetd.defaults +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Why we tune dnsmasq? -# localservice=0 => other hnetd instances can query for local names -# boguspriv=0 => allow reverse resolution of RFC1918 w/o local hosts entries - -uci batch <psk); - d->psk = malloc(psk_len); - if (!d->psk) -@@ -1011,6 +1014,9 @@ bool dtls_set_psk(dtls d, const char *ps - SSL_CTX_set_psk_client_callback(d->ssl_client_ctx, _client_psk); - SSL_CTX_set_psk_server_callback(d->ssl_server_ctx, _server_psk); - return true; -+#else -+ return false; -+#endif - } - - bool dtls_cert_to_pem_buf(dtls_cert cert, char *buf, int buf_len) diff --git a/hnetd/patches/020-unused.patch b/hnetd/patches/020-unused.patch deleted file mode 100644 index 28b35a4..0000000 --- a/hnetd/patches/020-unused.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/hnetd.h -+++ b/src/hnetd.h -@@ -39,6 +39,7 @@ - - #endif /* __APPLE__ */ - -+#undef __unused - #include - #include - #include -- 2.30.2