rpms/xpdf/EL-5 xpdf-3.02pl1.patch, NONE, 1.1 sources, 1.2, 1.3 xpdf-3.00-64bit.patch, 1.1, 1.2 xpdf.spec, 1.3, 1.4

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Aug 1 22:01:36 UTC 2007 

Author: spot

Update of /cvs/extras/rpms/xpdf/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19090/EL-5

Modified Files:
	sources xpdf-3.00-64bit.patch xpdf.spec 
Added Files:
	xpdf-3.02pl1.patch 
Log Message:

Bump to 3.02pl1


xpdf-3.02pl1.patch:

--- NEW FILE xpdf-3.02pl1.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/Stream.cc	Thu Jul 26 14:44:43 2007
***************
*** 410,424 ****
    ok = gFalse;
  
    nVals = width * nComps;
-   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-       nComps >= INT_MAX / nBits ||
-       width >= INT_MAX / nComps / nBits ||
-       nVals * nBits + 7 < 0) {
-     return;
-   }
    pixBytes = (nComps * nBits + 7) >> 3;
    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
!   if (rowBytes <= 0) {
      return;
    }
    predLine = (Guchar *)gmalloc(rowBytes);
--- 410,422 ----
    ok = gFalse;
  
    nVals = width * nComps;
    pixBytes = (nComps * nBits + 7) >> 3;
    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
!   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
!       nComps > gfxColorMaxComps ||
!       nBits > 16 ||
!       width >= INT_MAX / nComps ||      // check for overflow in nVals 
!       nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
      return;
    }
    predLine = (Guchar *)gmalloc(rowBytes);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xpdf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Sep 2006 17:12:58 -0000	1.2
+++ sources	1 Aug 2007 22:01:01 -0000	1.3
@@ -1,7 +1,12 @@
-e53ec72546bb1a010fc2a2730f6d80f5  xpdf-3.01-novms.tar.gz
+b1ce3f8ee8bebce3856d70990cb42db1  xpdf-3.02-novms.tar.gz
 ba4b037ab691f8b029ec2b9820a2fb8c  xpdf-chinese-simplified-2004-jul-27-NOCMAP.tar.gz
 697e7edc09a285115b597ab03f2eddf9  xpdf-chinese-traditional-2004-jul-27-NOCMAP.tar.gz
 7b22f31289ce0812d2ec77014e7b0cdf  xpdf-cyrillic-2003-jun-28.tar.gz
 f759b1b9624c7364e5d5a1ab3d146597  xpdf-japanese-2004-jul-27-NOCMAP.tar.gz
 276624cddd1b70c29a3ae03ddb20fb3a  xpdf-korean-2005-jul-07-NOCMAP.tar.gz
 96e058c1b0429ae1ba0b50f1784b0985  xpdf-thai-2002-jan-16.tar.gz
+67f05f65bc64bf022b36138c7c26746d  xpdf-arabic-2003-feb-16.tar.gz
+dacacda02b84b1184235a5fab072fbd8  xpdf-greek-2003-jun-28.tar.gz
+438dd417517641cbb78a94facf2d938e  xpdf-hebrew-2003-feb-16.tar.gz
+ac19ef990cd63afd2837c10dc7e1c3ab  xpdf-latin2-2002-oct-22.tar.gz
+511758c86e21328a241adc8590834ea2  xpdf-turkish-2002-apr-10.tar.gz

xpdf-3.00-64bit.patch:

Index: xpdf-3.00-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/xpdf/EL-5/xpdf-3.00-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpdf-3.00-64bit.patch	27 Sep 2006 17:12:58 -0000	1.1
+++ xpdf-3.00-64bit.patch	1 Aug 2007 22:01:01 -0000	1.2
@@ -1,55 +1,57 @@
---- xpdf-3.00/goo/gmem.h.me	2005-07-25 10:47:46.000000000 +0200
-+++ xpdf-3.00/goo/gmem.h	2005-07-25 10:49:55.000000000 +0200
-@@ -19,13 +19,13 @@
-  * Same as malloc, but prints error message and exits if malloc()
-  * returns NULL.
-  */
--extern void *gmalloc(int size);
-+extern void *gmalloc(size_t size);
- 
- /*
-  * Same as realloc, but prints error message and exits if realloc()
-  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
-  */
--extern void *grealloc(void *p, int size);
-+extern void *grealloc(void *p, size_t size);
- 
- /*
-  * Same as free, but checks for and ignores NULL pointers.
---- xpdf-3.00/goo/gmem.c.me	2005-07-25 10:47:51.000000000 +0200
-+++ xpdf-3.00/goo/gmem.c	2005-07-25 10:49:30.000000000 +0200
-@@ -53,9 +53,9 @@
+diff -up xpdf-3.02/goo/gmem.cc.BAD xpdf-3.02/goo/gmem.cc
+--- xpdf-3.02/goo/gmem.cc.BAD	2007-08-01 17:20:00.000000000 -0500
++++ xpdf-3.02/goo/gmem.cc	2007-08-01 17:22:04.000000000 -0500
+@@ -47,9 +47,9 @@ static int gMemInUse = 0;
  
  #endif /* DEBUG_MEM */
  
--void *gmalloc(int size) {
-+void *gmalloc(size_t size) {
+-void *gmalloc(int size) GMEM_EXCEP {
++void *gmalloc(size_t size) GMEM_EXCEP {
  #ifdef DEBUG_MEM
 -  int size1;
 +  size_t size1;
    char *mem;
    GMemHdr *hdr;
    void *data;
-@@ -94,11 +94,11 @@
+@@ -106,11 +106,11 @@ void *gmalloc(int size) GMEM_EXCEP {
  #endif
  }
  
--void *grealloc(void *p, int size) {
-+void *grealloc(void *p, size_t size) {
+-void *grealloc(void *p, int size) GMEM_EXCEP {
++void *grealloc(void *p, size_t size) GMEM_EXCEP {
  #ifdef DEBUG_MEM
    GMemHdr *hdr;
    void *q;
 -  int oldSize;
 +  size_t oldSize;
  
-   if (size == 0) {
-     if (p)
-@@ -137,7 +137,7 @@
+   if (size <= 0) {
+     if (p) {
+@@ -195,7 +195,7 @@ void *greallocn(void *p, int nObjs, int 
  
  void gfree(void *p) {
  #ifdef DEBUG_MEM
 -  int size;
 +  size_t size;
    GMemHdr *hdr;
-   GMemHdr *prevHdr, *q;
-   int lst;
+   unsigned long *trl, *clr;
+ 
+diff -up xpdf-3.02/goo/gmem.h.BAD xpdf-3.02/goo/gmem.h
+--- xpdf-3.02/goo/gmem.h.BAD	2007-08-01 17:23:11.000000000 -0500
++++ xpdf-3.02/goo/gmem.h	2007-08-01 17:23:45.000000000 -0500
+@@ -36,13 +36,13 @@ extern "C" {
+  * Same as malloc, but prints error message and exits if malloc()
+  * returns NULL.
+  */
+-extern void *gmalloc(int size) GMEM_EXCEP;
++extern void *gmalloc(size_t size) GMEM_EXCEP;
+ 
+ /*
+  * Same as realloc, but prints error message and exits if realloc()
+  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
+  */
+-extern void *grealloc(void *p, int size) GMEM_EXCEP;
++extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
+ 
+ /*
+  * These are similar to gmalloc and grealloc, but take an object count


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/EL-5/xpdf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xpdf.spec	18 Dec 2006 16:37:00 -0000	1.3
+++ xpdf.spec	1 Aug 2007 22:01:01 -0000	1.4
@@ -1,8 +1,8 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
-Version: 3.01
-Release: 28%{?dist}
-License: GPL
+Version: 3.02
+Release: 1%{?dist}
+License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
 Group: Applications/Publishing
@@ -25,6 +25,11 @@
 Source8: ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2002-jan-16.tar.gz
 Source10: xpdf.desktop
 Source11: xpdf.png
+Source12: ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2003-feb-16.tar.gz
+Source13: ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2003-jun-28.tar.gz
+Source14: ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2003-feb-16.tar.gz
+Source15: ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2002-oct-22.tar.gz
+Source16: ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2002-apr-10.tar.gz
 
 Patch0: xpdf-3.01-redhat-new.patch
 Patch3: xpdf-2.02-ext.patch
@@ -34,17 +39,16 @@
 Patch10: xpdf-3.00-gcc4.patch
 Patch11: xpdf-3.01-crash.patch
 Patch12: xpdf-3.00-64bit.patch
-Patch13: xpdf-3.01-resize.patch
-Patch14: xpdf-3.01-freetype-internals.patch
+# Patch13: xpdf-3.01-resize.patch
+# Patch14: xpdf-3.01-freetype-internals.patch
 Patch15: xpdf-3.01-nocmap.patch
 
 # Security patches
-# xpdf-3.01-CVE-2005-3191, CAN-2005-3193, CVE-2006-0301
-Patch100: xpdf-3.01pl2.patch
+Patch100: xpdf-3.02pl1.patch
 
-Requires: poppler-utils
 Requires: urw-fonts
 Requires: htmlview
+Requires: poppler-utils
 
 BuildRequires: lesstif-devel
 BuildRequires: freetype-devel >= 2.1.7
@@ -69,7 +73,7 @@
 standard X fonts.
 
 %prep
-%setup -q -a 3 -a 4 -a 5 -a 6 -a 7 -a 8
+%setup -q -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 12 -a 13 -a 14 -a 15 -a 16
 %patch -p1
 %patch3 -p1 -b .ext
 %patch6 -p1 -b .core
@@ -78,12 +82,13 @@
 %patch10 -p1 -b .gcc4
 %patch11 -p1 -b .crash
 %patch12 -p1 -b .alloc
-%patch13 -p1 -b .resize
-%patch14 -p1 -b .freetype-internals
+# Upstreamed
+#%%patch13 -p1 -b .resize
+#%%patch14 -p1 -b .freetype-internals
 %patch15 -p1 -b .nocmap
 
 # security patches
-%patch100 -p1 -b .CVE-2005-3191_CAN-2005-3193_CVE-2006-0301
+%patch100 -p1 -b .security
 
 %build
 find -name "*orig" | xargs rm -f
@@ -115,12 +120,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified \
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xpdf/arabic \
+         $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/cyrillic \
+         $RPM_BUILD_ROOT%{_datadir}/xpdf/greek \
+         $RPM_BUILD_ROOT%{_datadir}/xpdf/hebrew \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/korean \
+         $RPM_BUILD_ROOT%{_datadir}/xpdf/latin2 \
          $RPM_BUILD_ROOT%{_datadir}/xpdf/thai \
+         $RPM_BUILD_ROOT%{_datadir}/xpdf/turkish \
          $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -132,12 +142,17 @@
         %{SOURCE10}
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xpdf.png
 
+cp -pr xpdf-arabic/* $RPM_BUILD_ROOT%{_datadir}/xpdf/arabic/
 cp -pr xpdf-chinese-simplified/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified/
 cp -pr xpdf-chinese-traditional/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional/
 cp -pr xpdf-cyrillic/* $RPM_BUILD_ROOT%{_datadir}/xpdf/cyrillic/
+cp -pr xpdf-greek/* $RPM_BUILD_ROOT%{_datadir}/xpdf/greek/
+cp -pr xpdf-hebrew/* $RPM_BUILD_ROOT%{_datadir}/xpdf/hebrew/
 cp -pr xpdf-japanese/* $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese/
 cp -pr xpdf-korean/* $RPM_BUILD_ROOT%{_datadir}/xpdf/korean/
+cp -pr xpdf-latin2/* $RPM_BUILD_ROOT%{_datadir}/xpdf/latin2/
 cp -pr xpdf-thai/* $RPM_BUILD_ROOT%{_datadir}/xpdf/thai/
+cp -pr xpdf-turkish/* $RPM_BUILD_ROOT%{_datadir}/xpdf/turkish/
 
 # poppler provides all utilities now
 # http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446
@@ -157,7 +172,7 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftoppm.1*
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/
-for i in chinese-simplified chinese-traditional cyrillic japanese korean thai; do
+for i in arabic chinese-simplified chinese-traditional cyrillic greek hebrew japanese korean latin2 thai turkish; do
      mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$i/README README.$i
      mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$i/add-to-xpdfrc $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/add-to-xpdfrc.$i
 done
@@ -182,24 +197,39 @@
 %{_mandir}/man?/xpdf*
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdfrc
 %dir %{_sysconfdir}/xpdf
+%lang(ar) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.arabic
 %lang(zh_CN) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.chinese-simplified
 %lang(zh_TW) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.chinese-traditional
+%lang(el) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.greek
+%lang(iw) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.hebrew
 %lang(ja) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.japanese
 %lang(ko) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.korean
 %lang(th) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.thai
-# cyrillic is not a lang, many languages are cyrillic
+%lang(tr) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.turkish
+# cyrillic and latin2 are not langs, many languages are cyrillic/latin2
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.cyrillic
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.latin2
 %{_datadir}/icons/hicolor/48x48/apps/xpdf.png
 %dir %{_datadir}/xpdf
 %{_datadir}/applications/*
+%lang(ar) %{_datadir}/xpdf/arabic
 %lang(zh_CN) %{_datadir}/xpdf/chinese-simplified
 %lang(zh_TW) %{_datadir}/xpdf/chinese-traditional
+%lang(el) %{_datadir}/xpdf/greek
+%lang(iw) %{_datadir}/xpdf/hebrew
 %lang(ja) %{_datadir}/xpdf/japanese
 %lang(ko) %{_datadir}/xpdf/korean
 %lang(th) %{_datadir}/xpdf/thai
+%lang(tr) %{_datadir}/xpdf/turkish
 %{_datadir}/xpdf/cyrillic
+%{_datadir}/xpdf/latin2
 
 %changelog
+* Wed Aug  1 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-1
+- bump to 3.02
+- patch in security fix
+- add arabic, greek, hebrew, latin2, turkish lang support
+
 * Mon Dec 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-28
 - Requires: poppler-utils

More information about the fedora-extras-commits mailing list