vdr/vdradmin/debian/patches 03_cfgfiles-fhs.dpatch 00list 02_sectmpfiles.dpatch

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/patches
In directory haydn:/tmp/cvs-serv12897/vdr/vdradmin/debian/patches

Modified Files:
	00list 02_sectmpfiles.dpatch 
Added Files:
	03_cfgfiles-fhs.dpatch 
Log Message:
* cfgfiles under /var/lib/vdradmin to comply with FHS
* updated 02_sectmpfiles, to be able even when vdr runs as root and has our security-patch installed (still not the optimal solution, but it should work)

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/patches/00list,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 00list	29 Dec 2004 23:23:57 -0000	1.4
+++ 00list	23 Jan 2005 21:44:18 -0000	1.5
@@ -1,2 +1,3 @@
 01_dist-var
 02_sectmpfiles
+03_cfgfiles-fhs

Index: 02_sectmpfiles.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/patches/02_sectmpfiles.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 02_sectmpfiles.dpatch	16 Jan 2005 00:13:52 -0000	1.2
+++ 02_sectmpfiles.dpatch	23 Jan 2005 21:44:18 -0000	1.3
@@ -5,9 +5,9 @@
 ## DP: Use File::Temp to create temporary files in a secure way
 
 @DPATCH@
-diff -urNad vdradmin-0.96/vdradmind.pl /tmp/dpep.klYLif/vdradmin-0.96/vdradmind.pl
---- vdradmin-0.96/vdradmind.pl	2005-01-16 00:21:09.000000000 +0100
-+++ /tmp/dpep.klYLif/vdradmin-0.96/vdradmind.pl	2005-01-16 00:21:58.000000000 +0100
+diff -urNad vdradmin-0.96/vdradmind.pl /tmp/dpep.7yXDwT/vdradmin-0.96/vdradmind.pl
+--- vdradmin-0.96/vdradmind.pl	2005-01-23 21:00:09.000000000 +0100
++++ /tmp/dpep.7yXDwT/vdradmin-0.96/vdradmind.pl	2005-01-23 21:14:02.000000000 +0100
 @@ -32,12 +32,15 @@
  	unshift(@INC, $BASENAME . "lib/");
  }
@@ -33,12 +33,21 @@
    open(PIPE, "| gzip -9 - > $filename") || die "cant open pipe to gzip ($!)";
    print PIPE $$content;
    close(PIPE);
-@@ -3038,7 +3041,7 @@
+@@ -3038,7 +3041,16 @@
  #############################################################################
  sub grab_picture {
  	my $size = $q->param("size");
 -	my $file = "/tmp/vdr.jpg";
-+	my $file = "/var/cache/vdr/vdr.jpg";
++  
++	my $file;
++
++	if ($ENV{TEMPDIR} != "") {
++	   my $time = my_strftime("%s");
++	   my $file = "$ENV{TEMPDIR}/$time.jpg";
++	} else {
++	   my $file = "/tmp/vdr.jpg";
++	}
++	
  	my $maxwidth = 768;
  	my $maxheight = 576;
  	my($width, $height);

--- NEW FILE: 03_cfgfiles-fhs.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_cfgfiles-fhs.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the path to the cfgfile and autotime-file to comply
## DP: with the FHS (vdradmin changes these files at runtime)

@DPATCH@
diff -urNad vdradmin-0.96/vdradmind.pl /tmp/dpep.0DtdZt/vdradmin-0.96/vdradmind.pl
--- vdradmin-0.96/vdradmind.pl	2005-01-23 21:41:19.000000000 +0100
+++ /tmp/dpep.0DtdZt/vdradmin-0.96/vdradmind.pl	2005-01-23 21:42:53.000000000 +0100
@@ -94,10 +94,10 @@
 	$AT_FILENAME           = "${BASENAME}vdradmind.at";
 } else {
 	$TEMPLATEDIR           = "/usr/share/vdradmin/template";
-	$CONFFILE              = "/etc/vdradmin/vdradmind.conf";
+	$CONFFILE              = "/var/lib/vdradmin/vdradmind.conf";
 	$LOGFILE               = "/var/log/$CONFIG{LOGFILE}";
 	$PIDFILE               = "/var/run/vdradmind.pid";
-	$AT_FILENAME           = "/etc/vdradmin/vdradmind.at";
+	$AT_FILENAME           = "/var/lib/vdradmin/vdradmind.at";
 }
 
 my $I18NFILE							= "i18n.pl";