rev 3931 - in trunk/packages/arts/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-06-09 21:16:54 +0000 (Fri, 09 Jun 2006)
New Revision: 3931

Added:
   trunk/packages/arts/debian/patches/01_branch_fixes.diff
Modified:
   trunk/packages/arts/debian/changelog
Log:
New upload (first real arts code changes in months).


Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog	2006-06-09 19:54:25 UTC (rev 3930)
+++ trunk/packages/arts/debian/changelog	2006-06-09 21:16:54 UTC (rev 3931)
@@ -1,3 +1,11 @@
+arts (1.5.3-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Pull in (all too rare) fixes from the branch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  9 Jun 2006 12:01:59 -0400
+
 arts (1.5.3-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/arts/debian/patches/01_branch_fixes.diff
===================================================================
--- trunk/packages/arts/debian/patches/01_branch_fixes.diff	2006-06-09 19:54:25 UTC (rev 3930)
+++ trunk/packages/arts/debian/patches/01_branch_fixes.diff	2006-06-09 21:16:54 UTC (rev 3931)
@@ -0,0 +1,40 @@
+--- arts.orig/flow/gsl/gslmagic.c
++++ arts.patched/flow/gsl/gslmagic.c
+@@ -616,7 +616,7 @@
+     return FALSE;
+ 
+   do
+-    ret = fstat (bfile->fd, &buf) < 0;
++    ret = fstat (bfile->fd, &buf);
+   while (ret < 0 && errno == EINTR);
+   if (ret < 0)
+     {
+--- arts.orig/soundserver/artswrapper.c
++++ arts.patched/soundserver/artswrapper.c
+@@ -95,6 +95,10 @@
+ #else
+ 		setreuid(-1, getuid());
+ #endif
++		if (geteuid() != getuid()) {
++			perror("setuid()");
++			return 2;
++		}
+ 	}
+ 
+ 	if(argc == 0)
+--- arts.orig/soundserver/crashhandler.cc
++++ arts.patched/soundserver/crashhandler.cc
+@@ -196,7 +196,12 @@
+           argv[i++] = NULL;
+ 
+           setgid(getgid());
+-          setuid(getuid());
++          if (getuid() != geteuid())
++            setuid(getuid());
++          if (getuid() != geteuid()) {
++	    perror("setuid()");
++            exit(255);
++          }
+ 
+           execvp(crashApp, argv);
+