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 37ca60e..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 $$/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/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 dd26c25..020f848 100644 --- a/yadex.spec +++ b/yadex.spec @@ -1,6 +1,6 @@ Name: yadex Version: 1.7.0 -Release: 12%{?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,12 @@ 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 + * Sat Feb 28 2009 Caolán McNamara - 1.7.0-12 - fix bare #elif