[yadex/f13/master] Font, overflow fixes.

[Jon Ciesla]

commit b6597bea6bd8939a28fa16057b13794127cb8ec2
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Sep 29 14:33:36 2010 -0500

    Font, overflow fixes.

 yadex-1.7.0-obj-overflow.patch |   13 ++++++++++++-
 yadex.spec                     |   13 +++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/yadex-1.7.0-obj-overflow.patch b/yadex-1.7.0-obj-overflow.patch
index 41eb570..46de050 100644
--- a/yadex-1.7.0-obj-overflow.patch
+++ b/yadex-1.7.0-obj-overflow.patch
@@ -5,7 +5,18 @@
  	 strcpy (SideDefs[last].tex1, "-");
  	 strcpy (SideDefs[last].tex2, "-");
 -	 strcpy (SideDefs[last].tex3, default_middle_texture);
-+	 strncpy (SideDefs[last].tex3, default_middle_texture, strlen(SideDefs[last].tex3));
++	 strncpy (SideDefs[last].tex3, default_middle_texture, sizeof(SideDefs[last].tex3));
  	 SideDefs[last].sector = NumSectors - 1;
  	 }
        MadeMapChanges = 1;
+--- src/editobj.cc~	2003-04-24 15:32:39.000000000 -0500
++++ src/editobj.cc	2010-05-07 16:36:49.825412601 -0500
+@@ -937,7 +937,7 @@
+ 	       struct SideDef *s = SideDefs + l->sidedef1;
+ 	       strcpy (s->tex1, "-");
+ 	       strcpy (s->tex2, "-");
+-	       strcpy (s->tex3, default_middle_texture);
++	       strncpy (s->tex3, default_middle_texture, sizeof(s->tex3));
+ 	       }
+ 	    /* Don't delete the 2nd sidedef, it could be used
+                by another linedef. And if it isn't, the next
diff --git a/yadex.spec b/yadex.spec
index 020f848..0c1fc09 100644
--- a/yadex.spec
+++ b/yadex.spec
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        14%{?dist}
+Release:        17%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
-Requires:       freedoom
+Requires:       freedoom xorg-x11-fonts-ISO8859-1-75dpi
 
 %description
 Yadex is a Doom level (wad) editor for Unix systems running X, including Linux.
@@ -103,6 +103,15 @@ fi
 
 
 %changelog
+* Wed Sep 29 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.0-17
+- Requires xorg-x11-fonts-ISO8859-1-75dpi, BZ 620251.
+
+* Fri May 07 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.0-16
+- Addition to object overflow patch.
+
+* Thu May 06 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.0-15
+- Re-patch for buffer overflow crash.
+
 * Thu May 06 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.0-14
 - Patch for buffer overflow crash.