rpms/oidentd/devel identd.init, 1.2, 1.3 oidentd.spec, 1.8, 1.9 identd.spoof, 1.1, NONE oidentd.users, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/oidentd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6453

Modified Files:
	identd.init oidentd.spec 
Removed Files:
	identd.spoof oidentd.users 
Log Message:
Rebuild for new gcc/glibc, remove included obsolete configuration files.



Index: identd.init
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/identd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- identd.init	9 Nov 2004 02:48:57 -0000	1.2
+++ identd.init	9 Feb 2006 16:15:45 -0000	1.3
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 # $Id$
 #
 # identd	Start/Stop RFC 1413 identd server
 #
-# chkconfig: 345 35 65
+# chkconfig: - 35 65
 # description:	The identd server provides a means to determine the identity \
 #		of a user of a particular TCP connection.  Given a TCP port \
 #		number pair, it returns a character string which identifies \
@@ -19,10 +19,7 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-if [ ${NETWORKING} = "no" ]
-then
-	exit 0
-fi
+[ "${NETWORKING}" = "no" ] && exit 0
 
 [ -x /usr/sbin/oidentd ] || exit 0
 
@@ -30,7 +27,7 @@
 RETVAL=0
 
 start() {
-	echo -n "Starting identd: "
+	echo -n "Starting oidentd: "
 	daemon /usr/sbin/oidentd $IDENTDOPTS
 	RETVAL=$?
 	echo
@@ -39,8 +36,8 @@
 }
 
 stop() {
-	echo -n "Stopping identd services: "
-	killproc oidentd
+	echo -n "Stopping oidentd services: "
+	killproc /usr/sbin/oidentd
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd


Index: oidentd.spec
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- oidentd.spec	28 Jun 2005 17:31:35 -0000	1.8
+++ oidentd.spec	9 Feb 2006 16:15:45 -0000	1.9
@@ -1,18 +1,12 @@
-# $Id$
-# Upstream: Ryan McCabe <ryan$numb,org>
-
 Summary: Implementation of the RFC1413 identification server
 Name: oidentd
 Version: 2.0.7
-Release: 7
-
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://ojnk.sourceforge.net/
 Source0: http://dl.sf.net/ojnk/oidentd-%{version}.tar.gz
 Source1: identd.init
-Source2: identd.spoof
-Source3: oidentd.users
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -43,9 +37,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
-%{__install} -D -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/identd
-%{__install} -D -m 640 %{SOURCE2} %{buildroot}%{_sysconfdir}/identd.spoof
-%{__install} -D -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/oidentd.users
+%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/identd
+touch %{buildroot}%{_sysconfdir}/{oidentd.conf,oidentd_masq.conf}
 
 
 %clean
@@ -70,14 +63,20 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog* COPYING* NEWS README TODO doc/rfc1413
-%attr(0640, root, nobody) %config(noreplace) %{_sysconfdir}/identd.spoof
-%attr(0640, root, nobody) %config(noreplace) %{_sysconfdir}/oidentd.users
+%ghost %config %{_sysconfdir}/oidentd.conf
+%ghost %config %{_sysconfdir}/oidentd_masq.conf
 %config /etc/rc.d/init.d/identd
 %{_sbindir}/oidentd
 %{_mandir}/man?/*
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 2.0.7-8
+- Remove obsolete identd.spoof and oidentd.users files (thanks to Apu).
+- Ghost new configuration files (oidentd.conf & oidentd_masq.conf), but
+  including some sane defaults would be even better.
+- Cosmetic changes to the init file, and now default to disabled.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.7-7
 - rebuild on all arches
 


--- identd.spoof DELETED ---


--- oidentd.users DELETED ---