[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

please unblock sabre/0.2.4b-26 (was: Re: please unblock sabre/0.2.4b-25)



Hi Luk & debian-release@,

On Sun, 12 Oct 2008 15:22:18 +0200 Luk Claes wrote:

> > please unblock sabre/0.2.4b-25. It has the following important changes:
> 
> unblocked

Sadly -25 was sort of broken, so we have uploaded -26 to unstable
today.
Changes:
  * 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.
The debdiff is attached. Could you unblock this one too?

Regards & TIA
Evgeni
reverted:
--- sabre-0.2.4b/.pc/.version
+++ sabre-0.2.4b.orig/.pc/.version
@@ -1 +0,0 @@
-2
diff -u sabre-0.2.4b/debian/sabre.postinst sabre-0.2.4b/debian/sabre.postinst
--- sabre-0.2.4b/debian/sabre.postinst
+++ sabre-0.2.4b/debian/sabre.postinst
@@ -5,11 +5,12 @@
 case "$1" in
   configure)
     if [ -z "$2" ]; then
-      dpkg-statoverride --add root root 1755 /usr/games/sabre
+      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
-          dpkg-statoverride --update --add root root 1755 /usr/games/sabre
+      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
     fi
diff -u sabre-0.2.4b/debian/rules sabre-0.2.4b/debian/rules
--- sabre-0.2.4b/debian/rules
+++ sabre-0.2.4b/debian/rules
@@ -49,6 +49,7 @@
 	[ ! -f Makefile ] || make distclean
 	find . -name Makefile | xargs -r rm -f
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc/
 	dh_clean
 
 binary-indep: build install
diff -u sabre-0.2.4b/debian/changelog sabre-0.2.4b/debian/changelog
--- sabre-0.2.4b/debian/changelog
+++ sabre-0.2.4b/debian/changelog
@@ -1,3 +1,13 @@
+sabre (0.2.4b-26) unstable; urgency=low
+
+  * 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@die-welt.net>  Tue, 14 Oct 2008 14:19:37 +0200
+
 sabre (0.2.4b-25) unstable; urgency=low
 
   [ Evgeni Golov ]

Attachment: pgphz0vp_ndvN.pgp
Description: PGP signature


Reply to: