From 066ac03921b73695a260965cf6e72ef0a3b85929 Mon Sep 17 00:00:00 2001 From: Alexey Dobrovolsky Date: Mon, 14 Sep 2020 00:32:08 +0300 Subject: [PATCH 1/2] freeradius3: enable radtest utility radtest utility is used in many manuals to check the operation of radius server. At the moment all parameters must be specified at startup, for example: $ radtest bob hello localhost 0 testing123 0 localhost (backported from commit 6480acd) Signed-off-by: Alexey Dobrovolsky --- net/freeradius3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index eddd02b68..7ccaed06b 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius3 PKG_VERSION:=release_3_0_21 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/archive @@ -754,7 +754,7 @@ endef define Package/freeradius3-utils/install $(INSTALL_DIR) $(1)/usr/bin - for f in radclient radeapclient radwho; do \ + for f in radclient radeapclient radtest radwho; do \ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \ done endef From 2d410422c5c02b4079c3a98dcdb996e938d1af74 Mon Sep 17 00:00:00 2001 From: Alexey Dobrovolsky Date: Mon, 14 Sep 2020 01:36:30 +0300 Subject: [PATCH 2/2] freeradius3: fix hostname invocation in radtest Canonical radtest start results in an error: $ radtest bob hello localhost 0 testing123 /usr/bin/radtest: line 1: hostname: not found (0) Error parsing "stdin": Failed to get value hostname command is not present in OpenWrt. Instead, hostname can be obtained from file /proc/sys/kernel/hostname. added: 005-get-hostname-from-proc-in-radtest.patch (backported from commit 8b2792a) Signed-off-by: Alexey Dobrovolsky --- net/freeradius3/Makefile | 2 +- .../005-get-hostname-from-proc-in-radtest.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 net/freeradius3/patches/005-get-hostname-from-proc-in-radtest.patch diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 7ccaed06b..e13e8db87 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius3 PKG_VERSION:=release_3_0_21 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/archive diff --git a/net/freeradius3/patches/005-get-hostname-from-proc-in-radtest.patch b/net/freeradius3/patches/005-get-hostname-from-proc-in-radtest.patch new file mode 100644 index 000000000..c3f368e24 --- /dev/null +++ b/net/freeradius3/patches/005-get-hostname-from-proc-in-radtest.patch @@ -0,0 +1,12 @@ +--- a/src/main/radtest.in ++++ b/src/main/radtest.in +@@ -112,7 +112,7 @@ if [ "$7" ] + then + nas=$7 + else +- nas=`hostname` ++ nas=$(cat /proc/sys/kernel/hostname) + fi + + ( +