rpms/emacspeak/F-9 .cvsignore, 1.8, 1.9 emacspeak-15.0-fixpref.patch, 1.1, 1.2 emacspeak.spec, 1.23, 1.24 sources, 1.8, 1.9

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv603

Modified Files:
	.cvsignore emacspeak-15.0-fixpref.patch emacspeak.spec sources 
Log Message:
Backport from devel branch:

- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
  emacspeak-28.0-tmpfile.patch from upstream svn (#463820)

* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
- fix broken generated deps reported by mtasaka (#463899)
- script the replacement of tcl with tclsh to fix missing dtk-soft
- replace python2.4 with python in HTTPSpeaker.py

* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
- update to 28.0 with emacspeak-28.0-no-httpd.patch
- replace emacspeak-tcl-pkgreq-tclx.patch with sed
- emacspeak-no-linux-espeak.patch no longer needed
- update emacspeak-15.0-fixpref.patch for patch fuzz




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 May 2007 03:56:49 -0000	1.8
+++ .cvsignore	26 Sep 2008 09:22:06 -0000	1.9
@@ -1,2 +1 @@
-emacspeak-25.tar.bz2
-emacspeak-26.tar.bz2
+emacspeak-28.0.tar.bz2

emacspeak-15.0-fixpref.patch:

Index: emacspeak-15.0-fixpref.patch
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/emacspeak-15.0-fixpref.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-15.0-fixpref.patch	9 Sep 2004 04:30:41 -0000	1.1
+++ emacspeak-15.0-fixpref.patch	26 Sep 2008 09:22:06 -0000	1.2
@@ -1,11 +1,12 @@
---- emacspeak-15.0/info/Makefile.fixpref	Tue Mar  5 12:33:18 2002
-+++ emacspeak-15.0/info/Makefile	Tue Mar  5 12:34:00 2002
-@@ -11,7 +11,7 @@
+diff -up emacspeak-28.0/info/Makefile.orig emacspeak-28.0/info/Makefile
+--- emacspeak-28.0/info/Makefile.orig	2007-05-04 11:08:58.000000000 +1000
++++ emacspeak-28.0/info/Makefile	2008-09-25 09:47:25.000000000 +1000
+@@ -28,7 +28,7 @@ options.texi:  
  
  install: emacspeak.info
  	if test  -x /sbin/install-info ; then \
 -		install-info emacspeak.info /etc/info-dir; \
 +		install-info emacspeak.info $(infodir)/info-dir; \
  	fi
- 	$(INSTALL)  -m 644 emacspeak.info* $(infodir)
+ 	$(INSTALL)  -m 644 *.info* $(infodir)
  


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/emacspeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- emacspeak.spec	4 Oct 2007 06:35:09 -0000	1.23
+++ emacspeak.spec	26 Sep 2008 09:22:06 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: 26
+Version: 28.0
 Release: 3%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
@@ -17,8 +17,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
-Patch1: emacspeak-tcl-pkgreq-tclx.patch
-Patch2: emacspeak-no-linux-espeak.patch
+Patch1: emacspeak-28.0-no-httpd.patch
+Patch2: emacspeak-28.0-tmpfile.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -32,31 +32,30 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{version}.0
-%patch0 -p1
-%patch1 -p1 -b .1-tclx
-%patch2 -p1 -b .2-espeak
+%setup -q
+%patch0 -p1 -b .0-infodir
+%patch1 -p1 -b .1-httpd
+%patch2 -p1 -b .tmpfile
+
+for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
+  sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
+done
 
+sed -i -e "s%#!/usr/bin/python2.4$%#!/usr/bin/python%" servers/python/HTTPSpeaker.py
 
 %build
 make  config SRC=`pwd`
 make
 
-
 %install
 rm -rf %{buildroot}
-# make sure install-info is in path
-export PATH=$PATH:/sbin
-#mkdir -p %{buildroot}%{_infodir}
 make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
 rm -f %{buildroot}%{_infodir}/*dir
-#rm %{buildroot}%{_infodir}/*.gz
-perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
  
 rm %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{.nosearch,sounds/emacspeak.mp3}
 rm -r %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{realaudio,shoutcast}
 
-
 %post
 /sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
@@ -78,7 +77,22 @@
 %{_infodir}/*
 
 %changelog
-* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-3
+- (CVE-2008-4191) fix tmpfile vulnerability in extract-table.pl with
+  emacspeak-28.0-tmpfile.patch from upstream svn (#463820)
+
+* Fri Sep 26 2008 Jens Petersen <petersen at redhat.com> - 28.0-2
+- fix broken generated deps reported by mtasaka (#463899)
+- script the replacement of tcl with tclsh to fix missing dtk-soft
+- replace python2.4 with python in HTTPSpeaker.py
+
+* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
+- update to 28.0 with emacspeak-28.0-no-httpd.patch
+- replace emacspeak-tcl-pkgreq-tclx.patch with sed
+- emacspeak-no-linux-espeak.patch no longer needed
+- update emacspeak-15.0-fixpref.patch for patch fuzz
+
+* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 
 * Mon Aug 13 2007 Jens Petersen <petersen at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 May 2007 03:56:49 -0000	1.8
+++ sources	26 Sep 2008 09:22:06 -0000	1.9
@@ -1 +1 @@
-808f7a96bdfaed769b987774f5201669  emacspeak-26.tar.bz2
+c64e3894b7d7b4eeffa12a896bd68f7c  emacspeak-28.0.tar.bz2