[rpms/xfig] epel10: Merge branch 'master' of ssh://pkgs.fedoraproject.org/xfig

[rpms/xfig] epel10: Merge branch 'master' of ssh://pkgs.fedoraproject.org/xfig

[Stanislav Ochotnicky]

            A new commit has been pushed.

            Repo   : rpms/xfig
            Branch : epel10
            Commit : cc7f20938158f641c771eb65edff0726f66d3859
            Author : Stanislav Ochotnicky <sochotnicky@redhat.com>
            Date   : 2010-12-06T10:04:50+01:00
            Stats  : +18/-13 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/xfig/c/cc7f20938158f641c771eb65edff0726f66d3859?branch=epel10

            Log:
            Merge branch 'master' of ssh://pkgs.fedoraproject.org/xfig

Conflicts:
	xfig.spec

Get f14 and master back together

---
diff --git a/xfig.spec b/xfig.spec
index 9d0489f..fa37ac0 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -280,7 +280,7 @@ fi
 - rebuild
 
 * Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-21
-- fix #191816, Xaw3d build problem 
+- fix #191816, Xaw3d build problem
 
 * Fri May 05 2006 Than Ngo <than@redhat.com> 3.2.4-20
 - fix #169330, wrong docdir
@@ -309,10 +309,10 @@ fi
 - rebuilt
 
 * Tue Nov 15 2005 Than Ngo <than@redhat.com> 3.2.4-15
-- fix for modular X 
+- fix for modular X
 
 * Mon Oct 24 2005 Than Ngo <than@redhat.com> 3.2.4-14
-- enable xpm support #158422 
+- enable xpm support #158422
 
 * Tue Jul 19 2005 Than Ngo <than@redhat.com> 3.2.4-13
 - buildrequires on xorg-x11-devel
@@ -454,7 +454,7 @@ fi
 * Sun Jun 18 2000 Than Ngo <than@redhat.de>
 - rebuilt in the new build environment
 - enable optimization
- 
+
 * Sat Jun 03 2000 Than Ngo <than@redhat.de>
 - fix requires, xfig-3.2.3a requires transfig-2.2.3 or newer
 - disable optimization -O2 (gcc-2.96 Bug) on i386
@@ -481,9 +481,9 @@ fi
 - converted to use a .desktop file
 
 * Fri Mar 26 1999 Michael Maher <mike@redhat.com>
-- added files that were missing. 
+- added files that were missing.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
 - auto rebuild in the new build environment (release 4)
 - varargs fix
 

diff --git a/xfig.spec b/xfig.spec
index b23766b..fa37ac0 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 24.b%{?dist}
+Release: 25.b%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -20,6 +20,7 @@ Patch10: xfig-3.2.5-enable-Xaw3d.patch
 Patch13: xfig-3.2.5-urwfonts.patch
 Patch19: xfig-3.2.5-debian.patch
 Patch20: xfig-3.2.5b-fix-eps-reading.patch
+Patch21: xfig-3.2.5b-fix-fig-buffer-overflow.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -94,6 +95,7 @@ Files common to both the plain Xaw and the Xaw3d version of xfig.
 %patch13 -p1 -b .urw
 %patch19 -p1
 %patch20 -p1
+%patch21
 iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
 rm Doc/html/images/sav1a0.tmp
 chmod -x `find -type f`
@@ -186,6 +188,9 @@ fi
 
 
 %changelog
+* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.5-25.b
+- Fix buffer overflow when opening malicious fig files
+
 * Thu Nov 25 2010 Hans de Goede <hdegoede@redhat.com> 3.2.5-24.b
 - Fix importing of eps files (#657290)
 
@@ -275,7 +280,7 @@ fi
 - rebuild
 
 * Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-21
-- fix #191816, Xaw3d build problem 
+- fix #191816, Xaw3d build problem
 
 * Fri May 05 2006 Than Ngo <than@redhat.com> 3.2.4-20
 - fix #169330, wrong docdir
@@ -304,10 +309,10 @@ fi
 - rebuilt
 
 * Tue Nov 15 2005 Than Ngo <than@redhat.com> 3.2.4-15
-- fix for modular X 
+- fix for modular X
 
 * Mon Oct 24 2005 Than Ngo <than@redhat.com> 3.2.4-14
-- enable xpm support #158422 
+- enable xpm support #158422
 
 * Tue Jul 19 2005 Than Ngo <than@redhat.com> 3.2.4-13
 - buildrequires on xorg-x11-devel
@@ -449,7 +454,7 @@ fi
 * Sun Jun 18 2000 Than Ngo <than@redhat.de>
 - rebuilt in the new build environment
 - enable optimization
- 
+
 * Sat Jun 03 2000 Than Ngo <than@redhat.de>
 - fix requires, xfig-3.2.3a requires transfig-2.2.3 or newer
 - disable optimization -O2 (gcc-2.96 Bug) on i386
@@ -476,9 +481,9 @@ fi
 - converted to use a .desktop file
 
 * Fri Mar 26 1999 Michael Maher <mike@redhat.com>
-- added files that were missing. 
+- added files that were missing.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
 - auto rebuild in the new build environment (release 4)
 - varargs fix