rpms/audio-entropyd/devel audio-entropyd.conf, NONE, 1.1 .cvsignore, 1.3, 1.4 audio-entropyd, 1.1, 1.2 audio-entropyd.spec, 1.11, 1.12 sources, 1.3, 1.4 audio-entropyd-1.0.1-xtra_debug.patch, 1.1, NONE

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21910

Modified Files:
	.cvsignore audio-entropyd audio-entropyd.spec sources 
Added Files:
	audio-entropyd.conf 
Removed Files:
	audio-entropyd-1.0.1-xtra_debug.patch 
Log Message:
1.0.5


--- NEW FILE audio-entropyd.conf ---
# This is the configuration file for audio-entropyd's initscript.
# The only valid setting for this file is OPTIONS.

# Uncomment the OPTIONS line and include any options that you wish to 
# pass to the audio-entropyd daemon on startup. See audio-entropyd --help
# for a list of valid flags.

# OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Feb 2008 16:08:52 -0000	1.3
+++ .cvsignore	29 Sep 2008 15:30:28 -0000	1.4
@@ -1 +1 @@
-audio-entropyd-1.0.1.tgz
+audio-entropyd-1.0.5.tgz


Index: audio-entropyd
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-entropyd	5 Jun 2007 19:19:18 -0000	1.1
+++ audio-entropyd	29 Sep 2008 15:30:28 -0000	1.2
@@ -6,7 +6,9 @@
 # description: This is a daemon which runs on client machines to generate entropy
 #              from the system soundcard (if present and active).
 # processname: audio-entropyd
-# config:
+# config: /etc/sysconfig/audio-entropyd
+
+confdir=/etc/sysconfig
 
 # Source function library.
 . /etc/init.d/functions
@@ -16,10 +18,14 @@
 
 LOCKFILE=/var/lock/subsys/audio-entropyd
 
+if [ -r $confdir/audio-entropyd ]; then
+    . $confdir/audio-entropyd
+fi
+
 case "$1" in
    start)
        echo -n $"Starting Audio Entropy daemon... "
-       daemon $AED_BIN
+       daemon $AED_BIN $OPTIONS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch $LOCKFILE


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audio-entropyd.spec	7 Aug 2008 20:46:58 -0000	1.11
+++ audio-entropyd.spec	29 Sep 2008 15:30:28 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           audio-entropyd
-Version:        1.0.1
-Release:        5%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
 URL:            http://www.vanheusden.com/aed/
 Source0:        http://www.vanheusden.com/aed/audio-entropyd-%{version}.tgz
 Source1:        audio-entropyd
-Patch0:		audio-entropyd-1.0.1-xtra_debug.patch
+Source2:	audio-entropyd.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
@@ -18,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .xtra_debug
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -29,6 +28,8 @@
 install -m0755 audio-entropyd $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/audio-entropyd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,8 +53,14 @@
 %doc COPYING README README.2 TODO
 %{_initrddir}/audio-entropyd
 %{_sbindir}/audio-entropyd
+%config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-1
+- update to 1.0.5
+- drop debug patch, upstream fixed the problem in a different manner
+- add config file and fix initscript to use it (bz 463904)
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-5
 - random rawhide appeasement
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Feb 2008 16:08:52 -0000	1.3
+++ sources	29 Sep 2008 15:30:28 -0000	1.4
@@ -1 +1 @@
-486f7d46ffc999830e550ccb07abfe61  audio-entropyd-1.0.1.tgz
+9f1f85872c9e6cee20d55da14c840079  audio-entropyd-1.0.5.tgz


--- audio-entropyd-1.0.1-xtra_debug.patch DELETED ---