[Debburn-changes] r376 - in nonameyet/trunk: . cdrecord libscg

Eduard Bloch blade at alioth.debian.org
Sun Nov 5 12:25:24 CET 2006


Author: blade
Date: 2006-11-05 12:25:24 +0100 (Sun, 05 Nov 2006)
New Revision: 376

Modified:
   nonameyet/trunk/CMakeLists.txt
   nonameyet/trunk/cdrecord/cdrecord.c
   nonameyet/trunk/libscg/scsitransp.c
Log:
Restored the invariant section from original cdrtools and made it compile,
adding dummy strings for the stuff that we dropped a while ago.

Act consequential - either remove all invariant sections or none.

Added a preamble to tell the user the FUD carefully and know where to send the
complaints to.



Modified: nonameyet/trunk/CMakeLists.txt
===================================================================
--- nonameyet/trunk/CMakeLists.txt	2006-10-25 22:25:48 UTC (rev 375)
+++ nonameyet/trunk/CMakeLists.txt	2006-11-05 11:25:24 UTC (rev 376)
@@ -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)
 
+#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/trunk/cdrecord/cdrecord.c
===================================================================
--- nonameyet/trunk/cdrecord/cdrecord.c	2006-10-25 22:25:48 UTC (rev 375)
+++ nonameyet/trunk/cdrecord/cdrecord.c	2006-11-05 11:25:24 UTC (rev 376)
@@ -315,14 +315,26 @@
 	      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 about unofficial status or about\n"
+			"non-Schily-Makefilesystem below or if you cannot link multisession\n"
+			"because your GUI/script breaks, please don't send your complaints to\n"
+      "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 this message is forbidden as well, so don't believe everything said there.\n\n\n" );
 
+#endif /* SHUT_UP */
+
   if(strcmp(av[0], "cdrecord") == 0)
      strcpy(av[0], "wodim");
 
@@ -349,9 +361,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) {
@@ -518,6 +656,7 @@
 	scgp->kdebug = kdebug;
 	scgp->cap->c_bsize = DATA_SEC_SIZE;
 
+#ifndef SHUT_UP
 
 	if ((flags & F_MSINFO) == 0 || lverbose) {
 		char	*vers;
@@ -556,6 +695,9 @@
 				auth, vers, scg_version(scgp, SCG_RSCCS_ID));
 		}
 	}
+
+#endif /* SHUT_UP */
+
 	if (lverbose && driveropts)
 		printf("Driveropts: '%s'\n", driveropts);
 

Modified: nonameyet/trunk/libscg/scsitransp.c
===================================================================
--- nonameyet/trunk/libscg/scsitransp.c	2006-10-25 22:25:48 UTC (rev 375)
+++ nonameyet/trunk/libscg/scsitransp.c	2006-11-05 11:25:24 UTC (rev 376)
@@ -171,7 +171,7 @@
 	scg_ops_t *ops;
 extern	scg_ops_t scg_std_ops;
 
-#ifdef DONT_CARE 
+#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
@@ -197,7 +197,7 @@
 	/*
 	 * End restricted code for quality assurance.
 	 */
-#endif
+#endif /* SHUT_UP */
 
 	scgp->ops = &scg_std_ops;
 




More information about the Debburn-changes mailing list