[packages/cdrtools.git] / cdrtools-config.patch

--- cdrtools-3.00/cdrecord/cdrecord.1~	2014-03-25 14:58:38.000000000 +0200
+++ cdrtools-3.00/cdrecord/cdrecord.1	2014-03-25 14:59:13.673238717 +0200
@@ -71,7 +71,7 @@
 explained below refers to
 .IR scsibus / target / lun
 of the CD/DVD/BluRay-recorder.
-If a file /etc/default/cdrecord exists, the parameter to the
+If a file /etc/cdrecord.conf exists, the parameter to the
 .B dev=
 option may also be a drive name label in said file (see FILES section).
 
@@ -1201,13 +1201,13 @@
 option is present,
 .B cdrecord
 will try to get a drive specific speed value from the file
-.B /etc/default/cdrecord
+.B /etc/cdrecord.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/cdrecord .
+.BR /etc/cdrecord.conf .
 If no speed value could be found, cdrecord 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 
@@ -1505,7 +1505,7 @@
 .B CDR_DEVICE
 environment.
 .sp
-If a file /etc/default/cdrecord exists, and
+If a file /etc/cdrecord.conf exists, and
 if the argument to the
 .B dev=
 option
@@ -1514,7 +1514,7 @@
 environment
 does not contain the characters ',', '/', '@' or ':',
 it is interpreted as a device label name that was defined in the file
-/etc/default/cdrecord (see FILES section).
+/etc/cdrecord.conf (see FILES section).
 .sp
 .B \h'-2m'Autotarget Mode
 .br
@@ -2158,7 +2158,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/cdrecord.
+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
 .TP
 .B CDR_SPEED
 Sets the default speed value for writing (see also 
@@ -2226,8 +2226,11 @@
 
 .SH FILES
 .TP
-.B /etc/default/cdrecord
-Default values can be set for the following options in /etc/default/cdrecord.
+.B /etc/cdrecord.conf
+Default values can be set for the following options in /etc/cdrecord.conf .
+Note that this path has been changed from standard location in cdrtools
+distribution (/etc/default/cdrecord) to be consistent with other packages
+which don't use /etc/default directory in general.
 For example:
 .SM CDR_FIFOSIZE=8m
 or
@@ -2236,7 +2239,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/cdrecord 
+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
 that allows to identify a specific drive on the system.
 .TP
 .B CDR_SPEED
--- cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl	2008-12-30 14:29:50.000000000 +0100
+++ cdrtools-2.01.01/cdrecord/cdrecord.dfl	2010-02-08 14:15:04.000000000 +0100
@@ -1,6 +1,6 @@
 #ident @(#)cdrecord.dfl	1.8 14/01/03 Copyr 1998-2014 J. Schilling
 #
-# This file is /etc/default/cdrecord
+# This file is /etc/cdrecord.conf
 # It contains defaults that are used if no command line option
 # or environment is present.
 # 
@@ -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/cdrecord 
+# not make sense to set up a default speed in /etc/cdrecord.conf 
 #
 #CDR_SPEED=40
 
--- cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c	2009-07-10 23:57:18.000000000 +0200
+++ cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c	2010-02-08 14:15:04.000000000 +0100
@@ -49,7 +49,7 @@
 	 * don't contribute work and don't give support, they are causing extra
 	 * work for me and this way slow down the cdrecord development.
 	 */
-	return (defltopen("/etc/default/cdrecord"));
+	return (defltopen("/etc/cdrecord.conf"));
 }
 
 EXPORT void
--- cdrtools-2.01.01.orig/readcd/readcd.1	2010-01-29 23:27:12.000000000 +0100
+++ cdrtools-2.01.01/readcd/readcd.1	2010-02-08 14:15:04.000000000 +0100
@@ -64,7 +64,7 @@
 explained below refers to
 .IR scsibus / target / lun
 of the CD/DVD/BluRay-Recorder.
-If a file /etc/default/cdrecord exists, the parameter to the
+If a file /etc/cdrecord.conf exists, the parameter to the
 .B dev=
 option may also be a drive name label in said file (see FILES section).
 
@@ -440,7 +440,7 @@
 .B CDR_DEVICE
 environment.
 .sp
-If a file /etc/default/cdrecord exists, and
+If a file /etc/cdrecord.conf exists, and
 if the argument to the
 .B dev=
 option
@@ -449,7 +449,7 @@
 environment
 does not contain the characters ',', '/', '@' or ':',
 it is interpreted as a device label name that was defined in the file
-/etc/default/cdrecord (see FILES section).
+/etc/cdrecord.conf (see FILES section).
 .sp
 .B \h'-2m'Autotarget Mode
 .br
--- cdrtools-3.01/cdrecord/Makefile.dfl.orig	2010-05-14 20:14:37.000000000 +0200
+++ cdrtools-3.01/cdrecord/Makefile.dfl	2020-12-29 17:48:56.424679180 +0100
@@ -8,11 +8,12 @@
 ###########################################################################
 
 INSMODE=	0644
-INSDIR=		etc/default
+INSDIR=		etc
 INSBASE=	$(INS_RBASE:%/=%)
 INSFLAGS=	-noclobber
 TARGET=		cdrecord
 AUXSRCEXT=	.dfl
+_EXEEXT=        .conf
 #XMK_FILE=	Makefile.man
 
 ###########################################################################
--- cdrtools-3.01/rscsi/rscsi.1.orig	2009-11-15 20:27:50.000000000 +0100
+++ cdrtools-3.01/rscsi/rscsi.1	2020-12-29 18:41:07.327717623 +0100
@@ -514,8 +514,11 @@
 to exit.
 .SH FILES
 .TP
-/etc/default/rscsi
-Default values can be set for the following options in /etc/default/rscsi.
+/etc/rscsi.conf
+Default values can be set for the following options in /etc/rscsi/conf .
+Note that this path has been changed from standard location in cdrtools
+distribution (/etc/default/rscsi) to be consistent with other packages
+which don't use /etc/default directory in general.
 For example:
 .sp
 .BR DEBUG= /tmp/rscsi.debug
@@ -583,7 +586,7 @@
 will compare the 
 .B "host entry 
 from 
-.B /etc/default/rscsi
+.B /etc/rscsi.conf
 with the following strings:
 .RS
 .TP 10
@@ -644,7 +647,7 @@
 If you like to debug
 .B rscsi
 edit
-.B /etc/default/rscsi
+.B /etc/rscsi.conf
 and insert a 
 .B DEBUG
 entry.
--- cdrtools-3.01/rscsi/rscsi.dfl.orig	2005-08-09 15:19:20.000000000 +0200
+++ cdrtools-3.01/rscsi/rscsi.dfl	2020-12-29 19:21:24.784621135 +0100
@@ -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.
 #
--- cdrtools-3.01/rscsi/rscsi.c.orig	2010-05-24 11:27:48.000000000 +0200
+++ cdrtools-3.01/rscsi/rscsi.c	2020-12-29 17:51:01.767333474 +0100
@@ -134,9 +134,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 (defltopen("/etc/default/rscsi") < 0) {
+	if (defltopen("/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);
 	}
--- cdrtools-3.01/rscsi/Makefile.dfl.orig	2010-05-14 20:17:15.000000000 +0200
+++ cdrtools-3.01/rscsi/Makefile.dfl	2020-12-29 19:21:55.414455199 +0100
@@ -8,10 +8,11 @@
 ###########################################################################
 
 INSMODE=	0644
-INSDIR=		etc/default
+INSDIR=		etc
 INSBASE=	$(INS_RBASE:%/=%)
 TARGET=		rscsi
 AUXSRCEXT=	.dfl
+_EXEEXT=	.conf
 #XMK_FILE=	Makefile.man
 
 ###########################################################################
Commit	Line	Data
3baac27e ER	1	--- cdrtools-3.00/cdrecord/cdrecord.1~ 2014-03-25 14:58:38.000000000 +0200
3baac27e ER	2	+++ cdrtools-3.00/cdrecord/cdrecord.1 2014-03-25 14:59:13.673238717 +0200
774538c8	3	@@ -71,7 +71,7 @@
	4	explained below refers to
	5	.IR scsibus / target / lun
3baac27e	6	of the CD/DVD/BluRay-recorder.
4afbdb0b AM	7	-If a file /etc/default/cdrecord exists, the parameter to the
	8	+If a file /etc/cdrecord.conf exists, the parameter to the
	9	.B dev=
	10	option may also be a drive name label in said file (see FILES section).
	11
17e5e911	12	@@ -1201,13 +1201,13 @@
774538c8	13	option is present,
	14	.B cdrecord
	15	will try to get a drive specific speed value from the file
	16	-.B /etc/default/cdrecord
	17	+.B /etc/cdrecord.conf
	18	and if it cannot find one, it will try to get the speed value from the
	19	.B CDR_SPEED
	20	environment and later from the
	21	.B CDR_SPEED=
	22	entry in
	23	-.BR /etc/default/cdrecord .
	24	+.BR /etc/cdrecord.conf .
	25	If no speed value could be found, cdrecord uses a drive specific default speed.
f9d31cb6	26	The default for all new (MMC-compliant) drives is to use the maximum supported by the drive.
774538c8	27	If you use
17e5e911	28	@@ -1505,7 +1505,7 @@
774538c8	29	.B CDR_DEVICE
	30	environment.
	31	.sp
	32	-If a file /etc/default/cdrecord exists, and
	33	+If a file /etc/cdrecord.conf exists, and
	34	if the argument to the
4afbdb0b	35	.B dev=
774538c8	36	option
17e5e911	37	@@ -1514,7 +1514,7 @@
774538c8	38	environment
	39	does not contain the characters ',', '/', '@' or ':',
	40	it is interpreted as a device label name that was defined in the file
4afbdb0b AM	41	-/etc/default/cdrecord (see FILES section).
4afbdb0b AM	42	+/etc/cdrecord.conf (see FILES section).
79432cce	43	.sp
774538c8	44	.B \h'-2m'Autotarget Mode
774538c8	45	.br
17e5e911	46	@@ -2158,7 +2158,7 @@
4afbdb0b	47	.TP
af759f49	48	.B CDR_DEVICE
4afbdb0b AM	49	This may either hold a device identifier that is suitable to the open
4afbdb0b AM	50	-call of the SCSI transport library or a label in the file /etc/default/cdrecord.
d04788f2	51	+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
4afbdb0b	52	.TP
af759f49	53	.B CDR_SPEED
4afbdb0b	54	Sets the default speed value for writing (see also
17e5e911	55	@@ -2226,8 +2226,11 @@
4afbdb0b AM	56
	57	.SH FILES
	58	.TP
3c229056	59	-.B /etc/default/cdrecord
4afbdb0b	60	-Default values can be set for the following options in /etc/default/cdrecord.
3c229056	61	+.B /etc/cdrecord.conf
cd197957 JB	62	+Default values can be set for the following options in /etc/cdrecord.conf .
	63	+Note that this path has been changed from standard location in cdrtools
	64	+distribution (/etc/default/cdrecord) to be consistent with other packages
	65	+which don't use /etc/default directory in general.
4afbdb0b AM	66	For example:
	67	.SM CDR_FIFOSIZE=8m
	68	or
17e5e911	69	@@ -2236,7 +2239,7 @@
4afbdb0b	70	.TP
17e5e911	71	.B CDR_DEVICE
4afbdb0b AM	72	This may either hold a device identifier that is suitable to the open
4afbdb0b AM	73	-call of the SCSI transport library or a label in the file /etc/default/cdrecord
774538c8	74	+call of the SCSI transport library or a label in the file /etc/cdrecord.conf
4afbdb0b AM	75	that allows to identify a specific drive on the system.
4afbdb0b AM	76	.TP
17e5e911	77	.B CDR_SPEED
17e5e911	78	--- cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl 2008-12-30 14:29:50.000000000 +0100
17e5e911	79	+++ cdrtools-2.01.01/cdrecord/cdrecord.dfl 2010-02-08 14:15:04.000000000 +0100
4afbdb0b	80	@@ -1,6 +1,6 @@
f9d31cb6	81	#ident @(#)cdrecord.dfl 1.8 14/01/03 Copyr 1998-2014 J. Schilling
4afbdb0b AM	82	#
	83	-# This file is /etc/default/cdrecord
	84	+# This file is /etc/cdrecord.conf
	85	# It contains defaults that are used if no command line option
	86	# or environment is present.
	87	#
17e5e911	88	@@ -19,7 +19,7 @@
af759f49	89	# Note that newer cdrecord versions do not default
	90	# to speed=1. For MMC compliant drives, the default
	91	# is to write at maximum speed, so it in general does
	92	-# not make sense to set up a default speed in /etc/default/cdrecord
	93	+# not make sense to set up a default speed in /etc/cdrecord.conf
	94	#
	95	#CDR_SPEED=40
	96
17e5e911	97	--- cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c 2009-07-10 23:57:18.000000000 +0200
	98	+++ cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c 2010-02-08 14:15:04.000000000 +0100
	99	@@ -49,7 +49,7 @@
	100	* don't contribute work and don't give support, they are causing extra
	101	* work for me and this way slow down the cdrecord development.
	102	*/
	103	- return (defltopen("/etc/default/cdrecord"));
	104	+ return (defltopen("/etc/cdrecord.conf"));
	105	}
d04788f2	106
17e5e911	107	EXPORT void
17e5e911	108	--- cdrtools-2.01.01.orig/readcd/readcd.1 2010-01-29 23:27:12.000000000 +0100
17e5e911	109	+++ cdrtools-2.01.01/readcd/readcd.1 2010-02-08 14:15:04.000000000 +0100
774538c8	110	@@ -64,7 +64,7 @@
	111	explained below refers to
	112	.IR scsibus / target / lun
	113	of the CD/DVD/BluRay-Recorder.
	114	-If a file /etc/default/cdrecord exists, the parameter to the
	115	+If a file /etc/cdrecord.conf exists, the parameter to the
d04788f2	116	.B dev=
774538c8	117	option may also be a drive name label in said file (see FILES section).
	118
	119	@@ -440,7 +440,7 @@
	120	.B CDR_DEVICE
	121	environment.
79432cce	122	.sp
774538c8	123	-If a file /etc/default/cdrecord exists, and
	124	+If a file /etc/cdrecord.conf exists, and
	125	if the argument to the
d04788f2	126	.B dev=
774538c8	127	option
	128	@@ -449,7 +449,7 @@
	129	environment
	130	does not contain the characters ',', '/', '@' or ':',
	131	it is interpreted as a device label name that was defined in the file
d04788f2	132	-/etc/default/cdrecord (see FILES section).
d04788f2	133	+/etc/cdrecord.conf (see FILES section).
774538c8	134	.sp
774538c8	135	.B \h'-2m'Autotarget Mode
3c229056	136	.br
9bfb9744 JB	137	--- cdrtools-3.01/cdrecord/Makefile.dfl.orig 2010-05-14 20:14:37.000000000 +0200
	138	+++ cdrtools-3.01/cdrecord/Makefile.dfl 2020-12-29 17:48:56.424679180 +0100
	139	@@ -8,11 +8,12 @@
	140	###########################################################################
	141
	142	INSMODE= 0644
	143	-INSDIR= etc/default
	144	+INSDIR= etc
	145	INSBASE= $(INS_RBASE:%/=%)
	146	INSFLAGS= -noclobber
	147	TARGET= cdrecord
	148	AUXSRCEXT= .dfl
	149	+_EXEEXT= .conf
	150	#XMK_FILE= Makefile.man
	151
	152	###########################################################################
	153	--- cdrtools-3.01/rscsi/rscsi.1.orig 2009-11-15 20:27:50.000000000 +0100
	154	+++ cdrtools-3.01/rscsi/rscsi.1 2020-12-29 18:41:07.327717623 +0100
	155	@@ -514,8 +514,11 @@
	156	to exit.
	157	.SH FILES
	158	.TP
	159	-/etc/default/rscsi
	160	-Default values can be set for the following options in /etc/default/rscsi.
	161	+/etc/rscsi.conf
	162	+Default values can be set for the following options in /etc/rscsi/conf .
	163	+Note that this path has been changed from standard location in cdrtools
	164	+distribution (/etc/default/rscsi) to be consistent with other packages
	165	+which don't use /etc/default directory in general.
	166	For example:
	167	.sp
	168	.BR DEBUG= /tmp/rscsi.debug
	169	@@ -583,7 +586,7 @@
	170	will compare the
	171	.B "host entry
	172	from
	173	-.B /etc/default/rscsi
	174	+.B /etc/rscsi.conf
	175	with the following strings:
	176	.RS
	177	.TP 10
	178	@@ -644,7 +647,7 @@
	179	If you like to debug
	180	.B rscsi
	181	edit
	182	-.B /etc/default/rscsi
	183	+.B /etc/rscsi.conf
	184	and insert a
	185	.B DEBUG
	186	entry.
	187	--- cdrtools-3.01/rscsi/rscsi.dfl.orig 2005-08-09 15:19:20.000000000 +0200
	188	+++ cdrtools-3.01/rscsi/rscsi.dfl 2020-12-29 19:21:24.784621135 +0100
	189	@@ -1,6 +1,6 @@
	190	#ident @(#)rscsi.dfl 1.3 05/08/09 Copyr 2000 J. Schilling
	191	#
	192	-# This file is /etc/default/rscsi
	193	+# This file is /etc/rscsi.conf
	194	#
	195	# NOTE: If this file is not present, rscsi will reject to work.
	196	#
	197	--- cdrtools-3.01/rscsi/rscsi.c.orig 2010-05-24 11:27:48.000000000 +0200
	198	+++ cdrtools-3.01/rscsi/rscsi.c 2020-12-29 17:51:01.767333474 +0100
	199	@@ -134,9 +134,9 @@
	200	* don't contribute work and don't give support, they are causing extra
201	* work for me and this way slow down the development.
202	*/
203	- if (defltopen("/etc/default/rscsi") < 0) {
204	+ if (defltopen("/etc/rscsi.conf") < 0) {
205	rscsierror(geterrno(), errmsgstr(geterrno()),
206	- "Remote configuration error: Cannot open /etc/default/rscsi");
207	+ "Remote configuration error: Cannot open /etc/rscsi.conf");
208	/* rscsirespond(-1, geterrno());*/
209	exit(EX_BAD);
210	}
211	--- cdrtools-3.01/rscsi/Makefile.dfl.orig 2010-05-14 20:17:15.000000000 +0200
212	+++ cdrtools-3.01/rscsi/Makefile.dfl 2020-12-29 19:21:55.414455199 +0100
213	@@ -8,10 +8,11 @@
214	###########################################################################
215
216	INSMODE= 0644
217	-INSDIR= etc/default
218	+INSDIR= etc
219	INSBASE= $(INS_RBASE:%/=%)
220	TARGET= rscsi
221	AUXSRCEXT= .dfl
222	+_EXEEXT= .conf
223	#XMK_FILE= Makefile.man
224
225	###########################################################################