SOURCES: dvd+rw-tools-bacula.patch, dvd+rw-tools-gcc4.patch - upda...
pluto
pluto at pld-linux.org
Sat Jan 28 18:16:26 CET 2006
Author: pluto Date: Sat Jan 28 17:16:25 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 6.0.
---- Files affected:
SOURCES:
dvd+rw-tools-bacula.patch (1.1 -> 1.2) , dvd+rw-tools-gcc4.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/dvd+rw-tools-bacula.patch
diff -u SOURCES/dvd+rw-tools-bacula.patch:1.1 SOURCES/dvd+rw-tools-bacula.patch:1.2
--- SOURCES/dvd+rw-tools-bacula.patch:1.1 Tue Nov 29 11:39:04 2005
+++ SOURCES/dvd+rw-tools-bacula.patch Sat Jan 28 18:16:18 2006
@@ -1,7 +1,6 @@
-diff -u dvd+rw-tools-5.21.4.10.8/growisofs.c dvd+rw-tools-5.22/growisofs.c
---- dvd+rw-tools-5.21.4.10.8/growisofs.c 2004-08-25 01:02:29.000000000 +0200
-+++ dvd+rw-tools-5.22/growisofs.c 2005-10-16 22:48:02.000000000 +0200
-@@ -315,12 +315,17 @@
+--- 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;
@@ -10,17 +9,10 @@
+ * (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).
- */
- #define PRINT_VERSION(cmd) do { \
- char *s=strrchr((cmd),'/'); \
- s ? s++ : (s=(cmd)); \
- printf ("* %.*sgrowisofs by <appro at fy.chalmers.se>,"\
-- " version 5.21,\n",(int)(s-(cmd)),(cmd)); \
-+ " version 5.22,\n",(int)(s-(cmd)),(cmd)); \
- } while (0)
-
- #define _LARGEFILE_SOURCE
-@@ -1720,6 +1725,18 @@
+ * 6.0:
+ * - fix for DVD+R recordings in Samsung TS-H542A;
+ * - DVD-R Dual Layer DAO and Incremental support;
+@@ -2255,6 +2260,18 @@
else in_device = argv[++i];
dev_found = 'Z';
}
@@ -39,7 +31,7 @@
else if (!strcmp(opt,"-poor-man"))
{ if (poor_man<0) poor_man = 1;
continue;
-@@ -1908,7 +1925,9 @@
+@@ -2468,7 +2485,9 @@
fprintf (stderr," you most likely want to use -Z option.\n"),
exit (FATAL_START(errno));
@@ -47,10 +39,10 @@
+ if ((dev_found == 'M') ||
+ ((dev_found == 'F') && !(mmc_profile&0x10000)) && (the_buffer[0] || the_buffer[1] || the_buffer[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 (the_buffer,"\1CD001",6))
+ { if (memcmp (saved_descriptors[0].type,"\1CD001",6))
fprintf (stderr,":-( %s doesn't look like isofs...\n",
in_device), exit(FATAL_START(EMEDIUMTYPE));
-@@ -1932,7 +1951,7 @@
+@@ -2491,7 +2510,7 @@
exit(FATAL_START(EINVAL));
}
else if (next_session > (0x200000-0x5000)) /* 4GB/2K-40MB/2K */
@@ -59,7 +51,7 @@
fprintf (stderr,":-( next session would cross 4GB "
"boundary, aborting...\n"),
exit (FATAL_START(ENOSPC));
-@@ -1974,7 +1993,7 @@
+@@ -2534,7 +2553,7 @@
exit (FATAL_START(EINVAL));
if (imgfd<0)
@@ -68,7 +60,7 @@
fprintf (stderr,"%s: no mkisofs options specified, "
"aborting...\n",argv[0]),
exit (FATAL_START(EINVAL));
-@@ -2114,6 +2133,15 @@
+@@ -2747,6 +2766,15 @@
}
}
================================================================
Index: SOURCES/dvd+rw-tools-gcc4.patch
diff -u SOURCES/dvd+rw-tools-gcc4.patch:1.1 SOURCES/dvd+rw-tools-gcc4.patch:1.2
--- SOURCES/dvd+rw-tools-gcc4.patch:1.1 Sat Jan 28 14:04:08 2006
+++ SOURCES/dvd+rw-tools-gcc4.patch Sat Jan 28 18:16:19 2006
@@ -1,68 +1,20 @@
---- dvd+rw-tools-5.21.4.10.8/growisofs.c.orig 2006-01-28 13:45:32.000000000 +0100
-+++ dvd+rw-tools-5.21.4.10.8/growisofs.c 2006-01-28 13:50:40.665927750 +0100
-@@ -1354,8 +1354,8 @@
- { tracksize = dao_size ? (dao_size*CD_BLOCK) : sb.st_size;
- progress->final=outoff+tracksize;
- if (capacity && progress->final > capacity)
-- { fprintf (stderr,":-( %s: %lld blocks are free, "
-- "%lld to be written!\n",
-+ { fprintf (stderr,":-( %s: %zd blocks are free, "
-+ "%zd to be written!\n",
- ioctl_device,
- (capacity-outoff)/2048,tracksize/2048);
- if (overburn)
-@@ -1387,14 +1387,14 @@
- (double)(current-outoff);
- delta *= ratio - 1.0;
- velocity=(current-lastcurrent)/(-slept*1024*1385);
-- fprintf (stdout,"%10lld/%lld (%4.1f%%) @%.1fx, "
-+ fprintf (stdout,"%10zd/%zd (%4.1f%%) @%.1fx, "
- "remaining %d:%02d\n",
- current,progress->final,100.0/ratio,
- velocity,delta/60,delta%60);
- lastcurrent=current;
- }
- else
-- fprintf (stdout,"%10lld/%lld (%4.1f%%) @0x, remaining ??:??\n",
-+ fprintf (stdout,"%10zd/%zd (%4.1f%%) @0x, remaining ??:??\n",
- current,progress->final,0.0);
- fflush (stdout);
- }
-@@ -1415,8 +1415,8 @@
- { if (tracksize==0)
- { tracksize=from_733(descr->volume_space_size)*CD_BLOCK;
- if (capacity && (outoff+tracksize) > capacity)
-- { fprintf (stderr,":-( %s: %lld blocks are free, "
-- "%lld to be written\n",
-+ { fprintf (stderr,":-( %s: %zd blocks are free, "
-+ "%zd to be written\n",
- ioctl_device,
- (capacity-outoff)/2048,
- tracksize/2048);
-@@ -1542,7 +1542,7 @@
- outoff += DVD_BLOCK;
- }
+--- dvd+rw-tools-6.0/growisofs.c.orig 2006-01-28 18:06:28.000000000 +0100
++++ dvd+rw-tools-6.0/growisofs.c 2006-01-28 18:07:52.134334250 +0100
+@@ -434,7 +434,7 @@
+ #endif
-- printf ("builtin_dd: %lld*2KB out @ average %.1fx1385KBps\n",
-+ printf ("builtin_dd: %zd*2KB out @ average %.1fx1385KBps\n",
- (outoff-startoff)/2048,
- ((outoff-startoff)/(1024.0*1385.0))/(time(NULL)-progress->zero));
- out:
-@@ -1941,7 +1941,7 @@
+ #ifndef LLD
+-#define LLD "lld"
++#define LLD "zd"
+ #endif
- dup2(in_fd,imgfd); /* kludge! */
- if (lseek64 (imgfd,off,SEEK_SET) == (off64_t)-1)
-- fprintf (stderr,":-( %s: unable to lseek(%lld): ",
-+ fprintf (stderr,":-( %s: unable to lseek(%zd): ",
- in_device,off),
- perror (NULL), exit(FATAL_START(errno));
- } else if (alleged_next_session!=next_session)
-@@ -2135,10 +2135,10 @@
+ typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
+@@ -2768,10 +2768,10 @@
if (dev_found == 'F') {
off64_t capacity = 0;
- printf("next_session=%lld\n", next_session*CD_BLOCK);
-+ printf("next_session=%zd\n", next_session*CD_BLOCK);
++ printf("next_session=%ld\n", next_session*CD_BLOCK);
if (ioctl_handle!=INVALID_HANDLE)
capacity = get_capacity (ioctl_handle);
- printf("capacity=%lld\n", capacity);
@@ -70,14 +22,3 @@
exit(0);
}
---- dvd+rw-tools-5.21.4.10.8/growisofs_mmc.cpp.orig 2004-07-16 14:48:57.000000000 +0200
-+++ dvd+rw-tools-5.21.4.10.8/growisofs_mmc.cpp 2006-01-28 13:50:59.583110000 +0100
-@@ -91,7 +91,7 @@
- if ((n=fcntl (ioctl_fd,F_GETFD))<0) n=0;
- fcntl (ioctl_fd,F_SETFD,n&~FD_CLOEXEC);
-
-- sprintf (str,"%d",ioctl_fd);
-+ sprintf (str,"%ld",ioctl_fd);
- execlp(_argv[0],"-reload",str,ioctl_device,NULL);
- }
- else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/dvd+rw-tools-bacula.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/dvd+rw-tools-gcc4.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list