Bug#693206: vavoom: Let's install the glvis utility
Hi Gustavo, Am Samstag, den 12.01.2013, 16:15 +0100 schrieb Fabian Greffrath: > Am Dienstag, den 08.01.2013, 23:54 -0300 schrieb gustavo panizzo : > > But why should it not be possible to run e.g. the "doom" > > > wrapper with an Iwad given as a relative or absolute path name? > > because i think wad files should be "untrusted" by default. > > So, how is this supposed to work with e.g. the "doom2-wad" package > created by game-data-packager that calls "Exec=doom > -iwad /usr/share/games/doom/doom2.wad"? any news on this? - Fabian -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Am 24.12.2012 04:36, schrieb gustavo panizzo : anyway, using .wad or .gwa files i got an buffer overflow *** buffer overflow detected ***: /usr/lib/vavoom/glvis terminated === Backtrace: = /lib/i386-linux-gnu/i686/cmov/libc.so.6(__fortify_fail+0x50)[0xf75473c0] /lib/i386-linux-gnu/i686/cmov/libc.so.6(+0xe92fa)[0xf75462fa] /lib/i386-linux-gnu/i686/cmov/libc.so.6(__strcpy_chk+0x44)[0xf7545674] /usr/lib/vavoom/glvis(_ZN11VavoomUtils9TIWadFile4OpenEPKc+0x9c)[0x804f57c] [snip] I think I've fixed this in GIT, could you please check? - Fabian -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Am Dienstag, den 08.01.2013, 23:54 -0300 schrieb gustavo panizzo : > But why should it not be possible to run e.g. the "doom" > > wrapper with an Iwad given as a relative or absolute path name? > because i think wad files should be "untrusted" by default. So, how is this supposed to work with e.g. the "doom2-wad" package created by game-data-packager that calls "Exec=doom -iwad /usr/share/games/doom/doom2.wad"? > no, i used alternatives system. and nobody else provides those wrappers > (doom2, hexen and heretic) As above, doom2 is supposed to be run with the "doom" executable and the doom2.wad IWAD file given as an absolute path. Last time I checked, vavoom was smart enough to figure out it runs DOOM2 (not DOOM) itself, i.e. without the explicit "-doom2" parameter. - Fabian -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
> 2) The addition of "." and "/" to the "-iwaddir" parameter was in no way > limited to Boom compatibility. It is, however, strictly needed to run > the "freedoom" wrapper in Debian, which relies on this feature in the > "boom" wrapper. ok,i got that But why should it not be possible to run e.g. the "doom" > wrapper with an Iwad given as a relative or absolute path name? because i think wad files should be "untrusted" by default. i think is best just to load (again by default) only wad files provided by the local administrator (/usr/share/games/doom). of course you can run arbitrary wad files using the main executable and switches if you wish! > > 3) You introduced new wrappers e.g. for doom2. Was this in any way > arranged with other Doom source ports in Debian? no, i used alternatives system. and nobody else provides those wrappers (doom2, hexen and heretic) -- 1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Hi Gustavo, Am 29.12.2012 13:52, schrieb Fabian Greffrath: 2) The addition of "." and "/" to the "-iwaddir" parameter was in no way limited to Boom compatibility. It is, however, strictly needed to run the "freedoom" wrapper in Debian, which relies on this feature in the "boom" wrapper. But why should it not be possible to run e.g. the "doom" wrapper with an Iwad given as a relative or absolute path name? 3) You introduced new wrappers e.g. for doom2. Was this in any way arranged with other Doom source ports in Debian? could you elaborate on these two, please? - Fabian -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Am 24.12.2012 04:36, schrieb gustavo panizzo : http://www.vavoom-engine.com/glvis.php says you don't need to use glbsp first. It does not say so explicitely. It merely says that it first searches for a GWA file (the one that glbsp creates) and if that does not exist it will *assume* that the WAD file already contains the GL nodes. i'm using your patch to build vavoom, where you able to use glvis? Yes, I was able to use it on i386-linux when I introduced the change to include it in the package. However, now that I tried it again today, I also received a segfault similar to the one that you posted. It works flawlessly when rebuilt without "-D_FORTIFY_SOURCE=2", so maybe we should replace the offending strcpy() calls with more secure alternatives (e.g. strncpy()). - Fabian PS: I disagree with some of the changes that you recently introduced into the packaging GIT: 1) There is already a README file for glvis in utils/glvis/glvis.txt, so why introduce a new one? 2) The addition of "." and "/" to the "-iwaddir" parameter was in no way limited to Boom compatibility. It is, however, strictly needed to run the "freedoom" wrapper in Debian, which relies on this feature in the "boom" wrapper. But why should it not be possible to run e.g. the "doom" wrapper with an Iwad given as a relative or absolute path name? 3) You introduced new wrappers e.g. for doom2. Was this in any way arranged with other Doom source ports in Debian? -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
On 11/14/2012 12:25 PM, Fabian Greffrath wrote: > No, the wad files themselves remain untouched. It merely modifies > supplementary .gwa files of the same name, which have to get created by > glbsp before. http://www.vavoom-engine.com/glvis.php says you don't need to use glbsp first. anyway, using .wad or .gwa files i got an buffer overflow *** buffer overflow detected ***: /usr/lib/vavoom/glvis terminated === Backtrace: = /lib/i386-linux-gnu/i686/cmov/libc.so.6(__fortify_fail+0x50)[0xf75473c0] /lib/i386-linux-gnu/i686/cmov/libc.so.6(+0xe92fa)[0xf75462fa] /lib/i386-linux-gnu/i686/cmov/libc.so.6(__strcpy_chk+0x44)[0xf7545674] /usr/lib/vavoom/glvis(_ZN11VavoomUtils9TIWadFile4OpenEPKc+0x9c)[0x804f57c] [snip] i'm using your patch to build vavoom, where you able to use glvis? -- 1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Am 14.11.2012 15:49, schrieb gustavo panizzo : does it modify wad files? if yes, those wad files can be used with other engine after? No, the wad files themselves remain untouched. It merely modifies supplementary .gwa files of the same name, which have to get created by glbsp before. It's like that: $ ls DOOM.* DOOM.WAD $ glbsp DOOM.WAD [...] $ ls DOOM.* DOOM.WAD DOOM.gwa $ glvis DOOM.WAD [...] $ ls DOOM.* DOOM.WAD DOOM.gwa DOOM.~gw DOOM.~gw is the initial .gwa file created by glbsp that got backed up by glvis. The file date of DOOM.WAD ist still May 25 1995. - Fabian -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
does it modify wad files? if yes, those wad files can be used with other engine after? sorry, i can't check by myself (no laptop and no time nowadays) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#693206: vavoom: Let's install the glvis utility
Package: vavoom
Version: 1.33-5
Severity: wishlist
Tags: patch
Hi,
I think the vavoom package should also contain the glvis utility. It can be run
over WAD files and adds information for the "rendering engine to skip the
subsectors that can't be visible from viewer's subsector." [1] This greatly
improves the engine's rendering performance!
Since it needs the WAD files to get pre-processed by the glbsp utility (already
in Debian), I have added this to the Suggests. And since it is currently a
utility very specific to vavoom and because there is also another different
project out there with the same name but serving a more general purpose [2], I
have move it into /usr/lib/vavoom.
- Fabian
[1] http://www.vavoom-engine.com/glvis.php
[2] https://code.google.com/p/glvis/
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (901, 'testing'), (502, 'unstable'), (501, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages vavoom depends on:
ii libc6 2.13-35
ii libflac++61.2.1-6
ii libgcc1 1:4.7.1-7
ii libgl1-mesa-glx [libgl1] 8.0.4-2
ii libjpeg8 8d-1
ii libmad0 0.15.1b-7
ii libmikmod23.1.12-4.1
ii libogg0 1.3.0-4
ii libpng12-01.2.49-1
ii libsdl-mixer1.2 1.2.12-3
ii libsdl1.2debian 1.2.15-5
ii libstdc++64.7.1-7
ii libvorbis0a 1.3.2-1.3
ii libwxbase2.8-02.8.12.1-12
ii libwxgtk2.8-0 2.8.12.1-12
ii zlib1g1:1.2.7.dfsg-13
Versions of packages vavoom recommends:
ii doom-wad-shareware [doom-wad] 1.9.fixed-2
ii freedoom [boom-wad]0.8~beta1-1
ii game-data-packager 30
vavoom suggests no packages.
-- no debconf information
>From 22a048ccc7204e8369c19d7d4b1fc450ac838d1e Mon Sep 17 00:00:00 2001
From: Fabian Greffrath
Date: Wed, 14 Nov 2012 10:17:38 +0100
Subject: [PATCH] Install the glvis utility and add Suggests: glbsp.
---
debian/control |1 +
debian/patches/install-glvis.patch | 12
debian/patches/series |1 +
debian/rules |1 +
4 files changed, 15 insertions(+)
create mode 100644 debian/patches/install-glvis.patch
diff --git a/debian/control b/debian/control
index c35b89b..d67e812 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Provides: doom-engine, heretic-engine, boom-engine
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: freedoom | doom-wad | heretic-wad | game-data-packager | boom-wad
+Suggests: glbsp
Description: Advanced Doom/Heretic/Hexen/Strife engine
Vavoom is an engine based on sources of Doom, Heretic, Hexen and
a little bit from Quake.
diff --git a/debian/patches/install-glvis.patch b/debian/patches/install-glvis.patch
new file mode 100644
index 000..c094ea7
--- /dev/null
+++ b/debian/patches/install-glvis.patch
@@ -0,0 +1,12 @@
+From: Fabian Greffrath
+Subject: Install the glvis utility.
+
+--- a/utils/glvis/CMakeLists.txt
b/utils/glvis/CMakeLists.txt
+@@ -23,5 +23,6 @@ add_dependencies(glvis libglvis)
+ target_link_libraries(glvis libglvis core)
+ set_target_properties(glvis PROPERTIES OUTPUT_NAME ../bin/glvis)
+ add_dependencies(glvis core)
++install(TARGETS glvis DESTINATION ${BINDIR})
+
+ #EXTRA_DIST = glvis.txt
diff --git a/debian/patches/series b/debian/patches/series
index e3730ef..f4369a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ freedoom-support.patch
freedoom-vlaunch.patch
fix-FTBFS-Hurd.patch
fix-hardening
+install-glvis.patch
diff --git a/debian/rules b/debian/rules
index e993daa..296f27d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_installchangelogs:
override_dh_install:
install -d debian/vavoom/usr/lib/vavoom
+ mv debian/vavoom/usr/games/glvis debian/vavoom/usr/lib/vavoom/
mv debian/vavoom/usr/games/vavoom.bin debian/vavoom/usr/lib/vavoom/
mv debian/vavoom/usr/games/vavoom-dedicated.bin debian/vavoom/usr/lib/vavoom/
dh_install
--
1.7.10.4
