r8268 - packages/trunk/sabre/debian

[Evgeni Golov]

Author: sargentd-guest
Date: 2008-10-14 12:20:39 +0000 (Tue, 14 Oct 2008)
New Revision: 8268

Modified:
   packages/trunk/sabre/debian/changelog
   packages/trunk/sabre/debian/sabre.postinst
Log:
fix upgrade from broken -25


Modified: packages/trunk/sabre/debian/changelog
===================================================================
--- packages/trunk/sabre/debian/changelog	2008-10-14 11:24:57 UTC (rev 8267)
+++ packages/trunk/sabre/debian/changelog	2008-10-14 12:20:39 UTC (rev 8268)
@@ -2,10 +2,11 @@
 
   * debian/sabre.postinst:
     + Call dpkg-statoverride with --force (Closes: #501958).
+    + SUID root ist 4755, not 1755.
   * debian/rules:
     + Remove .pc dir from quilt on clean.
 
- -- Evgeni Golov <sargentd at die-welt.net>  Tue, 14 Oct 2008 13:17:46 +0200
+ -- Evgeni Golov <sargentd at die-welt.net>  Tue, 14 Oct 2008 14:19:37 +0200
 
 sabre (0.2.4b-25) unstable; urgency=low
 

Modified: packages/trunk/sabre/debian/sabre.postinst
===================================================================
--- packages/trunk/sabre/debian/sabre.postinst	2008-10-14 11:24:57 UTC (rev 8267)
+++ packages/trunk/sabre/debian/sabre.postinst	2008-10-14 12:20:39 UTC (rev 8268)
@@ -7,8 +7,9 @@
     if [ -z "$2" ]; then
       dpkg-statoverride --update --add root root 4755 /usr/games/sabre
     else
-      if dpkg --compare-versions "$2" le-nl 0.2.4b-24; then
-        if [ "$(dpkg-statoverride --list /usr/games/sabre)" = "root root 2755 /usr/games/sabre" ]; then
+      if dpkg --compare-versions "$2" le-nl 0.2.4b-25; then
+        if [ "$(dpkg-statoverride --list /usr/games/sabre)" = "root root 2755 /usr/games/sabre" -o \
+             "$(dpkg-statoverride --list /usr/games/sabre)" = "root root 1755 /usr/games/sabre" ]; then
           dpkg-statoverride --force --update --add root root 4755 /usr/games/sabre
         fi
       fi