[Debburn-changes] r399 - in nonameyet/branches/cleanup: . cdrecord
debian doc/ANNOUNCEMENTs doc/READMEs doc/plattforms libscg
mkisofs mkisofs/diag readcd rscsi scgcheck
Eduard Bloch
blade at alioth.debian.org
Sun Nov 19 18:29:48 CET 2006
Author: blade
Date: 2006-11-19 18:29:47 +0100 (Sun, 19 Nov 2006)
New Revision: 399
Added:
nonameyet/branches/cleanup/debian/wodim.preinst
nonameyet/branches/cleanup/libscg/scsi-remote.c
Removed:
nonameyet/branches/cleanup/librscg/
Modified:
nonameyet/branches/cleanup/CMakeLists.txt
nonameyet/branches/cleanup/Changelog
nonameyet/branches/cleanup/FAQ
nonameyet/branches/cleanup/cdrecord/cdrecord.c
nonameyet/branches/cleanup/cdrecord/defaults.c
nonameyet/branches/cleanup/cdrecord/defaults.h
nonameyet/branches/cleanup/cdrecord/drv_mmc.c
nonameyet/branches/cleanup/cdrecord/wodim.1
nonameyet/branches/cleanup/cdrecord/wodim.dfl
nonameyet/branches/cleanup/debian/README.ATAPI.setup
nonameyet/branches/cleanup/debian/changelog
nonameyet/branches/cleanup/debian/control
nonameyet/branches/cleanup/debian/rules
nonameyet/branches/cleanup/debian/wodim.dirs
nonameyet/branches/cleanup/debian/wodim.links
nonameyet/branches/cleanup/doc/ANNOUNCEMENTs/AN-2.01
nonameyet/branches/cleanup/doc/READMEs/README.ATAPI
nonameyet/branches/cleanup/doc/READMEs/README.rscsi
nonameyet/branches/cleanup/doc/plattforms/README.linux
nonameyet/branches/cleanup/libscg/CMakeLists.txt
nonameyet/branches/cleanup/libscg/scsi-linux-ata.c
nonameyet/branches/cleanup/libscg/scsiopen.c
nonameyet/branches/cleanup/libscg/scsitransp.c
nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8
nonameyet/branches/cleanup/mkisofs/mkisofs.c
nonameyet/branches/cleanup/mkisofs/write.c
nonameyet/branches/cleanup/readcd/readcd.1
nonameyet/branches/cleanup/rscsi/rscsi.c
nonameyet/branches/cleanup/rscsi/rscsi.dfl
nonameyet/branches/cleanup/scgcheck/scgcheck.1
Log:
cleanup branch merged with trunk -r398
Modified: nonameyet/branches/cleanup/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/CMakeLists.txt 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/CMakeLists.txt 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,6 +1,8 @@
PROJECT (cdrkit)
-SUBDIRS(cdda2wav cdrecord libdeflt libedc libhfs_iso libparanoia librscg libscg libschily libunls mkisofs readcd rscsi 3rd-party/dirsplit include)
+SUBDIRS(cdda2wav cdrecord libdeflt libedc libhfs_iso libparanoia libscg libschily libunls mkisofs readcd rscsi 3rd-party/dirsplit include)
+#ADD_DEFINITIONS(-DSHUT_UP)
+
SET(BINS_SET cdrecord/wodim readcd/readcd)
FOREACH(app ${BINS_SET})
install(PROGRAMS ${CMAKE_BINARY_DIR}/${app} DESTINATION bin)
Modified: nonameyet/branches/cleanup/Changelog
===================================================================
--- nonameyet/branches/cleanup/Changelog 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/Changelog 2006-11-19 17:29:47 UTC (rev 399)
@@ -23,9 +23,23 @@
-cdrkit (1.0pre5) UNRELEASED; urgency=low
+cdrkit (1.0pre5) RELEASED; urgency=low
[ Eduard Bloch ]
+ * mapping of ATAPI: -> ATA: method on linux-2.6 and some code beautification
+ * added a atexit handler to stop the FIFO process more reliably, since
+ Schilling's constructs seem to terminate the application on too many
+ places
+ * print Burnfree state/preparation messages only with high verbosity
+
+ [ Dennis Vshivkov ]
+ * sorted display of files when needed
+
+ -- Eduard Bloch <blade at debian.org> Wed, 15 Nov 2006 12:30:01 +0100
+
+cdrkit (1.0pre5) RELEASED; urgency=low
+
+ [ Eduard Bloch ]
* added better check for capability.h and FATAL_ERROR if it's missing on Linux
* wodim.1 updates, ie. moved suid howto to README.suidroot, Linux bashing to
README.linux, more notes about non-root usage
@@ -42,6 +56,9 @@
old workaround(s) for ATA now for SCSI too
* renamed error function to schily_error because it started to wreak random
havoc after harmless header moving (conflict with incompatible GNU version)
+ * restored scsi-remote.c compilation, moved to libscg sources, used instead
+ of rdummy.c
+ * added optional omiting of DMA speed tests
[ Vladimir Nadvornik ]
* enabled CLONE feature in wodim's config
@@ -139,7 +156,7 @@
plattforms, though.
* removed most of the anti-linux2.6 program messages (unless being
in verbose mode). (closes: #377145)
- * changed default config file location to /etc/default/wodim
+ * changed default config file location to /etc/wodim.conf
* added more meaningful error message on -dvd-video failure (closes: #324586)
* minor cdda2mp3/cdda2ogg scripts fixes suggested by Fabian Pietsch, plus
fixes for unreliable encoder detection (closes: #283794, #344443) plus
Modified: nonameyet/branches/cleanup/FAQ
===================================================================
--- nonameyet/branches/cleanup/FAQ 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/FAQ 2006-11-19 17:29:47 UTC (rev 399)
@@ -8,7 +8,25 @@
Q: Are there additional depedencies, compared to cdrtools?
A: Yes. Libcap is required on Linux plattform. Libmagic is needed to support
-content-based creator/type tables with HFS (optional). Libiconv is needed to
-support iconv-based filename converstion, eg. from UTF-8 ins Joliet's UCS-2
-unicode (optional, on plattform where iconv is not already included in the libc
-system library).
+ content-based creator/type tables with HFS (optional). Libiconv is needed to
+ support iconv-based filename converstion, eg. from UTF-8 ins Joliet's UCS-2
+ unicode (optional, on plattform where iconv is not already included in the libc
+ system library).
+
+Q: Why those annoying messages? Can you not remove them?
+A: Joerg Schilling wants you to see those messages. He has embedded them into
+ the source and "protected" them from removal by additional license
+ restrictions. Any attempts to get a clarification on the issues failed. We
+ got some "answers" but most have been unrelated and/or just drawing the
+ attention away from the relevant questions. We cannot make decissions
+ without new and relevant information, no matter how often Joerg Schilling
+ claims that there are no problems with his licensing.
+ Therefore we have to assume that the license is not GPL but something called
+ Shily-GPL, beeing based GPL but enriched with additional terms
+ (restrictions) spread in the source files without attracting attention.
+
+Q: Why not just remove or disable them?
+A: Relevant license restrictions say "you are not allowed" to "modify" or "remove"
+ the "... printing". Disabling the printing by technical means is not much
+ different to removing the stuff, so dealing with that problem on technical
+ level is not the right thing.
Modified: nonameyet/branches/cleanup/cdrecord/cdrecord.c
===================================================================
--- nonameyet/branches/cleanup/cdrecord/cdrecord.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/cdrecord.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -271,8 +271,11 @@
int exflags;
} exargs;
-int
-main(int argc, char *argv[])
+void fifo_cleanup(void) {
+ kill_faio();
+}
+
+int main(int argc, char *argv[])
{
char *dev = NULL;
int timeout = 40; /* Set default timeout to 40s CW-7502 is slow*/
@@ -303,16 +306,28 @@
fprintf(stderr, "Cdrecord-yelling-line-to-tell-frontends-to-use-it-like-version 2.01.01a03-dvd \n");
}
+#ifndef SHUT_UP
+
fprintf(stderr,
- "This is wodim, not cdrecord. Don't expect it to behave like cdrecord in any\n"
- "way, don't refer to it as \"cdrecord\". Send problem reports to\n"
- "debburn-devel at lists.alioth.debian.org, don't bother Joerg Schilling with any\n"
- "problems caused by this application.\n"
- "Copyright (C) 2006 cdrkit maintainers, (C) 1994-2006 Joerg Schilling\n\n"
- );
+ "This is wodim, not cdrecord. Don't expect it to behave like cdrecord in any\n"
+ "way, don't refer to it as \"cdrecord\". Send problem reports to\n"
+ "debburn-devel at lists.alioth.debian.org, don't bother Joerg Schilling with any\n"
+ "problems caused by this application.\n"
+ "Copyright (C) 2006 cdrkit maintainers, (C) 1994-2006 Joerg Schilling\n\n" );
+ fprintf(stderr,
+ "WARNING WARNING WARNING:\n\n"
+ "If you are annoyed by the messages below about unofficial status or about\n"
+ "non-Schily-Makefilesystem or if your GUI/script breaks because of them,\n"
+ "please don't send your complaints to cdrkit maintainers; they already know.\n"
+ "They are not allowed to remove them by Joerg Schilling's license\n"
+ "modifications (restrictions), hidden in the source. Correcting the contents\n"
+ "of the messages is forbidden as well, so don't believe everything said there.\n"
+ "See http://svn.debian.org/wsvn/debburn/nonameyet/trunk/FAQ?op=file&rev=0&sc=0\n"
+ "for details.\n\n" );
if(strcmp(argv[0], "cdrecord") == 0)
strcpy(argv[0], "wodim");
+#endif /* SHUT_UP */
#ifdef __EMX__
/* This gives wildcard expansion with Non-Posix shells with EMX */
@@ -337,9 +352,135 @@
"Copyright (C) 2006 Cdrkit suite contributors\n"
"Based on works from Joerg Schilling, Copyright (C) 1995-2006, J. Schilling\n"
);
- exit(0);
+ /*exit(0);*/
}
+#ifndef SHUT_UP
+
+#define HOST_CPU "HOST_CPU-just-a-fake-string-to-make-Schilling's-invariant-section-compile-because-cdrkit-does-not-need-it-anymore"
+#define HOST_VENDOR "HOST_VENDOR-just-a-fake-string-to-make-Schilling's-invariant-section-compile-because-cdrkit-does-not-need-it-anymore"
+#define HOST_OS HOST_SYSTEM
+
+ /*
+ * Begin restricted code for quality assurance.
+ *
+ * Warning: you are not allowed to modify or to remove the
+ * Copyright and version printing code below!
+ * See also GPL § 2 subclause c)
+ *
+ * If you modify cdrecord you need to include additional version
+ * printing code that:
+ *
+ * - Clearly states that the current version is an
+ * inofficial (modified) version and thus may have bugs
+ * that are not present in the original.
+ *
+ * - Print your support e-mail address and tell people that
+ * you will do complete support for this version of
+ * cdrecord.
+ *
+ * Or clearly state that there is absolutely no support
+ * for the modified version you did create.
+ *
+ * - Tell the users not to ask the original author for
+ * help.
+ *
+ * This limitation definitely also applies when you use any other
+ * cdrecord release together with libscg-0.6 or later, or when you
+ * use any amount of code from cdrecord-1.11a17 or later.
+ * In fact, it applies to any version of cdrecord, see also
+ * GPL Preamble, subsection 6.
+ *
+ * I am sorry for the inconvenience but I am forced to do this because
+ * some people create inofficial branches. These branches create
+ * problems but the initiators do not give support and thus cause the
+ * development of the official cdrecord versions to slow down because
+ * I am loaded with unneeded work.
+ *
+ * Please note that this is a memorandum on how I interpret the GPL.
+ * If you use/modify/redistribute cdrecord, you need to accept it
+ * this way.
+ *
+ *
+ * The above statement is void if there has been neither a new version
+ * of cdrecord nor a new version of star from the original author
+ * within more then a year.
+ */
+
+ /*
+ * Ugly, but Linux incude files violate POSIX and #define printf
+ * so we cannot include the #ifdef inside the printf() arg list.
+ */
+# define PRODVD_TITLE ""
+#ifdef CLONE_WRITE
+# define CLONE_TITLE "-Clone"
+#else
+# define CLONE_TITLE ""
+#endif
+ if ((flags & F_MSINFO) == 0 || lverbose || flags & F_VERSION) {
+ printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2006 Jörg Schilling\n",
+ PRODVD_TITLE,
+ CLONE_TITLE,
+ cdr_version,
+ HOST_CPU, HOST_VENDOR, HOST_OS);
+
+#if defined(SOURCE_MODIFIED) || !defined(IS_SCHILY_XCONFIG)
+#define INSERT_YOUR_EMAIL_ADDRESS_HERE
+#define NO_SUPPORT 0
+ printf("NOTE: this version of cdrecord is an inofficial (modified) release of cdrecord\n");
+ printf(" and thus may have bugs that are not present in the original version.\n");
+#if NO_SUPPORT
+ printf(" The author of the modifications decided not to provide a support e-mail\n");
+ printf(" address so there is absolutely no support for this version.\n");
+#else
+ printf(" Please send bug reports and support requests to <%s>.\n", "debburn-devel at lists.alioth.debian.org");
+#endif
+ printf(" The original author should not be bothered with problems of this version.\n");
+ printf("\n");
+#endif
+#if !defined(IS_SCHILY_XCONFIG)
+ printf("\nWarning: This version of cdrecord has not been configured via the standard\n");
+ printf("autoconfiguration method of the Schily makefile system. There is a high risk\n");
+ printf("that the code is not configured correctly and for this reason will not behave\n");
+ printf("as expected.\n");
+#endif
+
+
+ /*
+ * I am sorry that even for version 1.310 of cdrecord.c, I am forced to do
+ * things like this, but defective versions of cdrecord cause a lot of
+ * work load to me and it seems to be impossible to otherwise convince
+ * SuSE to cooperate.
+ * As people contact me and bother me with the related problems,
+ * it is obvious that SuSE is violating subsection 6 in the preamble of
+ * the GPL.
+ *
+ * The reason for including a test against SuSE's private
+ * distribution environment is only that SuSE violates the GPL for
+ * a long time and seems not to be willing to follow the requirements
+ * imposed by the GPL. If SuSE starts to ship non defective versions
+ * of cdrecord or informs their customers that they would need to
+ * compile cdrecord themselves in order to get a working cdrecord,
+ * they should contact me for a permission to change the related test.
+ *
+ * Note that although the SuSE test is effective only for SuSE, the
+ * intention to have non bastardized versions out is not limited
+ * to SuSE. It is bad to see that in special in the "Linux" business,
+ * companies prefer a model with many proprietary differing programs
+ * instead of cooperating with the program authors.
+ */
+
+ if (flags & F_VERSION)
+ exit(0);
+ /*
+ * End restricted code for quality assurance.
+ */
+ }
+#else
+ if (flags & F_VERSION)
+ exit(0);
+#endif /* SHUT_UP */
+
checkgui();
if (debug || lverbose) {
@@ -412,36 +553,25 @@
exit(0);
}
- /*
- * XXX scg_open() needs root privilleges (According to Joerg Schilling, but let's try anyway)
- */
- if (
- (scgp = scg_open(dev, errstr, sizeof (errstr),
- debug,
- /* disabled unless one can explain my what is so special about the F_MSINFO option that the absense of it requires printing of the uber-verbose scg messages (flags & F_MSINFO) == 0 || */
- lverbose)) == (SCSI *)0
- )
+ scgp = scg_open(dev, errstr, sizeof (errstr),
+ debug, lverbose);
+ if(!scgp && dev) {
+ char *dalt;
+ int len=5+strlen(dev);
+ dalt=calloc(len, sizeof(char));
+ strcat(dalt, "ATA:");
+ strcat(dalt+4, dev);
+ scgp = scg_open(dalt, errstr, sizeof (errstr),
+ debug, lverbose);
+ }
+ if(!scgp)
{
- if (dev != NULL
- || (flags & F_SCANBUS) == 0
- || (scgp = scg_open("ATA", errstr, sizeof (errstr),
- debug,
- /* disabled unless one can explain my what is so special about the F_MSINFO option that the absense of it requires printing of the uber-verbose scg messages (flags & F_MSINFO) == 0 || */
- lverbose)) == (SCSI *)0
- )
- {
- errmsg("%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":"");
- errmsgno(EX_BAD, "For possible targets try 'wodim -scanbus'.%s\n",
- geteuid() ? " Make sure you are root.":"");
- errmsgno(EX_BAD, "For possible transport specifiers try 'wodim dev=help'.\n");
- errmsgno(EX_BAD, "\n");
- errmsgno(EX_BAD, "For more information, install the cdrkit-doc\n");
- errmsgno(EX_BAD, "package and read /usr/share/doc/wodim/README.ATAPI.setup .\n");
- exit(EX_BAD);
- }
- else {
- dev = "ATA";
- }
+ errmsg("\nCannot open SCSI driver!\n"
+ "For possible targets try 'wodim -scanbus'.\n"
+ "For possible transport specifiers try 'wodim dev=help'.\n"
+ "For IDE/ATAPI devices configuration, see the file README.ATAPI.setup from\n"
+ "the wodim documentation.\n");
+ exit(EX_BAD);
}
#ifdef HAVE_PRIV_SET
#ifdef PRIV_DEBUG
@@ -506,6 +636,7 @@
scgp->kdebug = kdebug;
scgp->cap->c_bsize = DATA_SEC_SIZE;
+#ifndef SHUT_UP
if ((flags & F_MSINFO) == 0 || lverbose) {
char *vers;
@@ -544,6 +675,9 @@
auth, vers, scg_version(scgp, SCG_RSCCS_ID));
}
}
+
+#endif /* SHUT_UP */
+
if (lverbose && driveropts)
printf("Driveropts: '%s'\n", driveropts);
@@ -625,7 +759,7 @@
/* DVD does not support TAO */
if (dp->is_dvd) {
- printf("Using Session At Once (SAO) for DVD mode.\n");
+ fprintf(stderr, "Using Session At Once (SAO) for DVD mode.\n");
dp->cdr_flags |= F_SAO;
for (i = 0; i <= MAX_TRACK; i++) {
track[i].flags &= ~TI_TAO;
@@ -1030,6 +1164,8 @@
else
on_comerr(excdr, &exargs);
+ atexit(fifo_cleanup);
+
#if defined(USE_POSIX_PRIORITY_SCHEDULING) && defined(HAVE_SETREUID)
/*
* XXX Below this point we never need root privilleges anymore.
@@ -4010,6 +4146,14 @@
int bs;
int tsize;
+ if(getenv("CDR_NODMATEST"))
+ return -1;
+
+ if (debug || lverbose)
+ fprintf( stderr,
+ "Beginning DMA speed test. Set CDR_NODMATEST environment variable if device\n"
+ "communication breaks or freezes immediately after that.\n" );
+
fillbytes((caddr_t)buf, 4, '\0');
tsize = 0;
scgp->silent++;
Modified: nonameyet/branches/cleanup/cdrecord/defaults.c
===================================================================
--- nonameyet/branches/cleanup/cdrecord/defaults.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/defaults.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#define CFGPATH "/etc/default/wodim"
+#define CFGPATH "/etc/wodim.conf"
/* The better way would be exporting the meta functions to getnum.h or so */
extern int getnum(char *arg, long *valp);
Modified: nonameyet/branches/cleanup/cdrecord/defaults.h
===================================================================
--- nonameyet/branches/cleanup/cdrecord/defaults.h 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/defaults.h 2006-11-19 17:29:47 UTC (rev 399)
@@ -12,7 +12,7 @@
/* @(#)defaults.h 1.1 04/02/22 Copyright 1998-2004 J. Schilling */
/*
- * The cdrecord defaults (/etc/default/wodim) interface
+ * The cdrecord defaults (/etc/wodim.conf) interface
*
* Copyright (c) 1998-2004 J. Schilling
*/
Modified: nonameyet/branches/cleanup/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/branches/cleanup/cdrecord/drv_mmc.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/drv_mmc.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -2506,16 +2506,18 @@
MS_MULTI : MS_NONE;
mp->session_format = toc2sess[track_base(trackp)->tracktype & TOC_MASK];
- if (lverbose && dp->cdr_cdcap->BUF != 0)
+ if (lverbose > 2 && dp->cdr_cdcap->BUF != 0)
printf("BURN-Free is %s.\n", mp->BUFE?"ON":"OFF");
if (driveropts != NULL) {
if ((strcmp(driveropts, "burnproof") == 0 ||
strcmp(driveropts, "burnfree") == 0) && dp->cdr_cdcap->BUF != 0) {
- errmsgno(EX_BAD, "Turning BURN-Free on\n");
+ if(lverbose>2)
+ errmsgno(EX_BAD, "Turning BURN-Free on\n");
mp->BUFE = 1;
} else if ((strcmp(driveropts, "noburnproof") == 0 ||
strcmp(driveropts, "noburnfree") == 0)) {
- errmsgno(EX_BAD, "Turning BURN-Free off\n");
+ if(lverbose>2)
+ errmsgno(EX_BAD, "Turning BURN-Free off\n");
mp->BUFE = 0;
} else if (strcmp(driveropts, "help") == 0) {
mmc_opthelp(dp, 0);
@@ -2982,7 +2984,7 @@
burnfree = rp && rp->BUEFE != 0;
}
- if (lverbose && (dp->cdr_flags & CDR_BURNFREE) != 0)
+ if (lverbose>2 && (dp->cdr_flags & CDR_BURNFREE) != 0)
printf("BURN-Free is %s.\n", burnfree?"ON":"OFF");
if (!burnfree && (dp->cdr_dstat->ds_cdrflags & RF_BURNFREE) != 0) {
Modified: nonameyet/branches/cleanup/cdrecord/wodim.1
===================================================================
--- nonameyet/branches/cleanup/cdrecord/wodim.1 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/wodim.1 2006-11-19 17:29:47 UTC (rev 399)
@@ -165,7 +165,7 @@
described below.
.PP
-If a file /etc/default/wodim exists, the parameter to the
+If a file /etc/wodim.conf exists, the parameter to the
.B dev=
option may also be a drive name label in said file (see FILES section).
@@ -575,13 +575,13 @@
option is present,
.B wodim
will try to get a drive specific speed value from the file
-.B /etc/default/wodim
+.B /etc/wodim.conf
and if it cannot find one, it will try to get the speed value from the
.B CDR_SPEED
environment and later from the
.B CDR_SPEED=
entry in
-.BR /etc/default/wodim .
+.BR /etc/wodim.conf .
If no speed value could be found, wodim uses a drive specific default speed.
The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
If you use
@@ -785,7 +785,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI gracetime= #
Set the grace time before starting to write to
@@ -1968,7 +1968,7 @@
.TP
.B CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim.
+call of the SCSI transport library or a label in the file /etc/wodim.conf.
.TP
.B CDR_SPEED
Sets the default speed value for writing (see also
@@ -2031,8 +2031,8 @@
.SH FILES
.TP
-/etc/default/wodim
-Default values can be set for the following options in /etc/default/wodim.
+/etc/wodim.conf
+Default values can be set for the following options in /etc/wodim.conf.
For example:
.SM CDR_FIFOSIZE=8m
or
@@ -2041,7 +2041,7 @@
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim
+call of the SCSI transport library or a label in the file /etc/wodim.conf
that allows to identify a specific drive on the system.
.TP
CDR_SPEED
Modified: nonameyet/branches/cleanup/cdrecord/wodim.dfl
===================================================================
--- nonameyet/branches/cleanup/cdrecord/wodim.dfl 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/cdrecord/wodim.dfl 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,6 +1,6 @@
#ident @(#)wodim.dfl 1.5 06/22/06 Copyr 2006 E. Bloch
#
-# This file is /etc/default/wodim
+# This file is /etc/wodim.conf
#
#ident @(#)cdrecord.dfl 1.5 05/08/09 Copyr 1998 J. Schilling
#
@@ -19,7 +19,7 @@
# Note that newer cdrecord versions do not default
# to speed=1. For MMC compliant drives, the default
# is to write at maximum speed, so it in general does
-# not make sense to set up a default speed in /etc/default/wodim
+# not make sense to set up a default speed in /etc/wodim.conf
#
#CDR_SPEED=40
Modified: nonameyet/branches/cleanup/debian/README.ATAPI.setup
===================================================================
--- nonameyet/branches/cleanup/debian/README.ATAPI.setup 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/README.ATAPI.setup 2006-11-19 17:29:47 UTC (rev 399)
@@ -10,7 +10,7 @@
the box. There should be a symbolic link /dev/cdrw which points to your actual
CD-Writer's device (e. g. /dev/hdb). If the link is not present (eg. the
system is not using udev/devfs) or if you want to use a different device as
-default, you can configure the device in /etc/default/wodim:
+default, you can configure the device in /etc/wodim.conf:
CDR_DEVICE=/dev/hdd
@@ -64,14 +64,14 @@
ln -s scd1 cdrw # NOTE: see above, maybe cdrom
Check the new SCSI settings:
wodim -scanbus
- Setup wodim's environment - edit /etc/default/wodim:
+ Setup wodim's environment - edit /etc/wodim.conf:
CDR_DEVICE=cdrw
cdrw=1,0,0 4 8m
cdrom=1,2,0 0 0m
Insert the right values, the fields are described in the manpage
of wodim. Alternatively, you may use these values as
wodim-parameter or take a frontend with an own configuration
- scheme, then you don't need to modify /etc/default/wodim.
+ scheme, then you don't need to modify /etc/wodim.conf.
The columns must be separated by tabs.
9. It's done! Insert a CD and try "wodim -v -toc". To create your first CD-ROM, try:
Modified: nonameyet/branches/cleanup/debian/changelog
===================================================================
--- nonameyet/branches/cleanup/debian/changelog 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/changelog 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,12 +1,32 @@
-cdrkit (5:1.0~pre5-2) unstable; urgency=low
+cdrkit (5:1.0~pre5-1.1) unstable; urgency=low
+ * ATAPI -> ATA mapping and better error messages (closes: #398465)
+ * more reliable FIFO process termination (closes: #398043)
+ * prints burn-free message only with higher verbosity (closes: 388770)
+ * sorted file list printing, by Dennis Vshivkov (closes: #278071)
+
+ -- Eduard Bloch <blade at debian.org> Tue, 14 Nov 2006 15:08:16 +0100
+
+cdrkit (5:1.0~pre5-1) unstable; urgency=low
+
* New upstream source snapshot
+ typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
+ enabled libedc support (closes: #387429)
+ + reenabled REMOTE target support (closes: #396460)
+ + terminates FIFO process on exist (closes: #397271)
+ + option (env. variable) to skip DMA tests (closes: #293953)
* fixed installation of FAQ and FORK files (closes: #386735)
* remove . from the include list, patch by Modestas Vainius (closes: 358497)
+ * cdda2ogg/cdda2mp3 are unified, installing cdda2mp3 as symlink
+ * remove . from the include list, patch by Modestas Vainius
+ (closes: #358497, acknowledging NMU by Steinar H. Gunderson)
+ * readded mkzftree to the mkisofs package (closes: #387927)
+ * wodim.preinst: remove unchanged old config files, dangling symlinks to
+ them, old "convinience" symlinks, preinstalls user-modified files to the
+ new target locations /etc/{wodim,rscsi}.conf
+ (closes: #388403, #390084, #388119, #387854)
- -- Eduard Bloch <blade at debian.org> Tue, 12 Sep 2006 11:16:34 +0200
+ -- Eduard Bloch <blade at debian.org> Tue, 07 Nov 2006 11:56:05 +0100
cdrkit (5:1.0~pre4-1) unstable; urgency=low
Modified: nonameyet/branches/cleanup/debian/control
===================================================================
--- nonameyet/branches/cleanup/debian/control 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/control 2006-11-19 17:29:47 UTC (rev 399)
@@ -10,7 +10,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: mkisofs
-Replaces: cdrtools-doc (<< 5:1.0~pre1-0), cdrecord (<< 5:1.0~pre1-0)
+Replaces: cdrtools-doc (<< 5:1.0~pre1-1), cdrecord (<< 5:1.0~pre1-1)
Suggests: cdrkit-doc
Conflicts: cdrecord (<< 5:1.0~pre1-1)
Description: command line CD/DVD writing tool
Modified: nonameyet/branches/cleanup/debian/rules
===================================================================
--- nonameyet/branches/cleanup/debian/rules 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/rules 2006-11-19 17:29:47 UTC (rev 399)
@@ -80,8 +80,8 @@
wodim: install
@echo "--- Building: $@"
dh_installdirs -p$@ -P$(b)/$@
- cp -a cdrecord/wodim.dfl $(b)/$@/etc/default/wodim
- cp -a rscsi/rscsi.dfl $(b)/$@/etc/default/rscsi
+ cp -a cdrecord/wodim.dfl $(b)/$@/etc/wodim.conf
+ cp -a rscsi/rscsi.dfl $(b)/$@/etc/rscsi.conf
# cp debian/reportbug.presubj $(b)/$@/usr/share/bug/wodim/presubj
dh_link -p$@ -P$(b)/$@
dh_installdocs -p$@ -P$(b)/$@
Modified: nonameyet/branches/cleanup/debian/wodim.dirs
===================================================================
--- nonameyet/branches/cleanup/debian/wodim.dirs 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/wodim.dirs 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,2 +1 @@
-etc/default
-etc/wodim
+etc
Modified: nonameyet/branches/cleanup/debian/wodim.links
===================================================================
--- nonameyet/branches/cleanup/debian/wodim.links 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/debian/wodim.links 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,3 +0,0 @@
-etc/default/wodim etc/wodim/wodim
-etc/default/rscsi etc/wodim/rscsi
-usr/share/man/man1/wodim.1.gz usr/share/man/man1/wodim.1.gz
Copied: nonameyet/branches/cleanup/debian/wodim.preinst (from rev 398, nonameyet/trunk/debian/wodim.preinst)
Modified: nonameyet/branches/cleanup/doc/ANNOUNCEMENTs/AN-2.01
===================================================================
--- nonameyet/branches/cleanup/doc/ANNOUNCEMENTs/AN-2.01 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/doc/ANNOUNCEMENTs/AN-2.01 2006-11-19 17:29:47 UTC (rev 399)
@@ -461,7 +461,7 @@
- Workaround for missing struct sockaddr_storage on SCO UnixWare
- Security update. Forbid to write arbitrary debug files, only allow
- a debug file name that has been configured in /etc/default/rscsi.
+ a debug file name that has been configured in /etc/rscsi.conf.
Writing arbitrary files with a siud root program could be used to become
root on a local machine if you are already logged into that local machine.
Modified: nonameyet/branches/cleanup/doc/READMEs/README.ATAPI
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.ATAPI 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/doc/READMEs/README.ATAPI 2006-11-19 17:29:47 UTC (rev 399)
@@ -489,14 +489,14 @@
ln -s scd1 cdrw # NOTE: see above, maybe cdrom
Check the new SCSI settings:
wodim -scanbus
- Setup wodim's environment - edit /etc/default/wodim:
+ Setup wodim's environment - edit /etc/wodim.conf:
CDR_DEVICE=cdrw
cdrw=1,0,0 4 8m
cdrom=1,2,0 0 0m
Input the right values, the fields are described in the manpage
of wodim. Alternatively, you may use this values as
wodim-parameter or take a frontend with an own configuration
- scheme, then you don't need to modify /etc/default/wodim.
+ scheme, then you don't need to modify /etc/wodim.conf.
9. It's done! Insert a CD and try "wodim -v -toc"
/*--------------------------------------------------------------------------*/
He had constant buffer underrun problems:
Modified: nonameyet/branches/cleanup/doc/READMEs/README.rscsi
===================================================================
--- nonameyet/branches/cleanup/doc/READMEs/README.rscsi 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/doc/READMEs/README.rscsi 2006-11-19 17:29:47 UTC (rev 399)
@@ -32,23 +32,23 @@
- Install rscsi suid root into /opt/schily/sbin
- - Install a file /etc/default/rscsi and define access rights.
+ - Install a file /etc/rscsi.conf and define access rights.
Without this file, rscsi will not work at all.
The template for this file is: rscsi/rscsi.dfl
RSCSI Security:
-- When rscsi starts, it checks if /etc/default/rscsi exists.
+- When rscsi starts, it checks if /etc/rscsi.conf exists.
If not, it dies.
-- If rscsi is not called by a user listed in /etc/default/rscsi
+- If rscsi is not called by a user listed in /etc/rscsi.conf
it dies.
- To access a SCSI target there must be an entry that lists the user
rcsi hast been started from, the hostname and the SCSI target.
- rscsi compares the hostname field in /etc/default/rscsi
+ rscsi compares the hostname field in /etc/rscsi.conf
to the peername retrived from STDIN:
- legal host name IP connection
Modified: nonameyet/branches/cleanup/doc/plattforms/README.linux
===================================================================
--- nonameyet/branches/cleanup/doc/plattforms/README.linux 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/doc/plattforms/README.linux 2006-11-19 17:29:47 UTC (rev 399)
@@ -159,7 +159,7 @@
If dev=0,0,0 does not work but -dev=0,0,0 works you found this
incompatibility. This problem is caused by an incompatibility
in ctype.h and it seems that there are other compatibility problems
- e.g. with reading /etc/default/wodim.
+ e.g. with reading /etc/wodim.conf.
You cannot copy binaries between different Linux versions,
always compile the sources by yourself.
Modified: nonameyet/branches/cleanup/libscg/CMakeLists.txt
===================================================================
--- nonameyet/branches/cleanup/libscg/CMakeLists.txt 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/libscg/CMakeLists.txt 2006-11-19 17:29:47 UTC (rev 399)
@@ -3,7 +3,7 @@
include(../include/AddScgBits.cmake)
#SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
-SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
+SET(LIBSCG_SRCS scgsettarget.c scgtimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
LINK_DIRECTORIES(../libschily)
ADD_LIBRARY (scg STATIC ${LIBSCG_SRCS})
TARGET_LINK_LIBRARIES(scg schily ${SCG_SELF_LIBS})
Modified: nonameyet/branches/cleanup/libscg/scsi-linux-ata.c
===================================================================
--- nonameyet/branches/cleanup/libscg/scsi-linux-ata.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/libscg/scsi-linux-ata.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -704,7 +704,7 @@
!(token[ID_TOKEN_DEV]) ||
strcmp(token[ID_TOKEN_DEV], TOKEN_DEV)) {
- errmsgno(EX_BAD, "ERROR: unknow format\n");
+ errmsgno(EX_BAD, "ERROR: unknown format\n");
errmsgno(EX_BAD, "EXAMPLE: /dev/scsi/host1/bus2/target3/lun4/cd\n");
errmsgno(EX_BAD, "EXAMPLE: /dev/ide/host0/bus0/target1/lun0/cd\n");
errmsgno(EX_BAD, "EXAMPLE: /dev/hda or /dev/sr0\n");
Copied: nonameyet/branches/cleanup/libscg/scsi-remote.c (from rev 398, nonameyet/trunk/libscg/scsi-remote.c)
Modified: nonameyet/branches/cleanup/libscg/scsiopen.c
===================================================================
--- nonameyet/branches/cleanup/libscg/scsiopen.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/libscg/scsiopen.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -67,6 +67,11 @@
#include <scg/scsireg.h>
#include <scg/scsitransp.h>
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#include <sys/utsname.h>
+#endif
+
+
#define strbeg(s1, s2) (strstr((s2), (s1)) == (s2))
extern int lverbose;
@@ -125,6 +130,22 @@
scgp->debug = debug;
scgp->overbose = be_verbose;
+#ifdef __linux__
+ struct utsname buf;
+ if(scsidev) {
+ if(0==strncmp(scsidev, "ATAPI:", 6) &&
+ 0==uname( &buf ) &&
+ 0==strncmp(buf.release, "2.6", 3) ) {
+ scsidev+=6;
+ fprintf(stderr, "\nWarning, the ATAPI: method is considered deprecated on modern kernels!\n"
+ "Mapping device specification to dev=%s now.\n"
+ "To force the old ATAPI: method, replace ATAPI: with OLDATAPI:\n", scsidev);
+ }
+ else if(0==strncmp(scsidev, "OLDATAPI:", 9))
+ scsidev+=3;
+ }
+#endif
+
devname[0] = '\0';
if (scsidev != NULL && scsidev[0] != '\0') {
sdev = scsidev;
Modified: nonameyet/branches/cleanup/libscg/scsitransp.c
===================================================================
--- nonameyet/branches/cleanup/libscg/scsitransp.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/libscg/scsitransp.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -167,7 +167,10 @@
scg_ops_t *ops;
extern scg_ops_t scg_std_ops;
-#ifdef DONT_CARE
+#define printf(x) fprintf(stderr, x)
+/* The code is not modified. Only moved to where it belongs to, stopping sabotage of frontend programs' functionality */
+
+#ifndef SHUT_UP
/*
* Who defines which changes decrease the quality and how? The one who hates
* all changes not done by him personally? There are more harsh (but more
@@ -193,7 +196,8 @@
/*
* End restricted code for quality assurance.
*/
-#endif
+#endif /* SHUT_UP */
+#undef printf
scgp->ops = &scg_std_ops;
Modified: nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8
===================================================================
--- nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/mkisofs/diag/isoinfo.8 2006-11-19 17:29:47 UTC (rev 399)
@@ -177,7 +177,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.sp
The options
.B \-i
@@ -276,7 +276,7 @@
.TP
.B CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim.
+call of the SCSI transport library or a label in the file /etc/wodim.conf.
.TP
.B RSH
If the
@@ -314,13 +314,13 @@
.SH FILES
.TP
-/etc/default/wodim
-Default values can be set for the following options in /etc/default/wodim.
+/etc/wodim.conf
+Default values can be set for the following options in /etc/wodim.conf.
.RS
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim
+call of the SCSI transport library or a label in the file /etc/wodim.conf
that allows to identify a specific drive on the system.
.TP
Any other label
Modified: nonameyet/branches/cleanup/mkisofs/mkisofs.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/mkisofs.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/mkisofs/mkisofs.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -3005,7 +3005,12 @@
* This is the first ISO directory entry in the root dir.
*/
c = isonum_733((unsigned char *)mrootp->extent);
+#ifdef USE_SCG
readsecs(c, sector, 1);
+#else
+ lseek(fileno(in_image), c*2048, SEEK_SET);
+ read(fileno(in_image), sector, sizeof (sector));
+#endif
c = rr_flags((struct iso_directory_record *)sector);
if (c & RR_FLAG_XA)
fprintf(stderr, "XA signatures found\n");
Modified: nonameyet/branches/cleanup/mkisofs/write.c
===================================================================
--- nonameyet/branches/cleanup/mkisofs/write.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/mkisofs/write.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -909,14 +909,29 @@
s_entry = dpnt->contents;
for (s_entry = dpnt->contents; s_entry; s_entry = s_entry->next) {
/* link files have already been given the weight NOT_SORTED */
- if (s_entry->sort != NOT_SORTED)
- continue;
+ if (s_entry->sort == NOT_SORTED)
+ {
+ /* update the start extent */
+ s_hash = find_hash(s_entry->dev, s_entry->inode);
+ if (s_hash) {
+ set_733((char *) s_entry->isorec.extent,
+ s_hash->starting_block);
+ s_entry->starting_block = s_hash->starting_block;
+ }
+ }
- /* update the start extent */
- s_hash = find_hash(s_entry->dev, s_entry->inode);
- if (s_hash) {
- set_733((char *) s_entry->isorec.extent, s_hash->starting_block);
- s_entry->starting_block = s_hash->starting_block;
+ if (verbose > 2 && s_entry->size != 0) {
+ fprintf(stderr, "%8d %8d ",
+ s_entry->starting_block,
+ s_entry->starting_block + ISO_BLOCKS(s_entry->size) - 1);
+
+ if (s_entry->inode != TABLE_INODE) {
+ fprintf(stderr, "%s\n", s_entry->whole_name);
+ } else {
+ fprintf(stderr, "%s%s%s\n",
+ s_entry->filedir->whole_name,
+ SPATH_SEPARATOR, trans_tbl);
+ }
}
}
if (dpnt->subdir) {
@@ -1253,8 +1268,8 @@
last_extent += dwpnt->pad;
}
#endif /* DVD_VIDEO */
- if (verbose > 2) {
- fprintf(stderr, "%d %d %s\n",
+ if (verbose > 2 && !do_sort) {
+ fprintf(stderr, "%8d %8d %s\n",
s_entry->starting_block,
last_extent - 1, whole_path);
}
Modified: nonameyet/branches/cleanup/readcd/readcd.1
===================================================================
--- nonameyet/branches/cleanup/readcd/readcd.1 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/readcd/readcd.1 2006-11-19 17:29:47 UTC (rev 399)
@@ -98,7 +98,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI timeout= #
Set the default SCSI command timeout value to
Modified: nonameyet/branches/cleanup/rscsi/rscsi.c
===================================================================
--- nonameyet/branches/cleanup/rscsi/rscsi.c 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/rscsi/rscsi.c 2006-11-19 17:29:47 UTC (rev 399)
@@ -151,9 +151,9 @@
* don't contribute work and don't give support, they are causing extra
* work for me and this way slow down the development.
*/
- if (cfg_open("/etc/default/rscsi") < 0) {
+ if (cfg_open("/etc/rscsi.conf") < 0) {
rscsierror(geterrno(), errmsgstr(geterrno()),
- "Remote configuration error: Cannot open /etc/default/rscsi");
+ "Remote configuration error: Cannot open /etc/rscsi.conf");
/* rscsirespond(-1, geterrno());*/
exit(EX_BAD);
}
@@ -174,7 +174,7 @@
/*
* XXX If someone sets up debugging and allows the debug file to be
* XXX replaced by a symlink to e.g. /etc/passwd this would be a
- * XXX security risk. But /etc/default/rscsi is only writable by root
+ * XXX security risk. But /etc/rscsi.conf is only writable by root
* XXX and for this reason a possible security risk would have been
* XXX introduced by the administrator.
*/
Modified: nonameyet/branches/cleanup/rscsi/rscsi.dfl
===================================================================
--- nonameyet/branches/cleanup/rscsi/rscsi.dfl 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/rscsi/rscsi.dfl 2006-11-19 17:29:47 UTC (rev 399)
@@ -1,6 +1,6 @@
#ident @(#)rscsi.dfl 1.3 05/08/09 Copyr 2000 J. Schilling
#
-# This file is /etc/default/rscsi
+# This file is /etc/rscsi.conf
#
# NOTE: If this file is not present, rscsi will reject to work.
#
Modified: nonameyet/branches/cleanup/scgcheck/scgcheck.1
===================================================================
--- nonameyet/branches/cleanup/scgcheck/scgcheck.1 2006-11-19 17:07:23 UTC (rev 398)
+++ nonameyet/branches/cleanup/scgcheck/scgcheck.1 2006-11-19 17:29:47 UTC (rev 399)
@@ -168,7 +168,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI timeout= #
Set the default SCSI command timeout value to
More information about the Debburn-changes
mailing list