rpms/speech-dispatcher/devel import.log, 1.5, 1.6 speech-dispatcher.spec, 1.5, 1.6 speechd.patch, 1.1, 1.2

[Hemant Goyal (hemantg)]

Author: hemantg

Update of /cvs/pkgs/rpms/speech-dispatcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/devel

Modified Files:
	import.log speech-dispatcher.spec speechd.patch 
Log Message:
removed suid permission for speech-dispatcher binary.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	17 Jul 2008 10:58:19 -0000	1.5
+++ import.log	23 Jul 2008 11:47:37 -0000	1.6
@@ -3,3 +3,4 @@
 speech-dispatcher-0_6_6-14_fc7:HEAD:speech-dispatcher-0.6.6-14.fc7.src.rpm:1216180922
 speech-dispatcher-0_6_6-16_fc7:HEAD:speech-dispatcher-0.6.6-16.fc7.src.rpm:1216181531
 speech-dispatcher-0_6_6-17_fc7:HEAD:speech-dispatcher-0.6.6-17.fc7.src.rpm:1216292151
+speech-dispatcher-0_6_6-18_fc7:HEAD:speech-dispatcher-0.6.6-18.fc7.src.rpm:1216813500


Index: speech-dispatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speech-dispatcher.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- speech-dispatcher.spec	17 Jul 2008 10:58:19 -0000	1.5
+++ speech-dispatcher.spec	23 Jul 2008 11:47:37 -0000	1.6
@@ -12,7 +12,7 @@
 
 Name:           speech-dispatcher
 Version:        0.6.6
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        To provide a high-level device independent layer for speech synthesis
 Group:          System Environment/Libraries
 
@@ -146,16 +146,11 @@
 done
 
 #Install the init shell script
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-
-# We need to include the OLPC specific init script which starts the daemon
-# and uses the configuration files in /home/olpc/.speech-settings
-
-%if 1%{?olpc}
+%if 0%{?fedora}
+ mkdir -p $RPM_BUILD_ROOT%{_initrddir}
  install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/
 %endif
 
-
 #Rename certain generically named binaries
 mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message 
 mv $RPM_BUILD_ROOT%{_bindir}/run_test $RPM_BUILD_ROOT%{_bindir}/spd_run_test
@@ -170,8 +165,6 @@
 # olpc.
 
 %if 0%{?olpc}
- #Setuid for speech-dispatcher binary
- chmod 6711 $RPM_BUILD_ROOT%{_bindir}/speech-dispatcher
  #Move the speech-dispatcher configuration files to olpc writable location.
  mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd
  mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd
@@ -184,21 +177,21 @@
 %post 
 /sbin/ldconfig
 
-%if 1%{?olpc}
+%if 0%{?fedora}
  /sbin/chkconfig --add speech-dispatcherd
 %endif
 
 %postun
 /sbin/ldconfig
 
-%if 1%{?olpc}
+%if 0%{?fedora}
  if [ "$1" -ge "1" ] ; then
   /sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || :
  fi
 %endif
 
 %preun
-%if 1%{?olpc}
+%if 0%{?fedora}
 if [ $1 = 0 ] ; then
  /sbin/service speech-dispatcherd stop >/dev/null 2>&1
  /sbin/chkconfig --del speech-dispatcherd
@@ -211,13 +204,13 @@
 %doc AUTHORS ChangeLog NEWS README TODO COPYING
 
 %if 0%{?olpc}
-%config(noreplace) %attr(-,olpc,olpc)  /home/olpc/.speechd/speechd.conf
-%config(noreplace) %attr(-,olpc,olpc)  /home/olpc/.speechd/clients/*.conf
-%config(noreplace) %attr(-,olpc,olpc)  /home/olpc/.speechd/modules/*.conf
-
-%dir %attr(-,olpc,olpc)  /home/olpc/.speechd/
-%dir %attr(-,olpc,olpc)  /home/olpc/.speechd/clients
-%dir %attr(-,olpc,olpc)  /home/olpc/.speechd/modules
+%config(noreplace) %attr(0644,olpc,olpc)  /home/olpc/.speechd/speechd.conf
+%config(noreplace) %attr(0644,olpc,olpc)  /home/olpc/.speechd/clients/*.conf
+%config(noreplace) %attr(0644,olpc,olpc)  /home/olpc/.speechd/modules/*.conf
+
+%dir %attr(0755,olpc,olpc)  /home/olpc/.speechd/
+%dir %attr(0755,olpc,olpc)  /home/olpc/.speechd/clients
+%dir %attr(0755,olpc,olpc)  /home/olpc/.speechd/modules
 
 %else
 %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
@@ -242,7 +235,7 @@
 
 %dir %{_libdir}/speech-dispatcher
 
-%if 1%{?olpc}
+%if 0%{?fedora}
  %attr(0755,root,root)%{_initrddir}/speech-dispatcherd
 %endif
 
@@ -285,6 +278,10 @@
 
 %changelog
 
+* Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-18
+
+- removed suid permission for speech-dispatcher binary.
+
 * Wed Jul 16 2008    Hemant Goyal <goyal.hemant at gmail.com> 0.6.6-17
 
 - changing permissions of speech-dispatcher to 6711 (setuid and setguid)

speechd.patch:

Index: speechd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/speech-dispatcher/devel/speechd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- speechd.patch	24 Jun 2008 06:15:21 -0000	1.1
+++ speechd.patch	23 Jul 2008 11:47:37 -0000	1.2
@@ -1,6 +1,5 @@
-diff -uNr speech-dispatcher-0.6.6/config/speechd.conf.in speech-dispatcher-patched-0.6.6/config/speechd.conf.in
 --- speech-dispatcher-0.6.6/config/speechd.conf.in	2008-01-28 18:49:14.000000000 +0530
-+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in	2008-06-17 20:24:54.000000000 +0530
++++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in	2008-07-18 15:54:41.000000000 +0530
 @@ -36,8 +36,8 @@
  # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
  # want to influence it.
@@ -8,7 +7,7 @@
 -LogDir  "default"
 -#LogDir  "/var/log/speech-dispatcher/"
 +#LogDir  "default"
-+LogDir  "/var/log/"
++LogDir  "/home/olpc/.speechd/"
  #LogDir  "stdout"
  
  # CustomLogFile allows logging all messages of the given kind,