rpms/Maelstrom/devel Maelstrom-3.0.6-setgid.patch, 1.1, 1.2 Maelstrom.spec, 1.7, 1.8

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/Maelstrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8443

Modified Files:
	Maelstrom-3.0.6-setgid.patch Maelstrom.spec 
Log Message:
fix setgid


Maelstrom-3.0.6-setgid.patch:

Index: Maelstrom-3.0.6-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Maelstrom-3.0.6-setgid.patch	9 May 2006 05:38:19 -0000	1.1
+++ Maelstrom-3.0.6-setgid.patch	9 May 2006 05:52:38 -0000	1.2
@@ -35,12 +35,12 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #endif
-@@ -15,22 +17,40 @@
+@@ -15,22 +17,42 @@
  #include "load.h"
  #include "dialog.h"
  
 -#define MAELSTROM_SCORES	"Maelstrom-Scores"
-+#define MAELSTROM_SCORES	"/var/games/Maelstrom-Scores"
++#define MAELSTROM_SCORES	"/var/lib/games/Maelstrom-Scores"
  #define NUM_SCORES		10		// Do not change this!
  
  /* Everyone can write to scores file if defined to 0 */
@@ -67,6 +67,8 @@
 +	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT);
 +	if (f == -1)
 +		f = open(MAELSTROM_SCORES,O_RDONLY);
++	if (f == -1)
++		error("Couldn't open score file %s.\n",MAELSTROM_SCORES);
 +	gScoreFile = f;
 +#ifdef unix
 +	umask(omask);
@@ -171,3 +173,16 @@
  extern int	ZapHighScores(void);
  extern int	GetStartLevel(void);
  extern void	PrintHighScores(void);
+diff -ru Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp
+--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2006-05-09 01:42:42.000000000 -0400
++++ Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp	2006-05-09 01:07:58.000000000 -0400
+@@ -536,6 +536,8 @@
+ 	const int max = 32;
+ 	Uint16 ramp[256];   
+ 
++	faded = !faded;
++	return;
+ 	for ( int j = 1; j <= max; j++ ) {
+ 		int v = faded ? j : max - j + 1;
+ 		for ( int i = 0; i < 256; i++ ) {
+Binary files Maelstrom-3.0.6/screenlib/SDL_FrameBuf.o and Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.o differ


Index: Maelstrom.spec
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Maelstrom.spec	9 May 2006 05:38:19 -0000	1.7
+++ Maelstrom.spec	9 May 2006 05:52:38 -0000	1.8
@@ -23,7 +23,7 @@
 %prep
 
 %setup -q
-#%patch0 -p1 -b .setgid
+%patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .install