[Debburn-changes] r377 - in nonameyet/trunk: . cdrecord debian doc/ANNOUNCEMENTs doc/READMEs doc/plattforms mkisofs/diag readcd rscsi scgcheck

Eduard Bloch blade at alioth.debian.org
Sun Nov 5 15:55:26 CET 2006


Author: blade
Date: 2006-11-05 15:55:26 +0100 (Sun, 05 Nov 2006)
New Revision: 377

Added:
   nonameyet/trunk/debian/wodim.preinst
Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdrecord/defaults.c
   nonameyet/trunk/cdrecord/defaults.h
   nonameyet/trunk/cdrecord/wodim.1
   nonameyet/trunk/cdrecord/wodim.dfl
   nonameyet/trunk/debian/README.ATAPI.setup
   nonameyet/trunk/debian/changelog
   nonameyet/trunk/debian/wodim.links
   nonameyet/trunk/doc/ANNOUNCEMENTs/AN-2.01
   nonameyet/trunk/doc/READMEs/README.ATAPI
   nonameyet/trunk/doc/READMEs/README.rscsi
   nonameyet/trunk/doc/plattforms/README.linux
   nonameyet/trunk/mkisofs/diag/isoinfo.8
   nonameyet/trunk/readcd/readcd.1
   nonameyet/trunk/rscsi/rscsi.c
   nonameyet/trunk/rscsi/rscsi.dfl
   nonameyet/trunk/scgcheck/scgcheck.1
Log:
moved files to /etc/... and added preinst code to kill unregistred conffiles and preserve user changes

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/Changelog	2006-11-05 14:55:26 UTC (rev 377)
@@ -117,7 +117,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/trunk/cdrecord/defaults.c
===================================================================
--- nonameyet/trunk/cdrecord/defaults.c	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/cdrecord/defaults.c	2006-11-05 14:55:26 UTC (rev 377)
@@ -65,7 +65,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/wodim"));
+	return (defltopen("/etc/wodim.conf"));
 }
 
 EXPORT void

Modified: nonameyet/trunk/cdrecord/defaults.h
===================================================================
--- nonameyet/trunk/cdrecord/defaults.h	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/cdrecord/defaults.h	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/cdrecord/wodim.1
===================================================================
--- nonameyet/trunk/cdrecord/wodim.1	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/cdrecord/wodim.1	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/cdrecord/wodim.dfl
===================================================================
--- nonameyet/trunk/cdrecord/wodim.dfl	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/cdrecord/wodim.dfl	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/debian/README.ATAPI.setup
===================================================================
--- nonameyet/trunk/debian/README.ATAPI.setup	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/debian/README.ATAPI.setup	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/debian/changelog	2006-11-05 14:55:26 UTC (rev 377)
@@ -8,6 +8,10 @@
   * remove . from the include list, patch by Modestas Vainius
     (closes: #358497, acknowledging NMU by Steinar H. Gunderson)
   * readded mkzftree to the mkisofs files (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
 

Modified: nonameyet/trunk/debian/wodim.links
===================================================================
--- nonameyet/trunk/debian/wodim.links	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/debian/wodim.links	2006-11-05 14:55:26 UTC (rev 377)
@@ -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

Added: nonameyet/trunk/debian/wodim.preinst
===================================================================
--- nonameyet/trunk/debian/wodim.preinst	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/debian/wodim.preinst	2006-11-05 14:55:26 UTC (rev 377)
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ "$1" = "upgrade" ] ||  [ "$1" = "install" ] ; then
+   # first kill old conffiles, then possible dangling symlinks created by that action
+   for CONF in /etc/default/wodim /etc/default/cdrecord /etc/default/rscsi \
+      /etc/cdrecord/cdrecord /etc/cdrecord/rscsi \
+      /etc/wodim/wodim /etc/wodim/rscsi
+   do
+      SUM="$(md5sum $CONF 2>/dev/null | cut -f1 -d\  )"
+      # missing, empty, unchanged files
+      case "$SUM" in 
+         ""|d41d8cd98f00b204e9800998ecf8427e|e7e6151fe872d56351d04f4c2c3d9722|0bcdd41f5d7c6419d524b234701d18f0|1d2c06f0d52fae533ef0cd58b80d22e4|3016370f809f8bca713a2eee1ecbeb2d|68e2b3b297d6b5cb0c6beb9136f2d918|6e3ce0b42b8971f0b10958ab6982b441|8c3e4a320aafda37f162a12526c0d431|e05fdb0a48542ccbff5b28b100d083e3|eff315991af0911ae8c96b9500c1714f)
+         rm -f $CONF
+         ;;
+         *)
+         case $CONF in
+            *rscsi)
+            if ! test -e /etc/rscsi.conf ; then
+               cp $CONF /etc/rscsi.conf || true
+            fi
+            ;;
+            *)
+            if ! test -e /etc/wodim.conf ; then
+               cp $CONF /etc/wodim.conf || true
+            fi
+            ;;
+         esac
+         ;;
+      esac
+   done
+   # drop directories but only if beeing empty
+   yes n | rm -r /etc/cdrecord /etc/wodim 2>/dev/null || true
+fi
+
+#DEBHELPER#

Modified: nonameyet/trunk/doc/ANNOUNCEMENTs/AN-2.01
===================================================================
--- nonameyet/trunk/doc/ANNOUNCEMENTs/AN-2.01	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/doc/ANNOUNCEMENTs/AN-2.01	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/doc/READMEs/README.ATAPI
===================================================================
--- nonameyet/trunk/doc/READMEs/README.ATAPI	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/doc/READMEs/README.ATAPI	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/doc/READMEs/README.rscsi
===================================================================
--- nonameyet/trunk/doc/READMEs/README.rscsi	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/doc/READMEs/README.rscsi	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/doc/plattforms/README.linux
===================================================================
--- nonameyet/trunk/doc/plattforms/README.linux	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/doc/plattforms/README.linux	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/mkisofs/diag/isoinfo.8
===================================================================
--- nonameyet/trunk/mkisofs/diag/isoinfo.8	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/mkisofs/diag/isoinfo.8	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/readcd/readcd.1
===================================================================
--- nonameyet/trunk/readcd/readcd.1	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/readcd/readcd.1	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/rscsi/rscsi.c
===================================================================
--- nonameyet/trunk/rscsi/rscsi.c	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/rscsi/rscsi.c	2006-11-05 14:55:26 UTC (rev 377)
@@ -154,9 +154,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);
 	}
@@ -177,7 +177,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/trunk/rscsi/rscsi.dfl
===================================================================
--- nonameyet/trunk/rscsi/rscsi.dfl	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/rscsi/rscsi.dfl	2006-11-05 14:55:26 UTC (rev 377)
@@ -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/trunk/scgcheck/scgcheck.1
===================================================================
--- nonameyet/trunk/scgcheck/scgcheck.1	2006-11-05 11:25:24 UTC (rev 376)
+++ nonameyet/trunk/scgcheck/scgcheck.1	2006-11-05 14:55:26 UTC (rev 377)
@@ -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