rpms/nethack-vultures/FC-5 nethack-vultures-2.1.0-tabfullscreen.patch, NONE, 1.1 nethack-vultures.spec, 1.32, 1.33

[Karen Rei Pease (meme)]

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21673/FC-5

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-2.1.0-tabfullscreen.patch 
Log Message:
Adding in patches from Hans de Goede.



nethack-vultures-2.1.0-tabfullscreen.patch:

--- NEW FILE nethack-vultures-2.1.0-tabfullscreen.patch ---
diff -ur vultures-2.1.0.orig/vultures/vultures_sdl.c vultures-2.1.0/vultures/vultures_sdl.c
--- vultures-2.1.0.orig/vultures/vultures_sdl.c	2006-06-06 21:23:29.000000000 +0200
+++ vultures-2.1.0/vultures/vultures_sdl.c	2007-03-02 12:45:45.000000000 +0100
@@ -257,7 +257,7 @@
         newwidth  = modes[bestmode]->w;
     }
 
-    vultures_screen = SDL_SetVideoMode(newwidth, newheight, 0, 
+    vultures_screen = SDL_SetVideoMode(newwidth, newheight, 32, 
                                        SDL_SWSURFACE | SDL_FULLSCREEN | SDL_ASYNCBLIT);
 
     vultures_win_resize(newwidth, newheight);
@@ -267,7 +267,7 @@
 
 static void vultures_set_windowed()
 {
-    vultures_screen = SDL_SetVideoMode(vultures_opts.width, vultures_opts.height, 0, 
+    vultures_screen = SDL_SetVideoMode(vultures_opts.width, vultures_opts.height, 32, 
                                        SDL_SWSURFACE |SDL_ASYNCBLIT);
     vultures_win_resize(vultures_opts.width, vultures_opts.height);
 }


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nethack-vultures.spec	10 Oct 2006 22:09:51 -0000	1.32
+++ nethack-vultures.spec	11 Mar 2007 05:40:29 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
+Patch3:         %{name}-2.1.0-tabfullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -24,6 +25,7 @@
 BuildRequires:  groff
 BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
+Requires(pre):  /usr/sbin/groupadd
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 %description
@@ -39,6 +41,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3 -p1
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -120,6 +123,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+/usr/sbin/groupadd vultures 2> /dev/null || :
+# eliminate the old graphics directory symlink that was confusing rpm
 rm -rf %{_prefix}/games/vulturesclaw/graphics
 
 %post
@@ -129,7 +134,6 @@
 %postun
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
@@ -144,7 +148,7 @@
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
 %{_prefix}/games/vultureseye/fonts/
-%attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
+%attr(2755,root,vultures) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
 %{_prefix}/games/vulturesclaw/defaults.nh
@@ -155,11 +159,11 @@
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
 %{_prefix}/games/vulturesclaw/fonts/
-%attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
+%attr(2755,root,vultures) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
 %{_mandir}/man6/vultures*.6*
-%defattr(664,root,games,775)
+%defattr(664,root,vultures,775)
 %dir %{_var}/games/vultureseye/
 %config(noreplace) %{_var}/games/vultureseye/record
 %config(noreplace) %{_var}/games/vultureseye/perm
@@ -173,6 +177,11 @@
 
 
 %changelog
+* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.1.0-9
+- Make the binaries run with their own gid instead of gid games, to minimize
+  results of a possible privelidge escalation (bz 187382)
+- Fix the crashes on fs<->window toggle on a 16bpp X-server
+
 * Tue Oct 10 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0-8
 - Add in pre-tag to eliminate the old graphics directory symlink that was confusing rpm.