From 65c49f00304384eaac31c931f156f99709dd99ee Mon Sep 17 00:00:00 2001 From: Helge Mader Date: Fri, 23 Oct 2020 11:08:25 +0200 Subject: [PATCH 1/4] xinetd: update PKG_RELEASE to 9 Signed-off-by: Helge Mader --- net/xinetd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index f38965317..f318f6291 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xinetd PKG_VERSION:=2.3.15 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive From 4a3e547f5d665aa0760b7ca452cc12d3d2a51bc4 Mon Sep 17 00:00:00 2001 From: Helge Mader Date: Fri, 23 Oct 2020 10:29:42 +0200 Subject: [PATCH 2/4] xinetd: save configurations in /etc/xinetd.d on sysupgrade For applications writing their own xinetd configuration to the /etc/xinetd.d directory it would be necessary to save them (e.g. a user edits them manually) Signed-off-by: Helge Mader --- net/xinetd/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index f318f6291..84f915307 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -41,6 +41,7 @@ endef define Package/xinetd/conffiles /etc/config/xinetd +/etc/xinetd.d endef TARGET_CFLAGS += -DNO_RPC From 90ab809f7fff43bcd20b5a72c7dc8f2f95951153 Mon Sep 17 00:00:00 2001 From: Helge Mader Date: Fri, 23 Oct 2020 10:15:03 +0200 Subject: [PATCH 3/4] xinetd: include additional (runtime) directory in configuration file The additional directory is created and can be used e.g. for configurations which are created e.g. dynamically from an uci config. Signed-off-by: Helge Mader --- net/xinetd/files/xinetd.init | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init index 188dcfcc6..207122381 100644 --- a/net/xinetd/files/xinetd.init +++ b/net/xinetd/files/xinetd.init @@ -12,6 +12,7 @@ PIDFILE="/var/run/xinetd.pid" CONF_FILE="/etc/config/xinetd" GENERATED_CONF_FILE="/var/run/xinetd.conf" +OTHER_CONF_DIR="/tmp/xinetd.d" ServiceEntry="false" ListName="" @@ -101,11 +102,14 @@ generate_config() { echo "}" >> $GENERATED_CONF_FILE echo "" >> $GENERATED_CONF_FILE echo "includedir /etc/xinetd.d" >> $GENERATED_CONF_FILE + echo "includedir $OTHER_CONF_DIR" >> $GENERATED_CONF_FILE config_load xinetd } start_service() { + mkdir -p $OTHER_CONF_DIR + generate_config procd_open_instance From 2bba943e99b4abfcaed1d7a12e3e287016d36f8e Mon Sep 17 00:00:00 2001 From: Helge Mader Date: Fri, 23 Oct 2020 09:40:45 +0200 Subject: [PATCH 4/4] xinetd: update config sample to latest requirements Signed-off-by: Helge Mader --- net/xinetd/files/xinetd.uci.conf.sample | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/xinetd/files/xinetd.uci.conf.sample b/net/xinetd/files/xinetd.uci.conf.sample index 4988a895d..13bce5373 100644 --- a/net/xinetd/files/xinetd.uci.conf.sample +++ b/net/xinetd/files/xinetd.uci.conf.sample @@ -2,10 +2,12 @@ # option type 'UNLISTED' # option port '6556' # option socket_type 'stream' -# option protocol 'tcp' -# option wait 'no' +# option protocol 'tcp' +# option wait 'no' # option user 'root' # option server '/usr/bin/check_mk_agent' -# option log_on_success '' -# option only_from '127.0.0.1' -# option disable 'no' +# list only_from '127.0.0.1' +# list only_from '1.1.1.1' +# list log_on_success 'PID' +# list log_on_success 'HOST' +# option disable 'no'