rpms/texinfo/devel texinfo-4.12-zlib.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 texinfo.spec, 1.53, 1.54 texinfo-4.11-direntry.patch, 1.1, NONE texinfo-4.11-res_win_segfault.patch, 1.1, NONE texinfo-4.11-zlib.patch, 1.1, NONE
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Wed May 14 09:39:04 UTC 2008
- Previous message: rpms/libvorbis/F-9 r14502.patch, NONE, 1.1 r14598-CVE-2008-1420.patch, NONE, 1.1 r14602-CVE-2008-1419.patch, NONE, 1.1 r14602-CVE-2008-1423.patch, NONE, 1.1 r14811.patch, NONE, 1.1 libvorbis.spec, 1.30, 1.31
- Next message: rpms/libvorbis/devel r14502.patch, NONE, 1.1 r14598-CVE-2008-1420.patch, NONE, 1.1 r14602-CVE-2008-1419.patch, NONE, 1.1 r14602-CVE-2008-1423.patch, NONE, 1.1 r14811.patch, NONE, 1.1 libvorbis.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vcrhonek
Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8802
Modified Files:
.cvsignore sources texinfo.spec
Added Files:
texinfo-4.12-zlib.patch
Removed Files:
texinfo-4.11-direntry.patch
texinfo-4.11-res_win_segfault.patch texinfo-4.11-zlib.patch
Log Message:
Update to texinfo-4.12, Remove description ('This is...') from /usr/share/info/dir in info post install section
texinfo-4.12-zlib.patch:
--- NEW FILE texinfo-4.12-zlib.patch ---
diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in
--- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200
+++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200
@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c
--- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200
+++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200
@@ -21,6 +21,7 @@
#include <getopt.h>
#include <regex.h>
#include <argz.h>
+#include <zlib.h>
#define TAB_WIDTH 8
@@ -638,7 +639,7 @@ The first time you invoke Info you start
COMPRESSION_PROGRAM. The compression program is determined by the
magic number, not the filename. */
-FILE *
+void *
open_possibly_compressed_file (char *filename,
void (*create_callback) (char *),
char **opened_filename, char **compression_program, int *is_pipe)
@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil
char *local_opened_filename, *local_compression_program;
int nread;
char data[13];
- FILE *f;
+ gzFile *f;
/* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */
@@ -654,22 +655,22 @@ open_possibly_compressed_file (char *fil
opened_filename = &local_opened_filename;
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
{
*opened_filename = concat (filename, ".gz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".bz2", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".lzma", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#ifdef __MSDOS__
@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil
{
free (*opened_filename);
*opened_filename = concat (filename, ".igz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
if (!f)
{
free (*opened_filename);
*opened_filename = concat (filename, ".inz", "");
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#endif
if (!f)
@@ -695,7 +696,7 @@ open_possibly_compressed_file (char *fil
/* And try opening it again. */
free (*opened_filename);
*opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
+ f = gzopen (*opened_filename, FOPEN_RBIN);
if (!f)
pfatal_with_name (filename);
}
@@ -706,12 +707,12 @@ open_possibly_compressed_file (char *fil
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
- nread = fread (data, sizeof (data), 1, f);
- if (nread != 1)
+ nread = gzread (f, data, sizeof (data));
+ if (nread != sizeof (data))
{
/* Empty files don't set errno, so we get something like
"install-info: No error for foo", which is confusing. */
- if (nread == 0)
+ if (nread >= 0)
fatal (_("%s: empty file"), *opened_filename, 0);
pfatal_with_name (*opened_filename);
}
@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil
if (*compression_program)
{ /* It's compressed, so fclose the file and then open a pipe. */
+ FILE *p;
char *command = concat (*compression_program," -cd <", *opened_filename);
- if (fclose (f) < 0)
+ if (gzclose (f) < 0)
pfatal_with_name (*opened_filename);
- f = popen (command, "r");
- if (f)
+ p = popen (command, "r");
+ if (p)
*is_pipe = 1;
else
pfatal_with_name (command);
+ return p;
}
else
{ /* It's a plain file, seek back over the magic bytes. */
- if (fseek (f, 0, 0) < 0)
+ if (gzseek (f, 0, SEEK_SET) < 0)
pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
/* Since this is a text file, and we opened it in binary mode,
switch back to text mode. */
f = freopen (*opened_filename, "r", f);
@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep,
char **compression_program)
{
char *real_name;
- FILE *f;
+ void *f;
int pipe_p;
int filled = 0;
int data_size = 8192;
@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep,
for (;;)
{
- int nread = fread (data + filled, 1, data_size - filled, f);
+ int nread;
+
+ if (pipe_p)
+ nread = fread (data + filled, 1, data_size - filled, f);
+ else
+ nread = gzread (f, data + filled, data_size - filled);
if (nread < 0)
pfatal_with_name (real_name);
if (nread == 0)
@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep,
if (pipe_p)
pclose (f);
else
- fclose (f);
+ gzclose (f);
*sizep = filled;
return data;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 19 Sep 2007 11:49:29 -0000 1.12
+++ .cvsignore 14 May 2008 09:38:24 -0000 1.13
@@ -2,3 +2,5 @@
texinfo-4.8.tar.bz2
texinfo-4.9.tar.bz2
texinfo-4.11.tar.bz2
+texinfo-4.12.tar.gz
+texinfo-4.12.tar.gz.sig
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 19 Sep 2007 11:49:29 -0000 1.12
+++ sources 14 May 2008 09:38:24 -0000 1.13
@@ -1 +1,2 @@
-c6bf13df4fbeff8ce874aacd6a51e814 texinfo-4.11.tar.bz2
+e9216fb657e1555a289a14a74dac8f4f texinfo-4.12.tar.gz
+fe17b722bc9f157ed5e9c88e9be3732d texinfo-4.12.tar.gz.sig
Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- texinfo.spec 4 Feb 2008 11:23:13 -0000 1.53
+++ texinfo.spec 14 May 2008 09:38:24 -0000 1.54
@@ -2,17 +2,15 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
-Version: 4.11
-Release: 5%{?dist}
+Version: 4.12
+Release: 1%{?dist}
License: GPLv3+
Group: Applications/Publishing
Url: http://www.gnu.org/software/texinfo/
-Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
+Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.gz
Source1: info-dir
Source2: texi2pdf.man
-Patch0: texinfo-4.11-zlib.patch
-Patch1: texinfo-4.11-res_win_segfault.patch
-Patch2: texinfo-4.11-direntry.patch
+Patch0: texinfo-4.12-zlib.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +53,6 @@
%prep
%setup -q
%patch0 -p1 -b .zlib
-%patch1 -p1 -b .res_win_segfault
-%patch2 -p1 -b .direntry
%build
%configure
@@ -95,6 +91,7 @@
%post -n info
/sbin/install-info %{_infodir}/info-stnd.info %{_infodir}/dir || :
+sed -i 's/^This is.*produced by makeinfo.*from/d/' /usr/share/info/dir
%preun -n info
if [ $1 = 0 ]; then
@@ -142,8 +139,15 @@
%{_mandir}/man1/texindex.1*
%{_mandir}/man1/texi2dvi.1*
%{_mandir}/man1/texi2pdf.1*
+%{_mandir}/man1/pdftexi2dvi.1*
%changelog
+* Wed May 14 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.12-1
+- Update to texinfo-4.12
+- Remove description ("This is...") from /usr/share/info/dir in info
+ post install section
+ Resolves: #433535
+
* Mon Feb 4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-5
- Merge Review
Resolves: #226488
--- texinfo-4.11-direntry.patch DELETED ---
--- texinfo-4.11-res_win_segfault.patch DELETED ---
--- texinfo-4.11-zlib.patch DELETED ---
- Previous message: rpms/libvorbis/F-9 r14502.patch, NONE, 1.1 r14598-CVE-2008-1420.patch, NONE, 1.1 r14602-CVE-2008-1419.patch, NONE, 1.1 r14602-CVE-2008-1423.patch, NONE, 1.1 r14811.patch, NONE, 1.1 libvorbis.spec, 1.30, 1.31
- Next message: rpms/libvorbis/devel r14502.patch, NONE, 1.1 r14598-CVE-2008-1420.patch, NONE, 1.1 r14602-CVE-2008-1419.patch, NONE, 1.1 r14602-CVE-2008-1423.patch, NONE, 1.1 r14811.patch, NONE, 1.1 libvorbis.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list