5 files changed, 41 insertions, 53 deletions

diff --git a/security/gringotts/files/gnomeless-Makefile.in b/security/gringotts/files/gnomeless-Makefile.in
index 2716116e739e..55f1b6e0e025 100644
--- a/security/gringotts/files/gnomeless-Makefile.in
+++ b/security/gringotts/files/gnomeless-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Jul  6 16:04:36 2002
-+++ Makefile.in	Sat Jul  6 16:05:17 2002
-@@ -366,7 +366,7 @@
+--- Makefile.in.orig	Sat Oct 26 14:18:54 2002
++++ Makefile.in	Sat Oct 26 14:19:08 2002
+@@ -367,7 +367,7 @@
  install-data: install-data-recursive
  
  install-am: all-am
diff --git a/security/gringotts/files/patch-Makefile.in b/security/gringotts/files/patch-Makefile.in
index deeb568ee4be..8f007eeda581 100644
--- a/security/gringotts/files/patch-Makefile.in
+++ b/security/gringotts/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Sun Jun 16 19:04:42 2002
-+++ Makefile.in	Fri Jul  5 18:39:27 2002
-@@ -440,10 +440,10 @@
+--- Makefile.in.orig	Sat Oct 26 14:05:36 2002
++++ Makefile.in	Sat Oct 26 14:06:01 2002
+@@ -441,10 +441,10 @@
  	@echo
  	@echo
  	@echo ----------------------------------------------------------------------
 -	@echo   md5sum of relevant files:
 +	@echo   md5 checksum of relevant files:
  	@echo
--	@md5sum $(DESTDIR)$(bindir)/gringotts-bin|(read A B; echo $$B ": " $$A)
+-	@md5sum $(DESTDIR)$(bindir)/gringotts|(read A B; echo $$B ": " $$A)
 -	@md5sum $(DESTDIR)$(libdir)/libgringotts.so|(read A B; echo $$B ": " $$A)
-+	@md5 $(DESTDIR)$(bindir)/gringotts-bin|(read A B; echo $$B ": " $$A)
++	@md5 $(DESTDIR)$(bindir)/gringotts|(read A B; echo $$B ": " $$A)
 +	@md5 $(DESTDIR)$(libdir)/libgringotts.so|(read A B; echo $$B ": " $$A)
  	@echo
  	@echo use these values to check program integrity at any time
diff --git a/security/gringotts/files/patch-grg_safe.c b/security/gringotts/files/patch-grg_safe.c
index b25d6e6ae61d..26febd5b269e 100644
--- a/security/gringotts/files/patch-grg_safe.c
+++ b/security/gringotts/files/patch-grg_safe.c
@@ -1,38 +1,36 @@
---- src/grg_safe.c.orig	Sun Jun 16 18:41:21 2002
-+++ src/grg_safe.c	Fri Jul  5 19:12:36 2002
-@@ -24,13 +24,16 @@
+--- src/grg_safe.c.orig	Sat Oct 26 14:09:40 2002
++++ src/grg_safe.c	Sat Oct 26 14:15:28 2002
+@@ -34,6 +34,7 @@
+ 
  #include <stdlib.h>
- #include <stdio.h>
  #include <string.h>
 +#include <sys/types.h>
  #include <regex.h>
  #include <unistd.h>
  #include <fcntl.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#ifdef HAVE_SYS_FSUID_H
+@@ -43,7 +44,6 @@
  #include <sys/fsuid.h>
+ #endif
+ #include <sys/time.h>
 -#include <sys/types.h>
-+#endif
-+#include <sys/mman.h>
+ #include <sys/resource.h>
  
- #include <gtk/gtk.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
-@@ -131,12 +134,12 @@
- 	if (!geteuid())
- 	//the process is SUID root. I can mlockall() the memory in order to avoid swapping.
- 	{
--		gint res = mlockall (MCL_FUTURE);
-+//		gint res = mlockall (MCL_FUTURE);
+ #define GRG_SAFE			0
+@@ -64,8 +64,6 @@
+ #endif
  
--		if (res)
--			g_critical ("%s", _("The process is setuid root, but I can't lock memory paging"));
--		else
--			mem_safe = TRUE;
-+//		if (res)
-+//			g_critical ("%s", _("The process is setuid root, but I can't lock memory paging"));
-+//		else
-+//			mem_safe = TRUE;
+ 	//drop eventual group root privileges
+-	setgid(getgid ());
+-	setgid(getgid ()); //twice for counter "saved IDs", cfr. Secure Programming HowTo
+ #ifdef HAVE_SYS_FSUID_H
+ 	setfsgid(getgid ());
+ 	setfsgid(getgid ());
+@@ -84,8 +82,6 @@
+ #endif
  
  		//drop root privileges
- 		setuid(getuid());
+-		setuid(getuid());
+-		setuid(getuid());
+ #ifdef HAVE_SYS_FSUID_H
+ 		setfsuid(getuid());
+ 		setfsuid(getuid());
diff --git a/security/gringotts/files/patch-gringotts.in b/security/gringotts/files/patch-gringotts.in
deleted file mode 100644
index 39352c86647d..000000000000
--- a/security/gringotts/files/patch-gringotts.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gringotts.in.orig	Sat Apr 20 14:49:15 2002
-+++ src/gringotts.in	Fri Jul  5 19:09:14 2002
-@@ -1,5 +1,5 @@
--#! /bin/bash
-+#! /bin/sh
- CORE_LIMIT=`ulimit -Sc`
- ulimit -Sc 0
--@bindir@/gringotts-bin "$@"
-+gringotts-bin "$@"
- ulimit -Sc $CORE_LIMIT
diff --git a/security/gringotts/files/patch-src-Makefile.in b/security/gringotts/files/patch-src-Makefile.in
index 7973324e8880..982edb5b2882 100644
--- a/security/gringotts/files/patch-src-Makefile.in
+++ b/security/gringotts/files/patch-src-Makefile.in
@@ -1,10 +1,10 @@
---- src/Makefile.in.orig	Sun Jun 16 19:04:43 2002
-+++ src/Makefile.in	Sat Jul  6 16:55:20 2002
-@@ -417,7 +417,6 @@
- install-exec-local: gringotts
- 	strip $(DESTDIR)$(bindir)/gringotts-bin
- 	cp gringotts $(DESTDIR)$(bindir)
--	chmod u+s $(DESTDIR)$(bindir)/gringotts-bin
+--- src/Makefile.in.orig	Sat Oct 26 14:16:10 2002
++++ src/Makefile.in	Sat Oct 26 14:16:17 2002
+@@ -404,7 +404,6 @@
  
- uninstall-local:
- 	rm -f $(DESTDIR)$(bindir)/gringotts
+ install-exec-local:
+ 	strip $(DESTDIR)$(bindir)/gringotts
+-	chmod u+s $(DESTDIR)$(bindir)/gringotts
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.