From 34d7622c2e76db116daad171dc308796eb844ad6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:34:27 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for yadex --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 65bdd0736530dcf659d64d4c13d3cb76f76f003e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 6 May 2010 17:03:05 +0000 Subject: [PATCH 2/4] Patch for overflow. --- yadex-1.7.0-obj-overflow.patch | 11 +++++++++++ yadex.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 yadex-1.7.0-obj-overflow.patch diff --git a/yadex-1.7.0-obj-overflow.patch b/yadex-1.7.0-obj-overflow.patch new file mode 100644 index 0000000..41eb570 --- /dev/null +++ b/yadex-1.7.0-obj-overflow.patch @@ -0,0 +1,11 @@ +--- src/objects.cc~ 2003-03-28 06:37:32.000000000 -0600 ++++ src/objects.cc 2010-05-06 11:42:36.824661556 -0500 +@@ -543,7 +543,7 @@ + SideDefs[last].yoff = 0; + 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)); + SideDefs[last].sector = NumSectors - 1; + } + MadeMapChanges = 1; diff --git a/yadex.spec b/yadex.spec index 4a70d54..020f848 100644 --- a/yadex.spec +++ b/yadex.spec @@ -1,6 +1,6 @@ Name: yadex Version: 1.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Doom level editor Group: Amusements/Graphics @@ -16,6 +16,7 @@ Patch3: yadex-1.7.0-destdir.patch Patch4: yadex-1.7.0-datadir.patch Patch5: yadex-1.7.0-gcc41.patch Patch6: yadex-1.7.0.bareelif.patch +Patch7: yadex-1.7.0-obj-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -45,6 +46,7 @@ tedious tasks easy. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p0 %build @@ -101,6 +103,9 @@ fi %changelog +* Thu May 06 2010 Jon Ciesla - 1.7.0-14 +- Patch for buffer overflow crash. + * Mon Jul 27 2009 Fedora Release Engineering - 1.7.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cbe1ef2eeade59b99299708a326142ee6532b563 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:18:19 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 42234c8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yadex -# $Id$ -NAME := yadex -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From b6597bea6bd8939a28fa16057b13794127cb8ec2 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 29 Sep 2010 14:33:36 -0500 Subject: [PATCH 4/4] 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 - 1.7.0-17 +- Requires xorg-x11-fonts-ISO8859-1-75dpi, BZ 620251. + +* Fri May 07 2010 Jon Ciesla - 1.7.0-16 +- Addition to object overflow patch. + +* Thu May 06 2010 Jon Ciesla - 1.7.0-15 +- Re-patch for buffer overflow crash. + * Thu May 06 2010 Jon Ciesla - 1.7.0-14 - Patch for buffer overflow crash.