From 3d9e9632d494efde746fa41113afa22de42416e4 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 10 Jul 2020 11:06:14 +0200 Subject: [PATCH 1/2] xinetd: change PKG_MAINTAINER Signed-off-by: Florian Eckert --- net/xinetd/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index a63a40b02..6e9837626 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -14,6 +14,8 @@ PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive PKG_HASH:=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 + +PKG_MAINTAINER:=Florian Eckert PKG_LICENSE:=xinetd PKG_LICENSE_FILES:=COPYRIGHT PKG_CPE_ID:=cpe:/a:xinetd:xinetd @@ -27,7 +29,6 @@ define Package/xinetd CATEGORY:=Network TITLE:=A powerful and secure super-server URL:=https://github.com/xinetd-org - PKG_MAINTAINER:=Jonathan McCrohan endef define Package/xinetd/description From eb6cb75f9f41d9288fcb608afdd99308eb63a63a Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 10 Jul 2020 08:05:41 +0200 Subject: [PATCH 2/2] xinetd: start service in foreground for procd Since we use now procd for xinetd, we have to start the service with the option `-dontfork` to make procd happy. Signed-off-by: Florian Eckert --- net/xinetd/Makefile | 2 +- net/xinetd/files/xinetd.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index 6e9837626..1adf4dae7 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:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init index 51f457594..f91a251b5 100644 --- a/net/xinetd/files/xinetd.init +++ b/net/xinetd/files/xinetd.init @@ -109,7 +109,7 @@ start_service() { generate_config procd_open_instance - procd_set_param command $PROG -f $GENERATED_CONF_FILE -pidfile $PIDFILE + procd_set_param command $PROG -dontfork -f $GENERATED_CONF_FILE -pidfile $PIDFILE procd_set_param respawn procd_close_instance }