- updated for 7.0

[packages/dvd+rw-tools.git] / dvd+rw-tools-bacula.patch

diff --git a/dvd+rw-tools-bacula.patch b/dvd+rw-tools-bacula.patch
index 6785f7fb711a32396ea9940216871f760481b389..1d8f206976d5ea2ff30ec7c760a39f87e3cd3a7c 100644 (file)
--- a/dvd+rw-tools-bacula.patch
+++ b/dvd+rw-tools-bacula.patch
@@ -1,10 +1,10 @@
---- 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)
+--- dvd+rw-tools-7.0/growisofs.c.orig  2006-09-24 19:28:53.000000000 +0200
++++ dvd+rw-tools-7.0/growisofs.c       2006-10-06 10:24:50.065971000 +0200
+@@ -370,12 +370,17 @@
+  *   upon Layer Break command, therefore longer timeout is required;
+  * - Linux: deploy BLKFLSBUF to avoid media reloads when possible;
+  * - add unit buffer utilization indicator [by request from K3b];
++ * 7.0.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
@@ -14,12 +14,12 @@
      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));  \
+-          " version 7.0,\n",(int)(s-(cmd)),(cmd));    \
++          " version 7.0.1,\n",(int)(s-(cmd)),(cmd));  \
  } while (0)
  \f
  #define _LARGEFILE_SOURCE 
-@@ -2329,6 +2334,18 @@
+@@ -2773,6 +2778,18 @@
                else          in_device = argv[++i];
                dev_found = 'Z';
            }
@@ -38,7 +38,7 @@
            else if (!strcmp(opt,"-poor-man"))
            {   if (poor_man<0) poor_man = 1;
                continue;
-@@ -2542,7 +2559,9 @@
+@@ -2993,7 +3010,9 @@
                fprintf (stderr,"    you most likely want to use -Z option.\n"), 
                exit (FATAL_START(errno));
  
@@ -49,16 +49,17 @@
            {   if (memcmp (saved_descriptors[0].type,"\1CD001",6))
                    fprintf (stderr,":-( %s doesn't look like isofs...\n",
                                in_device), exit(FATAL_START(EMEDIUMTYPE));
-@@ -2565,7 +2584,7 @@
+@@ -3016,8 +3035,7 @@
                        exit(FATAL_START(EINVAL));
                }
                else if (next_session > (0x200000-0x5000)) /* 4GB/2K-40MB/2K */
--                  if ((mmc_profile&0xFFFF)!=0x2B || !no_4gb_check)
+-                  if ((mmc_profile&0xFFFF)<0x20 ||
+-                      ((mmc_profile&0xFFFF)<0x40 && !no_4gb_check))
 +                  if (!no_4gb_check)
                        fprintf (stderr,":-( next session would cross 4GB "
                                        "boundary, aborting...\n"),
                        exit (FATAL_START(ENOSPC));
-@@ -2608,7 +2627,7 @@
+@@ -3060,7 +3078,7 @@
        exit (FATAL_START(EINVAL));
  
      if (imgfd<0)
@@ -67,7 +68,7 @@
            fprintf (stderr,"%s: no mkisofs options specified, "
                            "aborting...\n",argv[0]),
            exit (FATAL_START(EINVAL));
-@@ -2880,6 +2899,15 @@
+@@ -3244,6 +3262,15 @@
        }
      }