gentoo resync : 05.12.2021

2 files changed, 8 insertions, 19 deletions

diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index 18345b95f757..c7e39037063d 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,5 +1,5 @@
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
-AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f94a5a4c729d7be49e8ef3cfca2fcefa49769ba98e5c53b743dfe67b58ae1189ec8d75e957716fa1 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3
+AUX ser2net.initd 1254 BLAKE2B dcd9efd5588661e91baf9f80dde20787345e3ea7be9fc0d01442cb1023c043a236ec88f1d8fa5e65658bc5e1134d5aa50950aa6cf9b9e954d9fafd2ccbef9019 SHA512 c7b875c4f63b217ee7d0fa7f4fc5bab20486b5c5401b90a46cf692fd3643ff9360d6004ace28d79d5dffd8c1aab6b24445045ce8dd785c19965033e28f784bd1
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
 EBUILD ser2net-2.10.0-r1.ebuild 620 BLAKE2B ca674be4338a1086172eec784ae9250a524ba4db3ad10eec03ea219b52d03b5a4c88797f2c2877bc71aa088ec0318caa1173eaa397946962da82e30d923dba81 SHA512 a0b220160c3bdcdc60b8ab42f588d9b1aec94f706b0cb931c328ae336861ebea697051a98539681126b6effee939ae2448b1dc634c1ffa72b2534a3840ab1339
 MISC metadata.xml 245 BLAKE2B 283e669c2eaccbce6c5325e25d008486a91fee37eea3825d95b9659ba080b98865682e7713d1f2ccfb0b9fc4f1172dea97b8adf709582101ebe3b1dffb20f3da SHA512 01f6412344b7d183c04fe517d920e61d02ae502d820d2c41f49d3d4bdc9d76cf15429cf1dddbea33bb9d8a0c70cf2cc20d2d9a751258c41d1fe1a9aebd690ec4
diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd
index 3ce489bd1ff1..7652bc9b0350 100644
--- a/net-misc/ser2net/files/ser2net.initd
+++ b/net-misc/ser2net/files/ser2net.initd
@@ -1,22 +1,24 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Serial to network proxy (${RC_SVCNAME#*.})"
 pidfile="/var/run/${RC_SVCNAME}.pid"
 command="/usr/sbin/ser2net"
-name="${RC_SVCNAME}"
+name="${description}"
 
 extra_started_commands="reload"
 description_reload="Reread configuration file and make the appropriate changes"
-start_stop_daemon_args="--quiet --exec ${command} --name ${name} --pidfile ${pidfile}"
+start_stop_daemon_args="--quiet"
+command_args_background="-P ${pidfile}"
+command_args_foreground="-n"
 
 depend() {
 	use logger
 	need net
 }
 
-config_check() {
+start_pre() {
 	command_args="${EXTRA_OPTS}"
 	CONFIG_FILE_DEFAULT="/etc/ser2net.conf"
 
@@ -34,21 +36,8 @@ config_check() {
 	return 0
 }
 
-start() {
-	config_check || return ${?}
-	ebegin "Starting ${description}"
-	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args} -P "${pidfile}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${description}"
-	start-stop-daemon --stop ${start_stop_daemon_args}
-	eend ${?}
-}
-
 reload() {
 	ebegin "Reloading ${description}"
-	start-stop-daemon --signal HUP ${start_stop_daemon_args}
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
 	eend ${?}
 }