Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 disk/cdrtools/HISTORY                          |    3 ++
 disk/cdrtools/cdrtools-2.01.01a03-rezero.patch |   28 
++++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit 7a171e382d620fbe01f98a07037ae951111dbc99
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    cdrtools: fixed patch

diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index f2908bb..4f30dae 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,6 @@
+2007-07-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * cdrtools-2.01.01a03-rezero.patch: updated to work again
+
 2007-07-10 Eric Sandall <sandalle AT sourcemage.urg>
        * DETAILS: Updated to 2.01.01a30
 
diff --git a/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch 
b/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch
index da1b7b6..fd9faaa 100644
--- a/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch
+++ b/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch
@@ -1,13 +1,23 @@
-diff -Naur cdrtools-2.01.01.orig/cdrecord/cdrecord.c 
cdrtools-2.01.01/cdrecord/cdrecord.c
---- cdrtools-2.01.01.orig/cdrecord/cdrecord.c  2007-07-09 10:56:55.613184429 
-0700
-+++ cdrtools-2.01.01/cdrecord/cdrecord.c       2007-07-09 10:59:10.092668741 
-0700
-@@ -4187,7 +4187,8 @@
-       scsi_start_stop_unit(scgp, 1, 0, immed);
-       wait_unit_ready(scgp, 120);
+--- cdrtools-2.01.01/cdrecord/cdrecord.c.orig  2007-07-19 18:50:02.000000000 
+0200
++++ cdrtools-2.01.01/cdrecord/cdrecord.c       2007-07-19 18:51:17.000000000 
+0200
+@@ -4214,16 +4214,17 @@
+        * with e.g. vendor unique commands, where cdrecord would miss
+        * functionality or fail completely after starting to write.
+        */
++  /* kernel >= 2.6.12 does not like that as user
+       seterrno(0);
        scgp->silent++;
--      rezero_unit(scgp);      /* Is this needed? Not supported by some 
drives */
-+      /* kernel >= 2.6.12 does not like that as user
-+      rezero_unit(scgp); */   /* Is this needed? Not supported by some 
drvives */
+-      code = rezero_unit(scgp); /* Not supported by some drives */
++      code = rezero_unit(scgp);
        scgp->silent--;
+       err = geterrno();
+       if (code < 0 && (err == EPERM || err == EACCES)) {
+-              linuxcheck();   /* For version 1.349 of cdrecord.c */
++              linuxcheck();
+               scg_openerr("");
+       }
+-
++  */
+ 
        test_unit_ready(scgp);
        scsi_start_stop_unit(scgp, 1, 0, immed);