Have the daemon create a .pid file so that the init.d script can kill it and

  make the xinetd entry refer to the service auth instead of identd #50775 by
  Remco Barendse

6 files changed, 49 insertions, 8 deletions

diff --git a/net-misc/midentd/ChangeLog b/net-misc/midentd/ChangeLog
index ae690c395b12..30d866522899 100644
--- a/net-misc/midentd/ChangeLog
+++ b/net-misc/midentd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/midentd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/ChangeLog,v 1.1 2004/03/05 15:47:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/ChangeLog,v 1.2 2004/05/14 02:25:03 vapier Exp $
+
+*midentd-2.3.1-r1 (13 May 2004)
+
+  13 May 2004; Mike Frysinger <vapier@gentoo.org> +files/2.3.1-pidfile.patch,
+  +files/midentd.conf.d, files/midentd.rc, +midentd-2.3.1-r1.ebuild,
+  -midentd-2.3.1.ebuild:
+  Have the daemon create a .pid file so that the init.d script can kill it and
+  make the xinetd entry refer to the service auth instead of identd #50775 by
+  Remco Barendse
 
 *midentd-2.3.1 (05 Mar 2004)
 
diff --git a/net-misc/midentd/files/2.3.1-pidfile.patch b/net-misc/midentd/files/2.3.1-pidfile.patch
new file mode 100644
index 000000000000..248fcc08f203
--- /dev/null
+++ b/net-misc/midentd/files/2.3.1-pidfile.patch
@@ -0,0 +1,19 @@
+--- midentd.orig	2004-05-13 21:57:43.642441512 -0400
++++ midentd	2004-05-13 22:01:10.165045304 -0400
+@@ -74,6 +75,7 @@
+ 	close STDIN; open STDIN, "/dev/null";
+ 	close STDOUT; open STDOUT, ">/dev/null";
+ 	close STDERR; open STDERR, ">/dev/null";
++	open PIDFILE, ">/var/run/midentd.pid";
+ 	umask 0466;
+ 	&logger ("Daemon started, listening.");
+ 	# FIXME, maximum number of connections should be limited
+@@ -87,6 +89,8 @@
+ 	if ($< != $uid || $> != $uid) {
+ 		die "Can't change UID\n";
+ 	}
++    print PIDFILE $$;
++    close PIDFILE;
+ 	while (accept (SOCKET, SERVER)) {
+ 		$in = *SOCKET;
+ 		$out = *SOCKET;
diff --git a/net-misc/midentd/files/digest-midentd-2.3.1 b/net-misc/midentd/files/digest-midentd-2.3.1-r1
index 282110fa1437..282110fa1437 100644
--- a/net-misc/midentd/files/digest-midentd-2.3.1
+++ b/net-misc/midentd/files/digest-midentd-2.3.1-r1
diff --git a/net-misc/midentd/files/midentd.conf.d b/net-misc/midentd/files/midentd.conf.d
new file mode 100644
index 000000000000..71f0ce948fe2
--- /dev/null
+++ b/net-misc/midentd/files/midentd.conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.conf.d,v 1.1 2004/05/14 02:25:03 vapier Exp $
+
+# Options to pass to midentd
+MIDENTD_OPTS="-u nobody"
diff --git a/net-misc/midentd/files/midentd.rc b/net-misc/midentd/files/midentd.rc
index 9f8ebb2782fb..d3203aa65ca9 100644
--- a/net-misc/midentd/files/midentd.rc
+++ b/net-misc/midentd/files/midentd.rc
@@ -1,18 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.rc,v 1.1 2004/03/05 15:47:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.rc,v 1.2 2004/05/14 02:25:03 vapier Exp $
 
 start() {
 	ebegin "Starting midentd"
-	start-stop-daemon --start --quiet \
-		--pidfile /var/run/midentd.pid --exec /usr/sbin/midentd \
-		-- -u nobody -f
+	/usr/sbin/midentd ${MIDENTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping midentd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/midentd.pid
-	eend $?
+	local ret=$?
+	rm -f /var/run/midentd.pid
+	eend ${ret}
 }
diff --git a/net-misc/midentd/midentd-2.3.1.ebuild b/net-misc/midentd/midentd-2.3.1-r1.ebuild
index c7212590b35e..842cc0c8a2cd 100644
--- a/net-misc/midentd/midentd-2.3.1.ebuild
+++ b/net-misc/midentd/midentd-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/midentd-2.3.1.ebuild,v 1.1 2004/03/05 15:47:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/midentd-2.3.1-r1.ebuild,v 1.1 2004/05/14 02:25:03 vapier Exp $
 
 DESCRIPTION="ident daemon with masquerading and fake replies support"
 HOMEPAGE="http://panorama.sth.ac.at/midentd/"
@@ -9,13 +9,18 @@ SRC_URI="http://panorama.sth.ac.at/midentd/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:/usr/local:/usr:' midentd.xinetd
+	epatch ${FILESDIR}/${PV}-pidfile.patch
+	sed -i \
+		-e 's:/usr/local:/usr:' \
+		-e 's:service ident:service auth:' \
+		midentd.xinetd
 }
 
 src_install() {
@@ -25,6 +30,8 @@ src_install() {
 	doins midentd.xinetd
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/midentd.rc midentd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/midentd.conf.d midentd
 
 	dodoc CHANGELOG README