changed pidfile to fakeidentd.pid, added a conf.d/ snippet.

8 files changed, 34 insertions, 74 deletions

diff --git a/net-misc/fakeidentd/ChangeLog b/net-misc/fakeidentd/ChangeLog
index d6e414c6fcf1..ae0b0a06fccb 100644
--- a/net-misc/fakeidentd/ChangeLog
+++ b/net-misc/fakeidentd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/fakeidentd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/ChangeLog,v 1.2 2002/04/01 19:51:09 woodchip Exp $
+
+*fakeidentd-1.4-r7 (1 Apr 2002)
+
+  1 Apr 2002; Donny Davies <woodchip@gentoo.org> fakeidentd-1.4-r7,
+  files/fakeidentd.confd files/fakeidentd.rc6 :
+
+  Added an /etc/conf.d/fakeidentd file for those who want to easily change
+  what it replies with ;)  Patched the source to write its PID to fakeidentd.pid
+  instead of identd.pid.  Tweaked the initscript accordingly.
 
 *fakeidentd-1.4-r6 (1 Feb 2002)
 
diff --git a/net-misc/fakeidentd/fakeidentd-1.4-r1.ebuild b/net-misc/fakeidentd/fakeidentd-1.4-r1.ebuild
deleted file mode 100644
index 814ea9bf53b8..000000000000
--- a/net-misc/fakeidentd/fakeidentd-1.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/fakeidentd-1.4-r1.ebuild,v 1.2 2001/09/14 21:51:53 woodchip Exp $
-
-# This identd is nearly perfect for a NAT box. It runs in one
-# process (doesn't fork()) and isnt very susceptible to DOS attack.
-
-DESCRIPTION="A static, secure identd. One source file only!"
-HOMEPAGE="http://www.ajk.tele.fi/~too/sw"
-S=${WORKDIR}/${P}
-SRC_URI="http://www.ajk.tele.fi/~too/sw/releases/identd.c
-         http://www.ajk.tele.fi/~too/sw/identd.readme"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	mkdir ${P}
-	cp ${DISTDIR}/identd.c ${DISTDIR}/identd.readme ${P}
-}
-
-src_compile() {
-	cd ${S}
-	gcc identd.c -o ${PN} ${CFLAGS} || die
-}
-
-src_install () {
-	dosbin ${PN}
-	dodoc identd.readme
-	# Changelog in source is more current. Its only ~13kB anyway.
-	dodoc identd.c
-	
-	exeinto /etc/rc.d/init.d
-	newexe ${FILESDIR}/fakeidentd.rc5 fakeidentd
-}
diff --git a/net-misc/fakeidentd/fakeidentd-1.4-r6.ebuild b/net-misc/fakeidentd/fakeidentd-1.4-r7.ebuild
index e0c0161c9a59..e8df3d06c5eb 100644
--- a/net-misc/fakeidentd/fakeidentd-1.4-r6.ebuild
+++ b/net-misc/fakeidentd/fakeidentd-1.4-r7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/fakeidentd-1.4-r6.ebuild,v 1.1 2001/09/14 15:26:10 chouser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/fakeidentd-1.4-r7.ebuild,v 1.1 2002/04/01 19:51:09 woodchip Exp $
 
 # This identd is nearly perfect for a NAT box. It runs in one
 # process (doesn't fork()) and isnt very susceptible to DOS attack.
@@ -15,8 +15,11 @@ SRC_URI="http://www.ajk.tele.fi/~too/sw/releases/identd.c
 DEPEND="virtual/glibc"
 
 src_unpack() {
-	mkdir ${P}
-	cp ${DISTDIR}/identd.c ${DISTDIR}/identd.readme ${P}
+	mkdir ${P} ; cd ${S}
+	cp ${DISTDIR}/identd.c ${DISTDIR}/identd.readme .
+	mv identd.c identd.c.orig
+	sed -e "s:identd.pid:fakeidentd.pid:" \
+		identd.c.orig > identd.c
 }
 
 src_compile() {
@@ -29,7 +32,9 @@ src_install () {
 	dodoc identd.readme
 	# Changelog in source is more current. Its only ~13kB anyway.
 	dodoc identd.c
-	
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/fakeidentd.confd fakeidentd
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/fakeidentd.rc6 fakeidentd
 }
diff --git a/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r6 b/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r6
deleted file mode 100644
index 0fe63546f90e..000000000000
--- a/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e0c517e5a5224eed0718487b4c63d7fb identd.c 13047
-MD5 97fbac66d852bf90b638809d277346c8 identd.readme 1575
diff --git a/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r1 b/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r7
index 0fe63546f90e..0fe63546f90e 100644
--- a/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r1
+++ b/net-misc/fakeidentd/files/digest-fakeidentd-1.4-r7
diff --git a/net-misc/fakeidentd/files/fakeidentd.confd b/net-misc/fakeidentd/files/fakeidentd.confd
new file mode 100644
index 000000000000..6f957ebf1168
--- /dev/null
+++ b/net-misc/fakeidentd/files/fakeidentd.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/fakeidentd
+
+# Change this to whatever you want the daemon to reply with.
+# By default it answers with "nobody" anyway..
+
+#FAKEIDENTD_OPTS="nobody"
diff --git a/net-misc/fakeidentd/files/fakeidentd.rc5 b/net-misc/fakeidentd/files/fakeidentd.rc5
deleted file mode 100644
index f24ed5659708..000000000000
--- a/net-misc/fakeidentd/files/fakeidentd.rc5
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE="fakeident"
-opts="start stop"
-
-PIDFILE=/var/run/identd.pid
-EXE=/usr/sbin/fakeidentd
-
-start() {
-	ebegin "Starting $SERVICE"
-	start-stop-daemon --start --quiet --exec $EXE
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-	eend $? 
-}
-
-doservice ${@}
diff --git a/net-misc/fakeidentd/files/fakeidentd.rc6 b/net-misc/fakeidentd/files/fakeidentd.rc6
index 1d8cd2e739a6..a0f68d5ecbb9 100644
--- a/net-misc/fakeidentd/files/fakeidentd.rc6
+++ b/net-misc/fakeidentd/files/fakeidentd.rc6
@@ -1,20 +1,21 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/files/fakeidentd.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/files/fakeidentd.rc6,v 1.3 2002/04/01 19:51:09 woodchip Exp $
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    ebegin "Starting fakeidentd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/fakeidentd
-    eend $?
+	ebegin "Starting fakeidentd"
+	start-stop-daemon --start --quiet --startas /usr/sbin/fakeidentd \
+		--pidfile /var/run/fakeidentd.pid -- ${FAKEIDENTD_OPTS}
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping fakeidentd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/identd.pid
-    eend $?
+	ebegin "Stopping fakeidentd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/fakeidentd.pid
+	eend $?
 }