Merge pull request #13752 from TDT-AG/pr/20201023-xinetd

xinetd: some changes

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
@@ -41,6 +41,7 @@ endef
 
 define Package/xinetd/conffiles
 /etc/config/xinetd
+/etc/xinetd.d
 endef
 
 TARGET_CFLAGS += -DNO_RPC

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

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'