[Pkg-fglrx-devel] r634 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-07-04 18:20:47 +0000 (Mon, 04 Jul 2011)
New Revision: 634

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff
Log:
* Do not pass the DISP_AUTH_KEY visible on the command line visible for
  everyone.
  Closes: #62586


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-06-26 16:53:10 UTC (rev 633)
+++ fglrx-driver/trunk/debian/changelog	2011-07-04 18:20:47 UTC (rev 634)
@@ -1,3 +1,11 @@
+fglrx-driver (1:11-6-3) UNRELEASED; urgency=medium
+
+  * Do not pass the DISP_AUTH_KEY visible on the command line visible for
+    everyone.
+    Closes: #625868
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 04 Jul 2011 20:17:42 +0200
+
 fglrx-driver (1:11-6-2) unstable; urgency=high
 
   * Uploading to unstable.

Modified: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff	2011-06-26 16:53:10 UTC (rev 633)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff	2011-07-04 18:20:47 UTC (rev 634)
@@ -1,8 +1,8 @@
 # Make the authatieventsd.sh working on Debian.
 
-diff -Naur fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh fglrx-driver-10-4/common/etc/ati/authatieventsd.sh
---- fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/etc/ati/authatieventsd.sh	2010-04-29 19:16:43.000000000 +0200
+diff -Naur fglrx-driver-11-6.orig/common/etc/ati/authatieventsd.sh fglrx-driver-11-6/common/etc/ati/authatieventsd.sh
+--- fglrx-driver-11-6.orig/common/etc/ati/authatieventsd.sh	2011-06-01 23:20:56.000000000 +0200
++++ fglrx-driver-11-6/common/etc/ati/authatieventsd.sh	2011-07-04 20:13:52.841207585 +0200
 @@ -42,6 +42,16 @@
          return 0
      fi
@@ -46,7 +46,7 @@
 +	if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
 +		user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
 +		if [ -n "$DISP_AUTH_KEY" ]; then
-+        		    su $user -c "xauth -f $3 add $2 . $DISP_AUTH_KEY" || exit -1
++					su $user -c "echo \"$2 . $DISP_AUTH_KEY\" | xauth -f $3 merge - || exit -1"
 +	        else
 +        	    exit -1
 +		fi