From 8d9408daf60c705c26242efac17610fcd67e49b9 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Wed, 28 Sep 2016 19:06:47 +0200
Subject: [PATCH] inetutils: fix paths in xinetd config.

Closes #4658.
---
 srcpkgs/inetutils/files/rexec.xinetd  | 2 +-
 srcpkgs/inetutils/files/rlogin.xinetd | 2 +-
 srcpkgs/inetutils/files/rsh.xinetd    | 2 +-
 srcpkgs/inetutils/files/talk.xinetd   | 2 +-
 srcpkgs/inetutils/files/telnet.xinetd | 2 +-
 srcpkgs/inetutils/files/tftp.xinetd   | 5 +++--
 srcpkgs/inetutils/files/uucp.xinetd   | 2 +-
 srcpkgs/inetutils/template            | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/inetutils/files/rexec.xinetd b/srcpkgs/inetutils/files/rexec.xinetd
index e893f1dbab5..a60b6812583 100644
--- a/srcpkgs/inetutils/files/rexec.xinetd
+++ b/srcpkgs/inetutils/files/rexec.xinetd
@@ -4,7 +4,7 @@ service exec
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/libexec/rexecd
+        server                  = /usr/bin/rexecd
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/srcpkgs/inetutils/files/rlogin.xinetd b/srcpkgs/inetutils/files/rlogin.xinetd
index 26550380da2..bffdb90116d 100644
--- a/srcpkgs/inetutils/files/rlogin.xinetd
+++ b/srcpkgs/inetutils/files/rlogin.xinetd
@@ -4,7 +4,7 @@ service login
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/libexec/rlogind
+        server                  = /usr/bin/rlogind
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/srcpkgs/inetutils/files/rsh.xinetd b/srcpkgs/inetutils/files/rsh.xinetd
index c8179789716..c8848ce7f84 100644
--- a/srcpkgs/inetutils/files/rsh.xinetd
+++ b/srcpkgs/inetutils/files/rsh.xinetd
@@ -4,7 +4,7 @@ service shell
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/libexec/rshd
+        server                  = /usr/bin/rshd
         log_on_failure          += USERID
         disable                 = yes
 }
diff --git a/srcpkgs/inetutils/files/talk.xinetd b/srcpkgs/inetutils/files/talk.xinetd
index b1e9968812a..b62e563107a 100644
--- a/srcpkgs/inetutils/files/talk.xinetd
+++ b/srcpkgs/inetutils/files/talk.xinetd
@@ -4,7 +4,7 @@ service ntalk
 	socket_type		= dgram
 	wait			= yes
 	user			= root
-	server			= /usr/libexec/talkd
+	server			= /usr/bin/talkd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/srcpkgs/inetutils/files/telnet.xinetd b/srcpkgs/inetutils/files/telnet.xinetd
index a7a9cf7d310..c56f339851e 100644
--- a/srcpkgs/inetutils/files/telnet.xinetd
+++ b/srcpkgs/inetutils/files/telnet.xinetd
@@ -4,7 +4,7 @@ service telnet
 	socket_type		= stream
 	wait			= no
 	user			= root
-	server			= /usr/libexec/telnetd
+	server			= /usr/bin/telnetd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/srcpkgs/inetutils/files/tftp.xinetd b/srcpkgs/inetutils/files/tftp.xinetd
index 72f5616ce6c..8a7c12dc967 100644
--- a/srcpkgs/inetutils/files/tftp.xinetd
+++ b/srcpkgs/inetutils/files/tftp.xinetd
@@ -1,10 +1,11 @@
 service tftp
 {
 	flags			= REUSE
-	socket_type		= stream
+	socket_type		= dgram
 	wait			= no
 	user			= root
-	server			= /usr/libexec/tftpd
+	server			= /usr/bin/tftpd
+#	server_args 		= -l --secure-dir=/var/lib/tftp /
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/srcpkgs/inetutils/files/uucp.xinetd b/srcpkgs/inetutils/files/uucp.xinetd
index bb939ecf6c5..fe9766e67d3 100644
--- a/srcpkgs/inetutils/files/uucp.xinetd
+++ b/srcpkgs/inetutils/files/uucp.xinetd
@@ -4,7 +4,7 @@ service uucp
 	socket_type		= stream
 	wait			= no
 	user			= root
-	server			= /usr/libexec/uucpd
+	server			= /usr/bin/uucpd
 	log_on_failure		+= USERID
 	disable			= yes
 }
diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 7602444457b..29e9919865f 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,7 +1,7 @@
 # Template file for 'inetutils'
 pkgname=inetutils
 version=1.9.4
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-wrap --with-pam"
 makedepends="pam-devel readline-devel"