rpms/emacspeak/F-8 emacspeak-28.0-no-httpd.patch, NONE, 1.1 emacspeak-28.0-tmpfile.patch, NONE, 1.1 .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 emacspeak-no-linux-espeak.patch, 1.1, NONE emacspeak-tcl-pkgreq-tclx.patch, 1.5, NONE
Jens Petersen
petersen at fedoraproject.org
Fri Sep 26 09:36:20 UTC 2008
Author: petersen
Update of /cvs/pkgs/rpms/emacspeak/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2337
Modified Files:
.cvsignore emacspeak-15.0-fixpref.patch emacspeak.spec sources
Added Files:
emacspeak-28.0-no-httpd.patch emacspeak-28.0-tmpfile.patch
Removed Files:
emacspeak-no-linux-espeak.patch
emacspeak-tcl-pkgreq-tclx.patch
Log Message:
Backport from devel:
* 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 (#463819)
* 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
emacspeak-28.0-no-httpd.patch:
--- NEW FILE emacspeak-28.0-no-httpd.patch ---
diff -u emacspeak-28.0/Makefile\~ emacspeak-28.0/Makefile
--- emacspeak-28.0/Makefile~ 2008-01-28 11:13:27.000000000 +1000
+++ emacspeak-28.0/Makefile 2008-09-25 12:12:45.000000000 +1000
@@ -285,8 +285,6 @@
$(INSTALL) -m 644 ${JS} $(libdir)/js
$(INSTALL) -d $(libdir)/servers
$(INSTALL) -d $(libdir)/servers/python
- $(INSTALL) -d $(libdir)/servers/httpd
- $(INSTALL) -m 644 ${TCLHTTPD} $(libdir)/servers/tts.tcl
$(INSTALL) -d $(libdir)/servers/linux-outloud
$(INSTALL) -m 755 ${OUTLOUD} $(libdir)/servers/linux-outloud
cp ${PYFILES} $(libdir)/servers/python
emacspeak-28.0-tmpfile.patch:
--- NEW FILE emacspeak-28.0-tmpfile.patch ---
diff -up emacspeak-28.0/etc/extract-table.pl.tmpfile emacspeak-28.0/etc/extract-table.pl
--- emacspeak-28.0/etc/extract-table.pl.tmpfile 2007-05-04 11:08:59.000000000 +1000
+++ emacspeak-28.0/etc/extract-table.pl 2008-09-26 17:50:05.000000000 +1000
@@ -1,36 +1,36 @@
#!/usr/bin/perl -w
-#$Id: extract-table.pl 4047 2006-08-11 19:11:17Z tv.raman.tv $
+#$Id: extract-table.pl 5842 2008-08-25 18:54:14Z tv.raman.tv $
# Accepts a URI and table spec
-#returns a csv file
+#returns csv output on STDOUT
use strict;
use FileHandle;
use LWP::UserAgent;
use HTML::TableExtract;
use IO::File;
+use File::Temp qw(tempfile);
use Getopt::Long;
use vars qw (%options);
-my ($url, $file, $task, $depth, $count, $cols);
+my ($url, $file, $depth, $count, $cols);
-my %options = (task => \$task,
- url => \$url,
-file => \$file,
- depth => \$depth,
-count => \$count,
-headers => \$cols);
+my %options = (
+ url => \$url,
+ file => \$file,
+ depth => \$depth,
+ count => \$count,
+ headers => \$cols);
GetOptions (\%options,
'file=s',
'url=s',
- 'task=s',
'depth=i',
'count=i',
'headers=s');
-$task ||= "extract-table";
-my $input;
+
+my ($input, $inputname);
if (defined ($file)) {
$input = $file;
} else {
- $input="/tmp/$options{task}.html";
- RetrieveURLToFile($url, $input);
+ ($input, $inputname) = tempfile(suffix=>'.html');
+ RetrieveURLToFile($url, $inputname);
}
my $te;
@@ -41,8 +41,9 @@ if ( defined ($cols)) {
$te = new HTML::TableExtract( depth => $depth, count=>$count);
}
$te->parse_file($input);
-my $output = new FileHandle ("> /tmp/$task.csv");
+
my ($ts,$row);
+my $output =\*STDOUT;
foreach $ts ($te->table_states) {
foreach $row ($ts->rows) {
$output->print ( join(',', @$row), "\n");
@@ -52,7 +53,7 @@ foreach $ts ($te->table_states) {
$output->close();
if (defined ($url)) {
- unlink ($input);
+ unlink ($inputname);
}
# {{{ retrieve URL to file
@@ -64,9 +65,8 @@ sub RetrieveURLToFile {
# Pass request to the user agent and get a response back
my $res = $ua->request($req, $filename);
if ($res->is_success()) {
- warn"table: Retrieved $url to $filename\n";
} elsif ($res->is_error()) {
- exit ("Retrieval for $url failed\n");
+ die ("Retrieval failed for $url");
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/F-8/.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:35:50 -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-8/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:35:50 -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-8/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:35:50 -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 (#463819)
+
+* 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-8/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:35:50 -0000 1.9
@@ -1 +1 @@
-808f7a96bdfaed769b987774f5201669 emacspeak-26.tar.bz2
+c64e3894b7d7b4eeffa12a896bd68f7c emacspeak-28.0.tar.bz2
--- emacspeak-no-linux-espeak.patch DELETED ---
--- emacspeak-tcl-pkgreq-tclx.patch DELETED ---
More information about the fedora-extras-commits
mailing list