Hi!

I finally got too annoyed by the broken cdrecord package in Edgy
(which more or less the same than the one in sid), so FYI I did a
small patch (attached) to make it work as non-root again. While I
agree that this is by no way a 'good' patch, it at least makes burning
work again. And, after all, previous upstream versions (without the
EPERM check) worked just fine after all...

Thanks,

Martin

-- 
Martin Pitt        http://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org

In a world without walls and fences, who needs Windows and Gates?
diff -u cdrtools-2.01+01a03/debian/changelog 
cdrtools-2.01+01a03/debian/changelog
--- cdrtools-2.01+01a03/debian/changelog
+++ cdrtools-2.01+01a03/debian/changelog
@@ -1,3 +1,15 @@
+cdrtools (4:2.01+01a03-5ubuntu2) edgy; urgency=low
+
+  * Add debian/patches/41_revert_sg_io_eperm_failure.dpatch:
+    - Between 2.01+01a01 and 2.01+01a03, upstream changed the behaviour of
+      SG_IO ioctl()s failing with EPERM; earlier releases ignored it, while
+      the current one aborts the program. While in principle, EPERM checking
+      is a good thing, it breaks burning for non-root users, so revert this
+      test for now.
+    - See also http://bugs.debian.org/374685.
+
+ -- Martin Pitt <[EMAIL PROTECTED]>  Thu, 17 Aug 2006 12:02:11 +0200
+
 cdrtools (4:2.01+01a03-5ubuntu1) edgy; urgency=low
 
   [ Ongoing Merge Process ]
diff -u cdrtools-2.01+01a03/debian/patches/00list 
cdrtools-2.01+01a03/debian/patches/00list
--- cdrtools-2.01+01a03/debian/patches/00list
+++ cdrtools-2.01+01a03/debian/patches/00list
@@ -32,0 +33 @@
+41_revert_sg_io_eperm_failure
only in patch2:
unchanged:
--- cdrtools-2.01+01a03.orig/debian/patches/41_revert_sg_io_eperm_failure.dpatch
+++ cdrtools-2.01+01a03/debian/patches/41_revert_sg_io_eperm_failure.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 41_revert_sg_io_eperm_failure.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad cdrtools-2.01+01a03~/libscg/scsi-linux-sg.c 
cdrtools-2.01+01a03/libscg/scsi-linux-sg.c
+--- cdrtools-2.01+01a03~/libscg/scsi-linux-sg.c        2005-05-16 
23:48:37.000000000 +0200
++++ cdrtools-2.01+01a03/libscg/scsi-linux-sg.c 2006-08-17 12:01:37.000000000 
+0200
+@@ -1291,7 +1291,7 @@
+                       scglocal(scgp)->isold = 1;
+                       return (sg_rwsend(scgp));
+               }
+-              if (sp->ux_errno == ENXIO || sp->ux_errno == EPERM ||
++              if (sp->ux_errno == ENXIO || /* sp->ux_errno == EPERM || */
+                   sp->ux_errno == EINVAL || sp->ux_errno == EACCES) {
+                       return (-1);
+               }

Attachment: signature.asc
Description: Digital signature

Reply via email to