vdr/vdr/debian changelog config-loader.sh vdr.default vdr.init

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv31268/vdr/vdr/debian

Modified Files:
	changelog config-loader.sh vdr.default vdr.init 
Log Message:
* added a patch which sets the default port for SVDRP to 0 (disable SVDRP) (added SVDRP_PORT=2001 to config-loader.sh and using it in the init-script)
* removed some useless changelog-entries (not every nonsense change must be mentitioned in the changelog)

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- changelog	14 Jan 2005 11:25:42 -0000	1.74
+++ changelog	15 Jan 2005 18:14:18 -0000	1.75
@@ -26,12 +26,16 @@
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
     - Do not run as user root anymore, the user vdr will be created
       and the video-directory and config-files will be changed, so the
-      owner/group is vdr:vdr (closes: #287899)
+      owner/group is vdr:vdr (closes: #287899) (CAN-2005-0071)
     - Added vdr-shutdown.wrapper with owner/group root:vdr and mode 6750, 
       which calls the normal vdr-shutdown-script so that the user vdr is 
       able to run vdr's shutdown-hooks
     - The automatic shutdown is now disabled by default, to enable it 
-      again you have to change ENABLE_SHUTDOWN=0 to 1 in /etc/default/vdr.
+      again you have to change ENABLE_SHUTDOWN=0 to 1 in /etc/default/vdr
+    - Set default port for SVDRP to 0, users who run vdr from the 
+      commandline will have to enable it by using the --port option
+      (in the init-script SVDRP will still be enabled and on the default 
+      port 2001)
     - Changed package vdr to Architecture: any, because it now contains
       a binary file
     - Added patch from Ludwig Nussel to be able to syncronize the system-
@@ -56,10 +60,8 @@
       normal vdr-source-tree
     - Added debianize-vdrplugin-script and the plugin-template-dir from 
       c't-vdr
-    - Moved lintian-override file to debian/lintian/vdr
     - Added lintian-override to avoid the lintian-warnings for the
       plugin-template-scripts
-    - Cleaned up debin/rules a little bit
     - Default VIDEO_DIR is now /var/lib/video.00, so new harddiscs can
       be added very easy by mounting them to /var/lib/video.0{1,2,...}
       (if the old directory /var/lib/video exists, create 

Index: vdr.default
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.default,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- vdr.default	14 Jan 2005 11:25:43 -0000	1.18
+++ vdr.default	15 Jan 2005 18:14:18 -0000	1.19
@@ -20,7 +20,7 @@
 PLUGIN_CHECK_PATCHLEVEL="no"
 
 # Options that will be passed to vdr's commandline
-# for example: OPTIONS="-w 15 --port=0"
+# for example: OPTIONS="-w 15"
 OPTIONS="-w 60"
 
 # VDR executes this command when the power-off-key of the remote is

Index: config-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/config-loader.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config-loader.sh	14 Jan 2005 11:25:43 -0000	1.5
+++ config-loader.sh	15 Jan 2005 18:14:18 -0000	1.6
@@ -37,6 +37,9 @@
 # Groupname under which vdr will run
 GROUP=vdr
 
+# Default port for SVDRP
+SVDRP_PORT=2001
+
 # Enable / Disable vdr daemon
 ENABLED=0
 

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- vdr.init	14 Jan 2005 11:25:43 -0000	1.36
+++ vdr.init	15 Jan 2005 18:14:18 -0000	1.37
@@ -9,9 +9,7 @@
 NAME=vdr
 DESC="Linux Video Disk Recorder"
 
-if [ $ENABLE_SHUTDOWN = 1 ]; then
-   VDRSHUTDOWN="-s /usr/lib/vdr/vdr-shutdown.wrapper"
-fi
+test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="-s /usr/lib/vdr/vdr-shutdown.wrapper"
 
 test "$ENABLED" != "0" || exit 0
 
@@ -28,8 +26,8 @@
     	mergecommands "reccmds"
     	start-stop-daemon --start --quiet \
 	 	--exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
-	 	$VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP $OPTIONS \
-		$PLUGINS &
+	 	$VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
+		$OPTIONS $PLUGINS &
     else
 	   echo -n " - seems to be running already"
     fi