changed debian/source/format to native
This commit is contained in:
openKylinBot
parent
a3a07ff773
commit
81ca410a14
|
|
@ -1,25 +0,0 @@
|
|||
Author: n/a
|
||||
Description: Fixes to fail closing session on some PIONEER DVD-RW drives
|
||||
|
||||
--- a/growisofs_mmc.cpp
|
||||
+++ b/growisofs_mmc.cpp
|
||||
@@ -1743,8 +1743,17 @@
|
||||
cmd[1] = 0x01; // "IMMED"
|
||||
cmd[2] = 0x02; // "Close session"
|
||||
cmd[9] = 0;
|
||||
- if ((err=cmd.transport()))
|
||||
- sperror ("CLOSE SESSION",err);
|
||||
+
|
||||
+ // it seems, that pioneer is a bit crappy
|
||||
+ while (err=cmd.transport()) {
|
||||
+ if (SK(err)==0x2 && ASC(err)==0x04 && ASCQ(err)==0x07) {
|
||||
+ sperror ("CLOSE SESSION (but try to continue)",err);
|
||||
+ usleep(10000);
|
||||
+ } else {
|
||||
+ sperror ("CLOSE SESSION",err);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (wait_for_unit (cmd)) break;
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
Author: Daniel Baumann <daniel@debian.org>
|
||||
Description: Fix manpage section
|
||||
|
||||
--- a/growisofs.1
|
||||
+++ b/growisofs.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-.TH GROWISOFS 1m "1 Mar 2008" "growisofs 7.1"
|
||||
+.TH GROWISOFS 1 "1 Mar 2008" "growisofs 7.1"
|
||||
.SH NAME
|
||||
growisofs \- combined mkisofs frontend/DVD recording program.
|
||||
.SH SYNOPSIS
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Author: Joe Shaw <joeshaw@suse.de>
|
||||
Description: Don't abort when a DVD-DL disk is underful (Closes: #340698).
|
||||
|
||||
--- a/growisofs_mmc.cpp
|
||||
+++ b/growisofs_mmc.cpp
|
||||
@@ -1640,9 +1640,7 @@
|
||||
blocks += 15, blocks &= ~15;
|
||||
|
||||
if (blocks <= split)
|
||||
- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
|
||||
- " use single layer media for this recording\n"),
|
||||
- exit (FATAL_START(EMEDIUMTYPE));
|
||||
+ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
|
||||
|
||||
blocks /= 16;
|
||||
blocks += 1;
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
Author: Petr Salinger <Petr.Salinger@seznam.cz>
|
||||
Description: FTBFS on GNU/kFreeBSD (Closes: #374841).
|
||||
|
||||
--- a/Makefile.m4
|
||||
+++ b/Makefile.m4
|
||||
@@ -14,6 +14,7 @@
|
||||
ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
|
||||
ifelse(OS,OpenBSD,[define([OS],[BSD])])
|
||||
ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam])
|
||||
+ifelse(OS,GNU/kFreeBSD,[define([OS],[Linux])LDLIBS=-lcam])
|
||||
ifelse(OS,IRIX64,[define([OS],[IRIX])])
|
||||
|
||||
ifelse(OS,Darwin,[
|
||||
@@ -188,7 +189,7 @@
|
||||
CFLAGS +=$(WARN) -O2 -D_REENTRANT
|
||||
CXX =g++
|
||||
CXXFLAGS+=$(WARN) -O2 -fno-exceptions -D_REENTRANT
|
||||
-LDLIBS =-lpthread
|
||||
+LDLIBS +=-lpthread
|
||||
LINK.o =$(LINK.cc)
|
||||
|
||||
prefix?=/usr/local
|
||||
--- a/growisofs.c
|
||||
+++ b/growisofs.c
|
||||
@@ -403,7 +403,7 @@
|
||||
#define _LARGEFILE64_SOURCE
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
|
||||
-#if defined(__linux)
|
||||
+#if defined(__linux) || defined(__GLIBC__)
|
||||
/* ... and "engage" glibc large file support */
|
||||
# ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE
|
||||
@@ -459,7 +459,7 @@
|
||||
# define FATAL_START(e) (0x80|(e))
|
||||
# define FATAL_MASK 0x7F
|
||||
|
||||
-#ifdef __FreeBSD__
|
||||
+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
|
||||
# include <sys/syscall.h>
|
||||
# ifndef SYS_mlockall
|
||||
# define SYS_mlockall 324
|
||||
@@ -995,7 +995,7 @@
|
||||
goto open_rw;
|
||||
}
|
||||
|
||||
-#elif defined(__FreeBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
|
||||
|
||||
#include <sys/cdio.h>
|
||||
#include <camlib.h>
|
||||
@@ -2937,7 +2937,7 @@
|
||||
if (setrlimit(RLIMIT_MEMLOCK,&rlim)) break;
|
||||
}
|
||||
# endif
|
||||
-# ifdef __FreeBSD__
|
||||
+# if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
|
||||
syscall(SYS_mlockall,3);
|
||||
# else
|
||||
mlockall(MCL_CURRENT|MCL_FUTURE);
|
||||
--- a/transport.hxx
|
||||
+++ b/transport.hxx
|
||||
@@ -483,7 +483,7 @@
|
||||
{ return 1; }
|
||||
};
|
||||
|
||||
-#elif defined(__FreeBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <camlib.h>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Author: Matt Zimmerman <mdz@canonical.com>
|
||||
Description: Disable obnoxious beeping.
|
||||
|
||||
--- a/growisofs.c
|
||||
+++ b/growisofs.c
|
||||
@@ -3453,14 +3453,14 @@
|
||||
printf ("'\n");
|
||||
fflush (stdout);
|
||||
|
||||
- if ((warn_for_isofs&2) && !dry_run && !no_tty_check)
|
||||
+/* if ((warn_for_isofs&2) && !dry_run && !no_tty_check)
|
||||
{ fprintf (stderr,"Sleeping for 5 sec...\a"), poll (NULL,0,1000);
|
||||
fprintf (stderr,"\b\b\b\b\b\b\b\b4 sec...\a"), poll (NULL,0,1000);
|
||||
fprintf (stderr,"\b\b\b\b\b\b\b\b3 sec...\a"), poll (NULL,0,1000);
|
||||
fprintf (stderr,"\b\b\b\b\b\b\b\b2 sec...\a"), poll (NULL,0,1000);
|
||||
fprintf (stderr,"\b\b\b\b\b\b\b\b1 sec...\a"), poll (NULL,0,1000);
|
||||
fprintf (stderr,"\b\b\b\b\b\b\b\b0 sec...\r");
|
||||
- }
|
||||
+ } */
|
||||
|
||||
#if defined(__unix) || defined(__unix__)
|
||||
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
Author: Daniel Baumann <daniel@debian.org>
|
||||
Description: Update any cdrtools related information in the code to cdrkit.
|
||||
|
||||
--- a/growisofs.c
|
||||
+++ b/growisofs.c
|
||||
@@ -2724,7 +2724,7 @@
|
||||
perror (":-( unable to create pipe"), exit(FATAL_START(errno));
|
||||
|
||||
if ((mkisofs_pid=fork ()) == (pid_t)-1)
|
||||
- perror (":-( unable to fork mkisofs"), exit(FATAL_START(errno));
|
||||
+ perror (":-( unable to fork genisoimage"), exit(FATAL_START(errno));
|
||||
else if (mkisofs_pid == 0)
|
||||
{ dup2 (fildes[1],1);
|
||||
close (fildes[0]);
|
||||
@@ -2844,7 +2844,7 @@
|
||||
{ DWORD ret;
|
||||
|
||||
if (GetExitCodeProcess (pi.hProcess,&ret) && ret)
|
||||
- fprintf (stderr,":-( mkisofs has failed: %d\n",ret),
|
||||
+ fprintf (stderr,":-( genisoimage has failed: %d\n",ret),
|
||||
exit (1);
|
||||
else
|
||||
perror (":-( GetExitCodeProcess failed"), exit(errno);
|
||||
@@ -2963,8 +2963,8 @@
|
||||
perror (NULL), exit (FATAL_START(errno));
|
||||
|
||||
#if defined(__unix) || defined(__unix__)
|
||||
- env = getenv ("MKISOFS");
|
||||
- mkisofs_argv[0] = (env?env:"mkisofs");
|
||||
+ env = getenv ("GENISOIMAGE");
|
||||
+ mkisofs_argv[0] = (env?env:"genisoimage");
|
||||
#elif defined(_WIN32)
|
||||
/*
|
||||
* On Windows I insist on mkisofs.exe to reside in very same
|
||||
@@ -3151,8 +3151,8 @@
|
||||
else if (argv[i][1] == '?' || !strcmp(opt,"-help"))
|
||||
{ PRINT_VERSION (argv[0]);
|
||||
printf ("- usage: %s [-dvd-compat] [-overburn] [-speed=1] \\\n"
|
||||
- " -[ZM] /dev/dvd <mkisofs options>\n",argv[0]);
|
||||
- printf (" for <mkisofs options> see 'mkisofs %s'\n",opt);
|
||||
+ " -[ZM] /dev/dvd <genisoimage options>\n",argv[0]);
|
||||
+ printf (" for <genisoimage options> see 'genisoimage %s'\n",opt);
|
||||
exit (FATAL_START(EINVAL));
|
||||
}
|
||||
else if (strstr (opt,"-version"))
|
||||
@@ -3320,12 +3320,12 @@
|
||||
|
||||
if (imgfd<0)
|
||||
{ if (mkisofs_argc==1 && dev_found!='F')
|
||||
- fprintf (stderr,"%s: no mkisofs options specified, "
|
||||
+ fprintf (stderr,"%s: no genisoimage options specified, "
|
||||
"aborting...\n",argv[0]),
|
||||
exit (FATAL_START(EINVAL));
|
||||
}
|
||||
else if ((mkisofs_argc-growisofs_argc)>1)
|
||||
- fprintf (stderr,"%s: no mkisofs options are permitted with =, "
|
||||
+ fprintf (stderr,"%s: no genisoimage options are permitted with =, "
|
||||
"aborting...\n",argv[0]),
|
||||
exit (FATAL_START(EINVAL));
|
||||
|
||||
@@ -3576,7 +3576,7 @@
|
||||
|
||||
if (saved_descriptors[i].type[0] != descr[i].type[0])
|
||||
{ fprintf (stderr,":-? volume descriptor mismatch, did you "
|
||||
- "use same mkisofs options?\n");
|
||||
+ "use same genisoimage options?\n");
|
||||
break;
|
||||
}
|
||||
memcpy (descr+i,&saved_descriptors[i],sizeof(*descr));
|
||||
|
|
@ -1,221 +0,0 @@
|
|||
Author: Daniel Baumann <daniel@debian.org>
|
||||
Description: Update any cdrtools related information in the documentation to cdrkit.
|
||||
|
||||
--- a/growisofs.1
|
||||
+++ b/growisofs.1
|
||||
@@ -1,6 +1,6 @@
|
||||
.TH GROWISOFS 1 "1 Mar 2008" "growisofs 7.1"
|
||||
.SH NAME
|
||||
-growisofs \- combined mkisofs frontend/DVD recording program.
|
||||
+growisofs \- combined genisoimage frontend/DVD recording program.
|
||||
.SH SYNOPSIS
|
||||
.B growisofs
|
||||
[\fB\-dry\-run\fP]
|
||||
@@ -9,10 +9,10 @@
|
||||
[\fB\-speed=1\fP]
|
||||
\-[\fBZ|M\fP]
|
||||
.I /dev/dvd
|
||||
-.I <mkisofs-options>
|
||||
+.I <genisoimage-options>
|
||||
|
||||
.SH DESCRIPTION
|
||||
-\fBgrowisofs\fP was originally designed as a frontend to \fBmkisofs\fP
|
||||
+\fBgrowisofs\fP was originally designed as a frontend to \fBgenisoimage\fP
|
||||
to facilitate appending of data to ISO9660 volumes residing on
|
||||
random-access media such as DVD+RW, DVD\-RAM, plain files, hard disk
|
||||
partitions. In the course of development general purpose DVD recording
|
||||
@@ -35,7 +35,7 @@
|
||||
Merge a new session to an existing one.
|
||||
.TP
|
||||
.BI \-version
|
||||
-Print version information and invoke \fBmkisofs\fP, also with \-version
|
||||
+Print version information and invoke \fBgenisoimage\fP, also with \-version
|
||||
option.
|
||||
.TP
|
||||
.BI \-dvd\-compat
|
||||
@@ -47,7 +47,7 @@
|
||||
.BI \-dry\-run
|
||||
At dry\-run \fBgrowisofs\fP performs all the steps till, but not
|
||||
including the first write operation. Most notably check for "overburn"
|
||||
-condition is performed, which implies that mkisofs is invoked and
|
||||
+condition is performed, which implies that genisoimage is invoked and
|
||||
terminated prematurely.
|
||||
.TP
|
||||
.BI \-overburn
|
||||
@@ -68,8 +68,8 @@
|
||||
recordings are commonly performed at ~1/2 of advertised speed, because
|
||||
of defect management being in effect.
|
||||
.TP
|
||||
-.BI <mkisofs-options>
|
||||
-More options can be found in the manpage for \fBmkisofs\fP.
|
||||
+.BI <genisoimage-options>
|
||||
+More options can be found in the manpage for \fBgenisoimage\fP.
|
||||
|
||||
.P
|
||||
There are several undocumented options commonly denoted with
|
||||
@@ -82,7 +82,7 @@
|
||||
need to use them directly can as well consult the source code or obtain
|
||||
specific instructions elsewhere.
|
||||
|
||||
-.SH DIFFERENCES WITH RUNNING MKISOFS DIRECTLY
|
||||
+.SH DIFFERENCES WITH RUNNING GENISOIMAGE DIRECTLY
|
||||
.P
|
||||
When using growisofs you may not use the
|
||||
.B \-o
|
||||
@@ -99,7 +99,7 @@
|
||||
Otherwise everything that applies to
|
||||
.I [multisession]
|
||||
mastering with
|
||||
-.B mkisofs
|
||||
+.B genisoimage
|
||||
applies to
|
||||
.B growisofs
|
||||
as well.
|
||||
@@ -107,7 +107,8 @@
|
||||
needs at least
|
||||
.B mkisofs
|
||||
version 1.14, version 2.0 is required for multisession write-once
|
||||
-recordings.
|
||||
+recordings or
|
||||
+.B genisoimage.
|
||||
|
||||
.SH EXAMPLES
|
||||
Actual device names vary from one operating system to another. We use
|
||||
@@ -146,12 +147,12 @@
|
||||
.SH NOTES
|
||||
If executed under sudo(8) growisofs refuses to start. This is done for
|
||||
the following reason. Naturally growisofs has to access the data set to
|
||||
-be recorded to optical media, either indirectly by letting mkisofs
|
||||
+be recorded to optical media, either indirectly by letting genisoimage
|
||||
generate ISO9660 layout on-the-fly or directly if a pre-mastered image
|
||||
is to be recorded. Being executed under sudo(8), growisofs effectively
|
||||
grants sudoers read access to \fIany\fP file in the file system. The
|
||||
-situation is intensified by the fact that growisofs parses MKISOFS
|
||||
-environment variable in order to determine alternative path to mkisofs
|
||||
+situation is intensified by the fact that growisofs parses GENISOIMAGE
|
||||
+environment variable in order to determine alternative path to genisoimage
|
||||
executable image. This means that being executed under sudo(8),
|
||||
growisofs effectively grants sudoers right to execute program of their
|
||||
choice with elevated privileges. If you for any reason still find the
|
||||
@@ -162,13 +163,13 @@
|
||||
.nf
|
||||
#!/bin/ksh
|
||||
unset SUDO_COMMAND
|
||||
- export MKISOFS=/path/to/trusted/mkisofs
|
||||
+ export GENISOIMAGE=/path/to/trusted/genisoimage
|
||||
exec growisofs "$@"
|
||||
.fi
|
||||
|
||||
But note that the recommended alternative to the above "workaround" is
|
||||
actually to install growisofs set\-root\-uid, in which case it will drop
|
||||
-privileges prior accessing data or executing mkisofs in order to
|
||||
+privileges prior accessing data or executing genisoimage in order to
|
||||
preclude unauthorized access to the data.
|
||||
|
||||
If the media already carries isofs and \fBgrowisofs\fP is invoked with
|
||||
@@ -214,7 +215,7 @@
|
||||
Most up-to-date information on dvd+rw\-tools is available at
|
||||
http://fy.chalmers.se/~appro/linux/DVD+RW/.
|
||||
.PP
|
||||
-The manpage for \fBmkisofs\fP.
|
||||
+The manpage for \fBgenisoimage\fP.
|
||||
|
||||
.SH AUTHORS
|
||||
Andy Polyakov <appro@fy.chalmers.se> stands for programming and on-line
|
||||
--- a/index.html
|
||||
+++ b/index.html
|
||||
@@ -137,7 +137,9 @@
|
||||
front-end to mkisofs,</B> i.e. invokes mkisofs to perform the
|
||||
actual ISO9660 file system layout. Secondly, the DVD burners
|
||||
available on the market can burn even CD-R[W] media and
|
||||
- cdrecord is the tool for this job.</TR>
|
||||
+ cdrecord is the tool for this job [and this job only].
|
||||
+ Note that mkisofs is replaced with its successor genisoimage from
|
||||
+ <A HREF="http://www.cdrkit.org/">cdrkit</a>.</TR>
|
||||
</TABLE>
|
||||
|
||||
<!--
|
||||
@@ -480,13 +482,13 @@
|
||||
<A NAME="growisofs"><P></A><LI><P ALIGN="JUSTIFY"><B>Burning with <A
|
||||
HREF="tools/growisofs.c">growisofs</A>.</B> There is hardly a need for
|
||||
manual for growisofs. In a nutshell growisofs just passes all command
|
||||
-line arguments to mkisofs and dumps its output directly onto the media.
|
||||
+line arguments to genisoimage and dumps its output directly onto the media.
|
||||
The first part means that you basically can [well, <I>should</I>]
|
||||
-consult <A HREF="mkisofs.8.html">mkisofs manual page</A> and
|
||||
+consult <A HREF="genisoimage.8.html">genisoimage manual page</A> and
|
||||
accompanying reference documentation (including multisession related
|
||||
section[s]) and the second part means that you shouldn't expect an
|
||||
ISO-image on the standard output (nor make sure you have enough free
|
||||
-temporary storage<TT>:-)</TT>. Differences from mkisofs command line
|
||||
+temporary storage<TT>:-)</TT>. Differences from genisoimage command line
|
||||
are:
|
||||
|
||||
<P><UL>
|
||||
@@ -494,12 +496,12 @@
|
||||
<LI>you don't have to specify -C option, growisofs will construct one
|
||||
for you;
|
||||
<LI>there is internal -Z option for initial session recording, this
|
||||
-substitutes for originally suggested 'mkisofs | dd of=/dev/scd0';
|
||||
+substitutes for originally suggested 'genisoimage | dd of=/dev/scd0';
|
||||
</UL>
|
||||
|
||||
<P ALIGN="JUSTIFY">Otherwise <I>everything</I> that applies to
|
||||
-[multisession] mastering with mkisofs applies to growisofs as well. For
|
||||
-example just like with mkisofs you should make a note on which options
|
||||
+[multisession] mastering with genisoimage applies to growisofs as well. For
|
||||
+example just like with genisoimage you should make a note on which options
|
||||
you used to master the initial "session" with and stick to
|
||||
them, e.g.:
|
||||
|
||||
@@ -508,9 +510,10 @@
|
||||
growisofs -M /dev/scd0 <FONT COLOR="red">-R -J</FONT> /more/files
|
||||
</PRE></BLOCKQUOTE>
|
||||
|
||||
-<P ALIGN="JUSTIFY">Oh! Do make sure you have at least mkisofs <FONT
|
||||
-COLOR="red">1.14</FONT> on your $PATH (mkisofs 1.14 is part of cdrtools
|
||||
-1.10). If you consider passing <TT>/same/files</TT> as argument, or in
|
||||
+<P ALIGN="JUSTIFY">Oh! Do make sure you have genisoimage on your $PATH
|
||||
+(genisoimage is part of <A HREF="http://www.cdrkit.org/">cdrkit</A>,
|
||||
+or at least mkisofs <FONT COLOR="red">1.14</FONT> (mkisofs 1.14 is part of
|
||||
+cdrtools 1.10). If you consider passing <TT>/same/files</TT> as argument, or in
|
||||
other words consider deploying growisofs for <I>incremental</I>
|
||||
multisession backups, then you shall find <A
|
||||
HREF="mkisofs-2.01a16-root.diff">this '-old-root' extension</A> to
|
||||
@@ -586,7 +589,8 @@
|
||||
unsupported it actually still works in 2.6 (I for one still use it).
|
||||
|
||||
<LI>If you go for BD-R/DVD±R multisessioning, you have to use
|
||||
-mkisofs from <A HREF="ftp://ftp.berlios.de/pub/cdrecord/">cdrtools-2.0
|
||||
+genisoimage from <A HREF="http://www.cdrkit.org/">cdrkit-1.0 or later</A>,
|
||||
+or mkisofs from <A HREF="ftp://ftp.berlios.de/pub/cdrecord/">cdrtools-2.0
|
||||
or later</A> or apply <A HREF="multi.diff">this patch</A>.
|
||||
|
||||
<LI>And when it comes to <B>DVD+R Double Layer and <NOBR>DVD-R</NOBR>
|
||||
@@ -630,7 +634,7 @@
|
||||
access it, '<TT>dd if=/dev/scd<FONT COLOR="red">N</FONT> count=0</TT>'
|
||||
would do. Then verify that kernel logs "<TT>sr<FONT
|
||||
COLOR="red">N</FONT>: mmc-3 profile: 1Ah</TT>". You should now be
|
||||
-able to '<TT>mkisofs -pad . | dd of=/dev/scd<FONT COLOR="red">N</FONT>
|
||||
+able to '<TT>genisoimage -pad . | dd of=/dev/scd<FONT COLOR="red">N</FONT>
|
||||
obs=32k</TT>' or even '<TT>mke2fs -b 2048 /dev/scd<FONT
|
||||
COLOR="red">N</FONT></TT>' and observe kernel logging "<TT>sr<FONT
|
||||
COLOR="red">N</FONT>: dirty DVD+RW media</TT>."
|
||||
@@ -802,7 +806,7 @@
|
||||
<TR VALIGN="TOP" ALIGN="JUSTIFY">
|
||||
<TD><FONT SIZE="-1"><SUP>(***)</SUP></FONT>
|
||||
<TD><FONT SIZE="-1">E.g. when mastering DVD-Video disc:-) Note that
|
||||
-<TT>-dvd-video</TT> option [passed to mkisofs] engages
|
||||
+<TT>-dvd-video</TT> option [passed to genisoimage] engages
|
||||
<TT>-dvd-compat</TT> automatically.</FONT></TR>
|
||||
</TABLE>
|
||||
|
||||
@@ -908,7 +912,7 @@
|
||||
entries (light-greens), byte offsets from the beginning of media. This
|
||||
means that no directory (green areas) may cross 4GB boundary without
|
||||
being effectively corrupted<TT>:-(</TT> It should be noted that in
|
||||
-reality it's a bit better than it looks on the picture, as mkisofs
|
||||
+reality it's a bit better than it looks on the picture, as genisoimage
|
||||
collects all the directories in the beginning of any particular session
|
||||
(there normally are no blues between greens). The <I>first</I> session
|
||||
is therefore never subject to i-node wrap-around, but not the
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Author: Daniel Schepler <schepler@math.unipd.it>
|
||||
Description: Add missing include in transport.hxx, fixes FTBFS with gcc-4.2 and gcc-4.3 (Closes: #455276, #456551).
|
||||
|
||||
--- a/transport.hxx
|
||||
+++ b/transport.hxx
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
#include <sys/time.h>
|
||||
+#include <limits.h>
|
||||
|
||||
inline long getmsecs()
|
||||
{ struct timeval tv;
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Author: Kees Cook <kees@debian.org>
|
||||
Description: wctomb called with too small a buffer, patch originally taken from fedora (Closes: #497833).
|
||||
|
||||
--- a/transport.hxx
|
||||
+++ b/transport.hxx
|
||||
@@ -124,7 +124,7 @@
|
||||
extern "C" char *plusminus_locale()
|
||||
{ static class __plusminus {
|
||||
private:
|
||||
- char str[4];
|
||||
+ char str[MB_LEN_MAX];
|
||||
public:
|
||||
__plusminus() { setlocale(LC_CTYPE,ENV_LOCALE);
|
||||
int l = wctomb(str,(wchar_t)(unsigned char)'±');
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
## Description: Fix spurious "CLOSE SESSION failed" on BD-R
|
||||
## Origin/Author: Thomas Schmitt <scdbackup@gmx.net>
|
||||
## Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713016
|
||||
Index: dvd+rw-tools-7.1/growisofs_mmc.cpp
|
||||
===================================================================
|
||||
--- dvd+rw-tools-7.1.orig/growisofs_mmc.cpp
|
||||
+++ dvd+rw-tools-7.1/growisofs_mmc.cpp
|
||||
@@ -756,6 +757,9 @@ static void bd_r_format (Scsi_Command &c
|
||||
|
||||
wait_for_unit (cmd);
|
||||
|
||||
+ // debian bug #713016
|
||||
+ bdr_plus_pow = 1;
|
||||
+
|
||||
cmd[0] = 0x35; // FLUSH CACHE
|
||||
cmd[9] = 0;
|
||||
cmd.transport();
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Description: Fix burning of blank BD-R disks.
|
||||
When burning blank BD-R disks, dvd+rw-tools generate, at the end of the
|
||||
process, the error message:
|
||||
.
|
||||
:-[ CLOSE SESSION failed with SK=5h/INVALID FIELD IN CDB]: Input/output error
|
||||
.
|
||||
This patch fixes it. Tested by many people following Debian's bug report #713016.
|
||||
Author: Thomas Schmitt <scdbackup@gmx.net>
|
||||
Bug-Debian: https://bugs.debian.org/713016
|
||||
Forwarded: no
|
||||
Last-Update: 2015-02-20
|
||||
--- a/growisofs_mmc.cpp
|
||||
+++ b/growisofs_mmc.cpp
|
||||
@@ -756,6 +756,8 @@
|
||||
|
||||
wait_for_unit (cmd);
|
||||
|
||||
+ bdr_plus_pow = 1;
|
||||
+
|
||||
cmd[0] = 0x35; // FLUSH CACHE
|
||||
cmd[9] = 0;
|
||||
cmd.transport();
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
--- a/growisofs.c
|
||||
+++ b/growisofs.c
|
||||
@@ -444,6 +444,10 @@
|
||||
#include <assert.h>
|
||||
#include "mp.h"
|
||||
|
||||
+#if defined(__GNU_LIBRARY__)
|
||||
+# include <sys/sysmacros.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(__unix) || defined(__unix__)
|
||||
# include <unistd.h>
|
||||
# include <sys/time.h>
|
||||
--- a/transport.hxx
|
||||
+++ b/transport.hxx
|
||||
@@ -53,6 +53,10 @@
|
||||
#define ENV_LOCALE ".OCP"
|
||||
#endif
|
||||
|
||||
+#if defined(__GNU_LIBRARY__)
|
||||
+# include <sys/sysmacros.h>
|
||||
+#endif
|
||||
+
|
||||
#include "asctable.h"
|
||||
|
||||
#define CREAM_ON_ERRNO_NAKED(s) \
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Description: Ignore pseudo overwrite feature of bluray drives
|
||||
When a BD-R is used with a Bluray drive, the drive can say that it supports
|
||||
the Pseudo Overwrite (POW) feature to calculate the capacity to be used.
|
||||
.
|
||||
If the drive says that it supports POW, then the capacity of the medium is
|
||||
reported as being less than its actual capacity, resulting in inability to
|
||||
write a full bluray disc.
|
||||
Author: Michael Herscheid <michael.herscheid@positix.de>
|
||||
Bug-Debian: http://bugs.debian.org/615978
|
||||
Forwarded: no
|
||||
Last-Update: 2011-03-07
|
||||
--- a/growisofs_mmc.cpp
|
||||
+++ b/growisofs_mmc.cpp
|
||||
@@ -410,7 +410,7 @@
|
||||
}
|
||||
|
||||
nwa = 0;
|
||||
- if (buf[7]&1 && !bdr_plus_pow) // NWA_V
|
||||
+ if (buf[7]&1) // NWA_V
|
||||
{ nwa = buf[12]<<24;
|
||||
nwa |= buf[13]<<16;
|
||||
nwa |= buf[14]<<8;
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
01-growisofs-pioneer.patch
|
||||
02-growisofs-manpage.patch
|
||||
03-growisofs-dvd-dl.patch
|
||||
04-kfreebsd.patch
|
||||
05-beeping.patch
|
||||
06-cdrkit-code.patch
|
||||
07-cdrkit-doc.patch
|
||||
08-includes.patch
|
||||
09-wctomb.patch
|
||||
ignore_pseudo_overwrite.patch
|
||||
10-blue-ray-bug713016.patch
|
||||
fix_burning_bd-r_discs.patch
|
||||
glibc-2.28.patch
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue