rpms/oidentd/devel oidentd.init, NONE, 1.1 oidentd.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 oidentd.spec, 1.10, 1.11 sources, 1.3, 1.4 identd.init, 1.3, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Jun 29 09:58:20 UTC 2006
- Previous message: rpms/oidentd/FC-5 oidentd.init, NONE, 1.1 oidentd.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 oidentd.spec, 1.10, 1.11 sources, 1.3, 1.4 identd.init, 1.3, NONE
- Next message: extras-repoclosure rc-run.py,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/oidentd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25760/devel
Modified Files:
.cvsignore oidentd.spec sources
Added Files:
oidentd.init oidentd.sysconfig
Removed Files:
identd.init
Log Message:
Update to 2.0.8, clean up the init script renamed to oidentd and add sysconfig file for the options.
--- NEW FILE oidentd.init ---
#!/bin/sh
#
# oidentd Start/Stop RFC 1413 identd server
#
# 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 \
# the owner of that connection on the server's system.
# processname: oidentd
# config: /etc/oidentd.conf
# Source function library.
. /etc/init.d/functions
# Get config.
. /etc/sysconfig/network
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0
[ -x /usr/sbin/oidentd ] || exit 0
# Get options
. /etc/sysconfig/oidentd
RETVAL=0
prog="oidentd"
start() {
echo -n $"Starting $prog: "
daemon $prog $OIDENTD_OPTIONS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
killproc $prog
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
return $RETVAL
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status $prog
;;
restart|reload)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/$prog ]; then
stop
start
fi
;;
*)
echo "Usage: $prog {start|stop|status|restart|condrestart}"
exit 1
esac
exit $RETVAL
--- NEW FILE oidentd.sysconfig ---
# Oidentd startup options. See oidentd(8) man page for a complete list.
OIDENTD_OPTIONS="-q -u nobody -g nobody"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Nov 2004 02:48:44 -0000 1.3
+++ .cvsignore 29 Jun 2006 09:58:20 -0000 1.4
@@ -1 +1 @@
-oidentd-2.0.7.tar.gz
+oidentd-2.0.8.tar.gz
Index: oidentd.spec
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- oidentd.spec 6 Mar 2006 15:21:35 -0000 1.10
+++ oidentd.spec 29 Jun 2006 09:58:20 -0000 1.11
@@ -1,19 +1,19 @@
Summary: Implementation of the RFC1413 identification server
Name: oidentd
-Version: 2.0.7
-Release: 9%{?dist}
+Version: 2.0.8
+Release: 1%{?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
+Source1: oidentd.init
+Source2: oidentd.sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
-BuildRequires: byacc
-Provides: identd = %{version}
-Conflicts: pidentd
+BuildRequires: bison, flex
+Provides: identd = %{version}-%{release}
%description
The oidentd package contains identd, which implements the RFC1413
@@ -37,8 +37,11 @@
%install
%{__rm} -rf %{buildroot}
%makeinstall
-%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/identd
-touch %{buildroot}%{_sysconfdir}/{oidentd.conf,oidentd_masq.conf}
+%{__install} -D -p -m 0755 %{SOURCE1} \
+ %{buildroot}/etc/rc.d/init.d/oidentd
+%{__install} -D -p -m 0640 %{SOURCE2} \
+ %{buildroot}%{_sysconfdir}/sysconfig/oidentd
+touch %{buildroot}%{_sysconfdir}/oidentd{,_masq}.conf
%clean
@@ -46,17 +49,24 @@
%post
-/sbin/chkconfig --add identd
+/sbin/chkconfig --add oidentd
%preun
if [ $1 -eq 0 ]; then
- /sbin/service identd stop >/dev/null 2>&1
- /sbin/chkconfig --del identd
+ /sbin/service oidentd stop &>/dev/null
+ /sbin/chkconfig --del oidentd
fi
%postun
if [ $1 -ge 1 ]; then
- /sbin/service identd condrestart >/dev/null 2>&1
+ # The most common case
+ /sbin/service oidentd condrestart &>/dev/null
+ # The special case, since we renamed the service from "identd" to "oidentd"
+ # between 2.0.7 and 2.0.8 packages - this is a "name change" condrestart
+ if [ -f /var/lock/subsys/identd ]; then
+ /sbin/service identd stop &>/dev/null
+ /sbin/service oidentd start &>/dev/null
+ fi
fi
@@ -65,12 +75,20 @@
%doc AUTHORS ChangeLog* COPYING* NEWS README TODO doc/rfc1413
%ghost %config %{_sysconfdir}/oidentd.conf
%ghost %config %{_sysconfdir}/oidentd_masq.conf
-%config /etc/rc.d/init.d/identd
+%config(noreplace) %{_sysconfdir}/sysconfig/oidentd
+/etc/rc.d/init.d/oidentd
%{_sbindir}/oidentd
%{_mandir}/man?/*
%changelog
+* Thu Jun 29 2006 Matthias Saou <http://freshrpms.net/> 2.0.8-1
+- Update to 2.0.8 which fixes bugzilla #173754.
+- Don't flag init script as %%config.
+- Rename init script "identd" -> "oidentd", remove pidentd conflict and add
+ update scriplet special case when upgrading from the "identd" service.
+- Move options into a sysconfig file.
+
* Mon Mar 6 2006 Matthias Saou <http://freshrpms.net/> 2.0.7-9
- FC5 rebuild.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Nov 2004 02:48:44 -0000 1.3
+++ sources 29 Jun 2006 09:58:20 -0000 1.4
@@ -1 +1 @@
-cf1c017496b066b45ffe3d7a303fd6ad oidentd-2.0.7.tar.gz
+c3d9a56255819ef8904b867284386911 oidentd-2.0.8.tar.gz
--- identd.init DELETED ---
- Previous message: rpms/oidentd/FC-5 oidentd.init, NONE, 1.1 oidentd.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 oidentd.spec, 1.10, 1.11 sources, 1.3, 1.4 identd.init, 1.3, NONE
- Next message: extras-repoclosure rc-run.py,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list