rpms/initng-ifiles/devel rpcbindrsyslogd.patch, NONE, 1.1 initng-ifiles.spec, 1.9, 1.10
Daniel Malmgren (danielm)
fedora-extras-commits at redhat.com
Thu Aug 23 18:19:14 UTC 2007
Author: danielm
Update of /cvs/extras/rpms/initng-ifiles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4919
Modified Files:
initng-ifiles.spec
Added Files:
rpcbindrsyslogd.patch
Log Message:
initng-ifiles 0.1.4-2 for devel
rpcbindrsyslogd.patch:
--- NEW FILE rpcbindrsyslogd.patch ---
Index: initfiles/daemon/rpcbind.ii
===================================================================
--- initfiles/daemon/rpcbind.ii (revision 0)
+++ initfiles/daemon/rpcbind.ii (revision 5253)
@@ -0,0 +1,12 @@
+ # DESCRIPTION:
+ # WWW:
+
+daemon daemon/rpcbind {
+ need = system/bootmisc virtual/net;
+ provide = virtual/portmap;
+ forks;
+ pid_of = rpcbind;
+ env RPCBIND_ARGS=;
+ env_file = /etc/sysconfig/rpcbind;
+ exec daemon = /sbin/rpcbind ${RPCBIND_ARGS};
+}
Index: initfiles/daemon/rklogd.ii
===================================================================
--- initfiles/daemon/rklogd.ii (revision 0)
+++ initfiles/daemon/rklogd.ii (revision 5253)
@@ -0,0 +1,10 @@
+# NAME:
+# DESCRIPTION:
+# WWW:
+
+daemon daemon/rklogd {
+ need = system/bootmisc daemon/rsyslogd;
+ env_file = /etc/sysconfig/rsyslog;
+ exec daemon = /sbin/rklogd $KLOGD_OPTIONS -n;
+}
+
Index: initfiles/daemon/rsyslogd.ii
===================================================================
--- initfiles/daemon/rsyslogd.ii (revision 0)
+++ initfiles/daemon/rsyslogd.ii (revision 5253)
@@ -0,0 +1,13 @@
+# NAME:
+# DESCRIPTION:
+# WWW:
+
+daemon daemon/rsyslogd {
+ provide = virtual/syslog;
+ need = system/bootmisc;
+ env_file = /etc/sysconfig/rsyslog;
+ env PIDFILE=/var/lock/subsys/rsyslogd;
+ exec daemon = /sbin/rsyslogd $SYSLOGD_OPTIONS -n -i ${PIDFILE};
+ pid_file = ${PIDFILE};
+}
+
Index: initfiles/daemon/rquotad.ii
===================================================================
--- initfiles/daemon/rquotad.ii (revision 5245)
+++ initfiles/daemon/rquotad.ii (arbetskopia)
@@ -3,6 +3,6 @@
# WWW:
daemon daemon/rquotad {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
exec daemon = @rpc.rquotad@ -f;
}
Index: initfiles/daemon/portmap.ii
===================================================================
--- initfiles/daemon/portmap.ii (revision 5245)
+++ initfiles/daemon/portmap.ii (arbetskopia)
@@ -4,6 +4,7 @@
daemon daemon/portmap {
need = system/bootmisc virtual/net;
+ provide = virtual/portmap;
forks;
pid_of = portmap;
#ifd debian linspire
Index: initfiles/daemon/mountd.ii
===================================================================
--- initfiles/daemon/mountd.ii (revision 5245)
+++ initfiles/daemon/mountd.ii (arbetskopia)
@@ -3,7 +3,7 @@
# WWW:
daemon daemon/mountd {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
exec daemon = @rpc.mountd@ -F;
daemon_stops_badly;
}
Index: initfiles/daemon/famd.ii
===================================================================
--- initfiles/daemon/famd.ii (revision 5245)
+++ initfiles/daemon/famd.ii (arbetskopia)
@@ -4,6 +4,6 @@
daemon daemon/famd {
need = system/bootmisc virtual/net/lo;
- use = daemon/portmap;
+ use = virtual/portmap;
exec daemon = @/usr/sbin/famd@ -T 0 -f -c /etc/fam.conf;
}
Index: initfiles/daemon/idmapd.ii
===================================================================
--- initfiles/daemon/idmapd.ii (revision 5245)
+++ initfiles/daemon/idmapd.ii (arbetskopia)
@@ -3,6 +3,6 @@
# WWW:
daemon daemon/idmapd {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
exec daemon = @rpc.idmapd@ -f;
}
Index: initfiles/daemon/gssd.ii
===================================================================
--- initfiles/daemon/gssd.ii (revision 5245)
+++ initfiles/daemon/gssd.ii (arbetskopia)
@@ -3,6 +3,6 @@
# WWW:
daemon daemon/gssd {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
exec daemon = @rpc.gssd@ -f;
}
Index: initfiles/daemon/statd.ii
===================================================================
--- initfiles/daemon/statd.ii (revision 5245)
+++ initfiles/daemon/statd.ii (arbetskopia)
@@ -3,6 +3,6 @@
# WWW:
daemon daemon/statd {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
exec daemon = @rpc.statd@ -F;
}
Index: initfiles/daemon/nfsd.ii
===================================================================
--- initfiles/daemon/nfsd.ii (revision 5245)
+++ initfiles/daemon/nfsd.ii (arbetskopia)
@@ -4,7 +4,7 @@
#ifd gentoo
service daemon/nfsd {
- need = system/initial daemon/portmap virtual/net;
+ need = system/initial virtual/portmap virtual/net;
env RPCNFSDCOUNT = 8;
env_file = /etc/conf.d/nfs;
script start = {
@@ -17,7 +17,7 @@
}
#elsed
daemon daemon/nfsd {
- need = system/initial daemon/portmap;
+ need = system/initial virtual/portmap;
pid_of = rpc.nfsd;
#ifd fedora mandriva
env_file = /etc/sysconfig/nfs;
Index: initfiles/daemon/svcgssd.ii
===================================================================
--- initfiles/daemon/svcgssd.ii (revision 5245)
+++ initfiles/daemon/svcgssd.ii (arbetskopia)
@@ -3,6 +3,6 @@
# WWW:
daemon daemon/svcgssd {
- need = system/initial daemon/portmap;
+ need = system/initial virtual/portmap;
exec daemon = @rpc.svcgssd@ -f;
}
Index: initfiles/system/udev.ii
===================================================================
--- initfiles/system/udev.ii (revision 5245)
+++ initfiles/system/udev.ii (arbetskopia)
@@ -145,6 +145,23 @@
#ifd fedora
#Don't know why, but this seems to be needed on Fedora...
@/bin/ln@ -snf /proc/self/fd /dev/fd
+
+ Parse through stuff in /etc/udev/makedev.d to add nodes
+ xargs_simple () {
+ ARGS=""
+ while read line; do
+ ARGS="$ARGS $line"
+ done
+ if [ -n "$ARGS" ]; then
+ "$@" $ARGS
+ fi
+ }
+ for i in /etc/udev/makedev.d/*.nodes; do
+ if [ -f "$i" ]; then
+ ( @sed@ -e 's,#.*,,g' "$i" | \
+ xargs_simple @MAKEDEV@ -x ) &
+ fi
+ done
#endd
#ifd gentoo enlisy
Index: initfiles/system/mountfs.ii
===================================================================
--- initfiles/system/mountfs.ii (revision 5253)
+++ initfiles/system/mountfs.ii (arbetskopia)
@@ -56,7 +56,7 @@
service system/mountfs/network {
need = system/initial system/mountfs/essential virtual/net;
- use = daemon/portmap;
+ use = virtual/portmap;
never_kill;
env NET_FS = afs,cifs,coda,davfs,gfs,ncpfs,nfs,nfs4,ocfs2,shfs,smbfs;
Index: libgenrunlevel/libgenrunlevel.fedora
===================================================================
--- libgenrunlevel/libgenrunlevel.fedora (revision 5245)
+++ libgenrunlevel/libgenrunlevel.fedora (arbetskopia)
@@ -9,7 +9,7 @@
{
[ "${1}" == "runlevel/system.virtual" ] && return 0
- add_service "${1}" daemon/dcron daemon/hald daemon/klogd daemon/portmap
+ add_service "${1}" daemon/dcron daemon/hald daemon/rklogd daemon/rpcbind
# Check network interfaces
for i in $(ls /etc/sysconfig/network-scripts/ifcfg* | \
Index: initng-ifiles.spec
===================================================================
RCS file: /cvs/extras/rpms/initng-ifiles/devel/initng-ifiles.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- initng-ifiles.spec 15 Aug 2007 04:40:08 -0000 1.9
+++ initng-ifiles.spec 23 Aug 2007 18:18:42 -0000 1.10
@@ -1,7 +1,7 @@
Summary: Scripts for initng
Name: initng-ifiles
Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://www.initng.org
Group: System Environment/Base
@@ -10,6 +10,7 @@
BuildRequires: cmake initng-devel
Requires: filesystem
Provides: initng(ifiles)
+Patch0: rpcbindrsyslogd.patch
%description
Initng is a full replacement of the old and in many ways deprecated sysvinit
@@ -17,6 +18,7 @@
%prep
%setup -q
+%patch0 -p0 -b .rpcbindrsyslogd
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -59,6 +61,10 @@
%{_mandir}/*/*
%changelog
+* Thu Aug 23 2007 Daniel Malmgren <dm at mensa.se> 0.1.4-2
+- Added patch from upstreams to fix bug #239829 and #248668
+ and replace syslogd and klogd with rsyslogd and rklogd
+
* Wed Aug 15 2007 Daniel Malmgren <dm at mensa.se> 0.1.4-1
- New upstreams version
More information about the fedora-extras-commits
mailing list