[Pkg-opt-media-team] [SCM] dvd+rw-tools packaging branch, master, updated. debian/7.1-6-10-ga3bb0fb
Rogério Brito
rbrito at ime.usp.br
Tue Aug 24 13:38:24 UTC 2010
The following commit has been merged in the master branch:
commit a3bb0fbbb677e2edf45a7ca6b51f5a4b278dc649
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Tue Aug 24 10:38:18 2010 -0300
Refresh the patches
diff --git a/debian/patches/01-growisofs-pioneer.patch b/debian/patches/01-growisofs-pioneer.patch
index d4b3543..d01f6fc 100644
--- a/debian/patches/01-growisofs-pioneer.patch
+++ b/debian/patches/01-growisofs-pioneer.patch
@@ -1,16 +1,15 @@
Author: n/a
Description: Fixes to fail closing session on some PIONEER DVD-RW drives
-diff -Naurp dvd+rw-tools.orig/growisofs_mmc.cpp dvd+rw-tools/growisofs_mmc.cpp
---- dvd+rw-tools.orig/growisofs_mmc.cpp 2008-03-04 17:47:49.000000000 +0000
-+++ dvd+rw-tools/growisofs_mmc.cpp 2008-04-01 09:01:20.000000000 +0000
-@@ -1743,8 +1743,17 @@ void plus_rw_finalize ()
+--- 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) {
diff --git a/debian/patches/02-growisofs-manpage.patch b/debian/patches/02-growisofs-manpage.patch
index a4d1ca1..d3c8650 100644
--- a/debian/patches/02-growisofs-manpage.patch
+++ b/debian/patches/02-growisofs-manpage.patch
@@ -1,9 +1,8 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Fix manpage section
-diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
---- dvd+rw-tools.orig/growisofs.1 2008-03-01 10:40:06.000000000 +0000
-+++ dvd+rw-tools/growisofs.1 2008-04-01 09:02:23.000000000 +0000
+--- 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"
diff --git a/debian/patches/03-growisofs-dvd-dl.patch b/debian/patches/03-growisofs-dvd-dl.patch
index 77af852..f730826 100644
--- a/debian/patches/03-growisofs-dvd-dl.patch
+++ b/debian/patches/03-growisofs-dvd-dl.patch
@@ -1,10 +1,9 @@
Author: Joe Shaw <joeshaw at suse.de>
Description: Don't abort when a DVD-DL disk is underful (Closes: #340698).
-diff -Naurp dvd+rw-tools.orig/growisofs_mmc.cpp dvd+rw-tools/growisofs_mmc.cpp
---- dvd+rw-tools.orig/growisofs_mmc.cpp 2008-04-01 09:01:20.000000000 +0000
-+++ dvd+rw-tools/growisofs_mmc.cpp 2008-04-01 09:02:59.000000000 +0000
-@@ -1640,9 +1640,7 @@ static void plus_r_dl_split (Scsi_Comman
+--- a/growisofs_mmc.cpp
++++ b/growisofs_mmc.cpp
+@@ -1640,9 +1640,7 @@
blocks += 15, blocks &= ~15;
if (blocks <= split)
diff --git a/debian/patches/04-kfreebsd.patch b/debian/patches/04-kfreebsd.patch
index c8afccd..e85bfac 100644
--- a/debian/patches/04-kfreebsd.patch
+++ b/debian/patches/04-kfreebsd.patch
@@ -1,10 +1,9 @@
Author: Petr Salinger <Petr.Salinger at seznam.cz>
Description: FTBFS on GNU/kFreeBSD (Closes: #374841).
-diff -Naurp dvd+rw-tools.orig/Makefile.m4 dvd+rw-tools/Makefile.m4
---- dvd+rw-tools.orig/Makefile.m4 2008-03-02 17:17:09.000000000 +0000
-+++ dvd+rw-tools/Makefile.m4 2008-04-01 09:03:41.000000000 +0000
-@@ -14,6 +14,7 @@ ifelse(substr(OS,0,7),[MINGW32],[define(
+--- 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])
@@ -12,7 +11,7 @@ diff -Naurp dvd+rw-tools.orig/Makefile.m4 dvd+rw-tools/Makefile.m4
ifelse(OS,IRIX64,[define([OS],[IRIX])])
ifelse(OS,Darwin,[
-@@ -188,7 +189,7 @@ CC =gcc
+@@ -188,7 +189,7 @@
CFLAGS +=$(WARN) -O2 -D_REENTRANT
CXX =g++
CXXFLAGS+=$(WARN) -O2 -fno-exceptions -D_REENTRANT
@@ -21,9 +20,8 @@ diff -Naurp dvd+rw-tools.orig/Makefile.m4 dvd+rw-tools/Makefile.m4
LINK.o =$(LINK.cc)
prefix?=/usr/local
-diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
---- dvd+rw-tools.orig/growisofs.c 2008-03-04 09:15:03.000000000 +0000
-+++ dvd+rw-tools/growisofs.c 2008-04-01 09:03:41.000000000 +0000
+--- a/growisofs.c
++++ b/growisofs.c
@@ -403,7 +403,7 @@
#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64
@@ -42,7 +40,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
# include <sys/syscall.h>
# ifndef SYS_mlockall
# define SYS_mlockall 324
-@@ -995,7 +995,7 @@ char *setup_fds (char *device)
+@@ -995,7 +995,7 @@
goto open_rw;
}
@@ -51,7 +49,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
#include <sys/cdio.h>
#include <camlib.h>
-@@ -2937,7 +2937,7 @@ int main (int argc, char *argv[])
+@@ -2937,7 +2937,7 @@
if (setrlimit(RLIMIT_MEMLOCK,&rlim)) break;
}
# endif
@@ -60,10 +58,9 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
syscall(SYS_mlockall,3);
# else
mlockall(MCL_CURRENT|MCL_FUTURE);
-diff -Naurp dvd+rw-tools.orig/transport.hxx dvd+rw-tools/transport.hxx
---- dvd+rw-tools.orig/transport.hxx 2008-03-01 10:34:43.000000000 +0000
-+++ dvd+rw-tools/transport.hxx 2008-04-01 09:03:41.000000000 +0000
-@@ -483,7 +483,7 @@ public:
+--- a/transport.hxx
++++ b/transport.hxx
+@@ -483,7 +483,7 @@
{ return 1; }
};
diff --git a/debian/patches/05-beeping.patch b/debian/patches/05-beeping.patch
index 84600ba..9e31809 100644
--- a/debian/patches/05-beeping.patch
+++ b/debian/patches/05-beeping.patch
@@ -1,10 +1,9 @@
Author: Matt Zimmerman <mdz at canonical.com>
Description: Disable obnoxious beeping.
-diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
---- dvd+rw-tools.orig/growisofs.c 2008-04-01 09:04:51.000000000 +0000
-+++ dvd+rw-tools/growisofs.c 2008-04-01 09:08:58.000000000 +0000
-@@ -3453,14 +3453,14 @@ int main (int argc, char *argv[])
+--- a/growisofs.c
++++ b/growisofs.c
+@@ -3453,14 +3453,14 @@
printf ("'\n");
fflush (stdout);
diff --git a/debian/patches/06-cdrkit-code.patch b/debian/patches/06-cdrkit-code.patch
index 0e14bb0..2ee7369 100644
--- a/debian/patches/06-cdrkit-code.patch
+++ b/debian/patches/06-cdrkit-code.patch
@@ -1,10 +1,9 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Update any cdrtools related information in the code to cdrkit.
-diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
---- dvd+rw-tools.orig/growisofs.c 2008-04-01 09:08:58.000000000 +0000
-+++ dvd+rw-tools/growisofs.c 2008-04-01 09:14:01.000000000 +0000
-@@ -2724,7 +2724,7 @@ void pipe_mkisofs_up (char *mkisofs_argv
+--- 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)
@@ -13,7 +12,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
else if (mkisofs_pid == 0)
{ dup2 (fildes[1],1);
close (fildes[0]);
-@@ -2844,7 +2844,7 @@ void pipe_mkisofs_up (char *mkisofs_argv
+@@ -2844,7 +2844,7 @@
{ DWORD ret;
if (GetExitCodeProcess (pi.hProcess,&ret) && ret)
@@ -22,7 +21,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
exit (1);
else
perror (":-( GetExitCodeProcess failed"), exit(errno);
-@@ -2963,8 +2963,8 @@ int main (int argc, char *argv[])
+@@ -2963,8 +2963,8 @@
perror (NULL), exit (FATAL_START(errno));
#if defined(__unix) || defined(__unix__)
@@ -33,7 +32,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
#elif defined(_WIN32)
/*
* On Windows I insist on mkisofs.exe to reside in very same
-@@ -3151,8 +3151,8 @@ int main (int argc, char *argv[])
+@@ -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"
@@ -44,7 +43,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
exit (FATAL_START(EINVAL));
}
else if (strstr (opt,"-version"))
-@@ -3320,12 +3320,12 @@ int main (int argc, char *argv[])
+@@ -3320,12 +3320,12 @@
if (imgfd<0)
{ if (mkisofs_argc==1 && dev_found!='F')
@@ -59,7 +58,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.c dvd+rw-tools/growisofs.c
"aborting...\n",argv[0]),
exit (FATAL_START(EINVAL));
-@@ -3576,7 +3576,7 @@ int main (int argc, char *argv[])
+@@ -3576,7 +3576,7 @@
if (saved_descriptors[i].type[0] != descr[i].type[0])
{ fprintf (stderr,":-? volume descriptor mismatch, did you "
diff --git a/debian/patches/07-cdrkit-doc.patch b/debian/patches/07-cdrkit-doc.patch
index f641ac4..e772630 100644
--- a/debian/patches/07-cdrkit-doc.patch
+++ b/debian/patches/07-cdrkit-doc.patch
@@ -1,9 +1,8 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Update any cdrtools related information in the documentation to cdrkit.
-diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
---- dvd+rw-tools.orig/growisofs.1 2008-04-01 09:04:48.000000000 +0000
-+++ dvd+rw-tools/growisofs.1 2008-04-01 09:16:16.000000000 +0000
+--- a/growisofs.1
++++ b/growisofs.1
@@ -1,6 +1,6 @@
.TH GROWISOFS 1 "1 Mar 2008" "growisofs 7.1"
.SH NAME
@@ -12,7 +11,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
.SH SYNOPSIS
.B growisofs
[\fB\-dry\-run\fP]
-@@ -9,10 +9,10 @@ growisofs \- combined mkisofs frontend/D
+@@ -9,10 +9,10 @@
[\fB\-speed=1\fP]
\-[\fBZ|M\fP]
.I /dev/dvd
@@ -25,7 +24,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
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 @@ EXAMPLES section for further details.
+@@ -35,7 +35,7 @@
Merge a new session to an existing one.
.TP
.BI \-version
@@ -34,7 +33,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
option.
.TP
.BI \-dvd\-compat
-@@ -47,7 +47,7 @@ explicitly burn [otherwise optional] lea
+@@ -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"
@@ -43,7 +42,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
terminated prematurely.
.TP
.BI \-overburn
-@@ -68,8 +68,8 @@ be found in \fBdvd+rw\-mediainfo\fP outp
+@@ -68,8 +68,8 @@
recordings are commonly performed at ~1/2 of advertised speed, because
of defect management being in effect.
.TP
@@ -54,7 +53,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
.P
There are several undocumented options commonly denoted with
-@@ -82,7 +82,7 @@ these options undocumented is that those
+@@ -82,7 +82,7 @@
need to use them directly can as well consult the source code or obtain
specific instructions elsewhere.
@@ -63,16 +62,16 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
.P
When using growisofs you may not use the
.B \-o
-@@ -99,7 +99,7 @@ will construct one for you;
+@@ -99,7 +99,7 @@
Otherwise everything that applies to
.I [multisession]
mastering with
-.B mkisofs
-+.B genisoimage
++.B genisoimage
applies to
.B growisofs
as well.
-@@ -107,7 +107,8 @@ as well.
+@@ -107,7 +107,8 @@
needs at least
.B mkisofs
version 1.14, version 2.0 is required for multisession write-once
@@ -82,7 +81,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
.SH EXAMPLES
Actual device names vary from one operating system to another. We use
-@@ -146,12 +147,12 @@ command name is not intuitive in this co
+@@ -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
@@ -98,7 +97,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
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 @@ real growisofs binary.
+@@ -162,13 +163,13 @@
.nf
#!/bin/ksh
unset SUDO_COMMAND
@@ -114,7 +113,7 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
preclude unauthorized access to the data.
If the media already carries isofs and \fBgrowisofs\fP is invoked with
-@@ -214,7 +215,7 @@ it gets pre-formatted with minimal spare
+@@ -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
@@ -123,10 +122,9 @@ diff -Naurp dvd+rw-tools.orig/growisofs.1 dvd+rw-tools/growisofs.1
.SH AUTHORS
Andy Polyakov <appro at fy.chalmers.se> stands for programming and on-line
-diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
---- dvd+rw-tools.orig/index.html 2008-03-04 09:03:21.000000000 +0000
-+++ dvd+rw-tools/index.html 2008-04-01 09:20:57.000000000 +0000
-@@ -137,7 +137,9 @@ SRC="japanese.gif" WIDTH=48 HEIGHT=19 BO
+--- 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
@@ -137,7 +135,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
</TABLE>
<!--
-@@ -480,13 +482,13 @@ are not capable of burning DVD+R is need
+@@ -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
@@ -154,7 +152,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
are:
<P><UL>
-@@ -494,12 +496,12 @@ are:
+@@ -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
@@ -170,7 +168,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
you used to master the initial "session" with and stick to
them, e.g.:
-@@ -508,9 +510,10 @@ growisofs -Z /dev/scd0 <FONT COLOR="red"
+@@ -508,9 +510,10 @@
growisofs -M /dev/scd0 <FONT COLOR="red">-R -J</FONT> /more/files
</PRE></BLOCKQUOTE>
@@ -184,7 +182,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
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 @@ through ide-scsi, the way it was under 2
+@@ -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
@@ -194,7 +192,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
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 @@ working. To see it in action, insert for
+@@ -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
@@ -203,7 +201,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
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 @@ huge*.void</TT>'. Otherwise you might ha
+@@ -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
@@ -212,7 +210,7 @@ diff -Naurp dvd+rw-tools.orig/index.html dvd+rw-tools/index.html
<TT>-dvd-compat</TT> automatically.</FONT></TR>
</TABLE>
-@@ -908,7 +912,7 @@ Now, the problem is that isofs i-nodes<S
+@@ -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
diff --git a/debian/patches/08-includes.patch b/debian/patches/08-includes.patch
index 9dd68ca..3796315 100644
--- a/debian/patches/08-includes.patch
+++ b/debian/patches/08-includes.patch
@@ -1,9 +1,8 @@
Author: Daniel Schepler <schepler at math.unipd.it>
Description: Add missing include in transport.hxx, fixes FTBFS with gcc-4.2 and gcc-4.3 (Closes: #455276, #456551).
-diff -Naurp dvd+rw-tools.orig/transport.hxx dvd+rw-tools/transport.hxx
---- dvd+rw-tools.orig/transport.hxx 2008-04-01 09:04:51.000000000 +0000
-+++ dvd+rw-tools/transport.hxx 2008-04-01 09:23:09.000000000 +0000
+--- a/transport.hxx
++++ b/transport.hxx
@@ -16,6 +16,7 @@
#include <fcntl.h>
#include <poll.h>
diff --git a/debian/patches/09-wctomb.patch b/debian/patches/09-wctomb.patch
index 0b82ba9..4bf6928 100644
--- a/debian/patches/09-wctomb.patch
+++ b/debian/patches/09-wctomb.patch
@@ -1,10 +1,9 @@
Author: Kees Cook <kees at debian.org>
Description: wctomb called with too small a buffer, patch originally taken from fedora (Closes: #497833).
-diff -Naurp dvd-rw-tools.orig/transport.hxx dvd-rw-tools/transport.hxx
---- dvd-rw-tools.orig/transport.hxx 2009-02-05 09:01:23.000000000 +0000
-+++ dvd-rw-tools/transport.hxx 2009-02-05 09:01:35.000000000 +0000
-@@ -124,7 +124,7 @@ class autofree {
+--- a/transport.hxx
++++ b/transport.hxx
+@@ -124,7 +124,7 @@
extern "C" char *plusminus_locale()
{ static class __plusminus {
private:
--
dvd+rw-tools packaging
More information about the Pkg-opt-media-team
mailing list