From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Thu, 6 Apr 2006 17:33:36 +0000 (+0000)
Subject: - updated
X-Git-Tag: auto/th/dvd+rw-tools-6_1-1~4
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=1a284c4b21e3dccaa1e599755d236a263736d644;p=packages%2Fdvd%2Brw-tools.git

- updated

Changed files:
    dvd+rw-tools-bacula.patch -> 1.3
---

diff --git a/dvd+rw-tools-bacula.patch b/dvd+rw-tools-bacula.patch
index 7d32973..6785f7f 100644
--- a/dvd+rw-tools-bacula.patch
+++ b/dvd+rw-tools-bacula.patch
@@ -1,18 +1,25 @@
---- dvd+rw-tools-6.0/growisofs.c.orig	2006-01-16 12:09:41.000000000 +0100
-+++ dvd+rw-tools-6.0/growisofs.c	2006-01-28 17:53:02.434731500 +0100
-@@ -320,6 +320,11 @@
-  * - Linux: fix for kernel version 2.6>=8, 2.6.8 itself is deficient,
-  *   but the problem can be worked around by installing this version
-  *   set-root-uid;
-+ * 5.22: (by Nicolas Boichat, Bacula project)
+--- dvd+rw-tools-6.1.old/growisofs.c	2006-01-26 22:16:54.000000000 +0100
++++ dvd+rw-tools-6.1/growisofs.c	2006-02-15 00:00:44.000000000 +0100
+@@ -355,12 +355,17 @@
+  * - Treat only x73xx OPC errors as fatal;
+  * - Fix typo in -speed scaling code;
+  * - permit tracksize to be not divisible by 32KB in DAO mode;
++ * 6.1.1: (by Nicolas Boichat, Bacula project)
 + * - Allow session to cross 4GB boundary regardless of medium type
 + *   (don't need to have a DL media)
 + * - Add a -F option (used instead of -M or -Z), which displays next_session
 + *   offset and capacity (free space = next_session - capacity).
-  * 6.0:
-  * - fix for DVD+R recordings in Samsung TS-H542A;
-  * - DVD-R Dual Layer DAO and Incremental support;
-@@ -2255,6 +2260,18 @@
+  */
+ #define PRINT_VERSION(cmd)	do {			\
+     char *s=strrchr((cmd),'/');				\
+     s ? s++ : (s=(cmd));				\
+     printf ("* %.*sgrowisofs by <appro@fy.chalmers.se>,"\
+-	    " version 6.1,\n",(int)(s-(cmd)),(cmd));	\
++	    " version 6.1.1,\n",(int)(s-(cmd)),(cmd));	\
+ } while (0)
+ 
+ #define _LARGEFILE_SOURCE 
+@@ -2329,6 +2334,18 @@
  		else          in_device = argv[++i];
  		dev_found = 'Z';
  	    }
@@ -31,18 +38,18 @@
  	    else if (!strcmp(opt,"-poor-man"))
  	    {	if (poor_man<0) poor_man = 1;
  		continue;
-@@ -2468,7 +2485,9 @@
+@@ -2542,7 +2559,9 @@
  		fprintf (stderr,"    you most likely want to use -Z option.\n"), 
  		exit (FATAL_START(errno));
  
 -	    if (dev_found == 'M')
-+	    if ((dev_found == 'M') || 
-+			((dev_found == 'F') && !(mmc_profile&0x10000)) && (the_buffer[0] || the_buffer[1] || the_buffer[2]))
++		if ((dev_found == 'M') || 
++			((dev_found == 'F') && !(mmc_profile&0x10000)) && (saved_descriptors[0].type[0] || saved_descriptors[0].type[1] || saved_descriptors[0].type[2]))
 +				/* -F : The medium is not blank, there is a fs on it (the_buffer[0,1 or 2] != 0), so compute next_session. */
  	    {	if (memcmp (saved_descriptors[0].type,"\1CD001",6))
  	            fprintf (stderr,":-( %s doesn't look like isofs...\n",
  		    		in_device), exit(FATAL_START(EMEDIUMTYPE));
-@@ -2491,7 +2510,7 @@
+@@ -2565,7 +2584,7 @@
  			exit(FATAL_START(EINVAL));
  		}
  		else if (next_session > (0x200000-0x5000)) /* 4GB/2K-40MB/2K */
@@ -51,7 +58,7 @@
  			fprintf (stderr,":-( next session would cross 4GB "
  					"boundary, aborting...\n"),
  			exit (FATAL_START(ENOSPC));
-@@ -2534,7 +2553,7 @@
+@@ -2608,7 +2627,7 @@
  	exit (FATAL_START(EINVAL));
  
      if (imgfd<0)
@@ -60,7 +67,7 @@
  	    fprintf (stderr,"%s: no mkisofs options specified, "
  			    "aborting...\n",argv[0]),
  	    exit (FATAL_START(EINVAL));
-@@ -2747,6 +2766,15 @@
+@@ -2880,6 +2899,15 @@
  	}
      }