diff --git a/deutex-4.4.902.tar.gz b/deutex-4.4.902.tar.gz new file mode 100644 index 0000000..8721fa4 --- /dev/null +++ b/deutex-4.4.902.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faed02b5b286044e28c71a82c72243408dc89a8d14677500b5eea607f048afe8 +size 263351 diff --git a/deutex-4.4.902.tar.xz b/deutex-4.4.902.tar.xz deleted file mode 100644 index 0f3eebc..0000000 --- a/deutex-4.4.902.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:020ca4bdaf3567396731f73ef5d28cc4193c3d07c22cbd763ba29ec6e57e5544 -size 202584 diff --git a/deutex-nolimit.diff b/deutex-nolimit.diff new file mode 100644 index 0000000..a3f94ed --- /dev/null +++ b/deutex-nolimit.diff @@ -0,0 +1,21 @@ +From: Jan Engelhardt +Date: 2017-07-07 16:45:59.059496819 +0200 + +Permit reading of WADs with more than 4096 entries. +--- + src/mkwad.c | 2 -- + 1 file changed, 2 deletions(-) + +Index: deutex-4.4.902/src/mkwad.c +=================================================================== +--- deutex-4.4.902.orig/src/mkwad.c ++++ deutex-4.4.902/src/mkwad.c +@@ -125,8 +125,6 @@ void WADRopenR(struct WADINFO *info, con + ntry = WADRreadLong(info); + if(ntry<=0) + ProgError("WR09", "%s: zero entries", fname (wadin)); +- if(ntry>=0x2000) +- ProgError("WR11", "%s: too many entries", fname (wadin)); + info->dirpos= dirpos= WADRreadLong(info); + if((dirpos<0)||(dirpos>0x10000000L)) + ProgError("WR13", "%s: invalid directory offset %08lX", diff --git a/deutex.changes b/deutex.changes index 4d7608b..cef8a01 100644 --- a/deutex.changes +++ b/deutex.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Fri Jul 7 14:49:32 UTC 2017 - jengelh@inai.de + +- Add deutex-nolimit.diff: raise limit for WAD directory reading + ------------------------------------------------------------------- Wed Feb 22 16:47:15 UTC 2012 - jreidinger@suse.com - add explicit buildrequires for autotools -- use license format conforming SPDX +- use license format conforming SPDX ------------------------------------------------------------------- Tue Jun 7 20:57:13 UTC 2011 - jengelh@medozas.de diff --git a/deutex.spec b/deutex.spec index 0863932..1bc4215 100644 --- a/deutex.spec +++ b/deutex.spec @@ -1,7 +1,7 @@ # # spec file for package deutex # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,28 +14,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: deutex Version: 4.4.902 Release: 0 -Group: Development/Tools/Other Summary: WAD composer for Doom and related games License: GPL-2.0+ +Group: Development/Tools/Other Url: http://www.teaser.fr/~amajorel/deutex/ # This prerelease tarball is unfortunately not linked from the homepage, # but referenced from # http://doom-editing.gamehourz.com/DeuTex-release-candidate-ftopict85808.html -#Source: http://www.teaser.fr/~amajorel/deutex/fungus/deutex-4.4.902.tar.gz -Source: %name-%version.tar.xz +Source: http://www.teaser.fr/~amajorel/deutex/fungus/%name-%version.tar.gz Patch1: deutex-automake.diff Patch2: deutex-braces.diff Patch3: deutex-proto.diff Patch4: deutex-init-stdfp.diff Patch5: deutex-soundbuf.diff - +Patch6: deutex-nolimit.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: xz -BuildRequires: autoconf automake libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool Provides: deusf = %version %description @@ -51,19 +53,19 @@ such as merging wads, etc. %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build -autoreconf -fi; +autoreconf -fi %configure -make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}; +make CFLAGS="%optflags" %{?_smp_mflags} iconv -f iso8859-1 -t utf-8 deutex.6.new; iconv -f iso8859-1 -t utf-8 dtexman6.txt.new; mv deutex.6.new deutex.6; mv dtexman6.txt.new dtexman6.txt; %install -make install DESTDIR="%buildroot"; +%make_install %files %defattr(-,root,root)