From: Stefan Schantl <Stevee@ipfire.org>
Date: Wed, 20 Jan 2010 22:24:32 +0000 (+0100)
Subject: Vdradmin: Update to 3.6.5
X-Git-Tag: v2.9-beta1~512
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d4733815c0745989ba5e53ab0054ff9f3185a6cf

Vdradmin: Update to 3.6.5
---

diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh
index af77b49d1e..8eceaac186 100755
--- a/config/vdradmin/install-ipfire.sh
+++ b/config/vdradmin/install-ipfire.sh
@@ -14,6 +14,7 @@ BINDIR=${BINDIR:-$DESTDIR/usr/bin}
 LOCDIR=${LOCDIR:-$DESTDIR/usr/share/locale}
 MANDIR=${MANDIR:-$DESTDIR/usr/share/man/man1}
 LOGDIR=${LOGDIR:-$DESTDIR/var/log}
+CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
 PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid}
 VIDEODIR=${VIDEODIR:-/var/video}
 EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages}
@@ -78,7 +79,9 @@ function perlModules()
 	checkPerlModule locale
 	checkPerlModule Env
 	checkPerlModule Template
+	checkPerlModule Template::Plugin::JavaScript
 	checkPerlModule CGI
+	checkPerlModule HTTP::Date
 	checkPerlModule IO::Socket
 	checkPerlModule Time::Local
 	checkPerlModule MIME::Base64
@@ -101,8 +104,12 @@ function perlModules()
 	checkPerlModule Encode
 	echo "* Required for IPv6 support"
 	#checkPerlModule IO::Socket::INET6
+	echo "* Required for SSL support (https)"
+	#checkPerlModule IO::Socket::SSL
 	echo "* Required if you want to use gzip'ed HTTP responses"
 	checkPerlModule Compress::Zlib
+	echo "* Required if you want to log to syslog"
+	checkPerlModule Sys::Syslog
 }
 
 function makeDir()
@@ -165,6 +172,7 @@ function doInstall()
   	    -e "s:/usr/share/vdradmin/lib:${LIBDIR}/lib:" \
   	    -e "s:/usr/share/vdradmin/template:${LIBDIR}/template:" \
   	    -e "s:/var/log:${LOGDIR}:" \
+  	    -e "s:/var/cache/vdradmin:${CACHEDIR}:" \
   	    -e "s:/var/run/vdradmind.pid:${PIDFILE}:" \
   	    -e "s:\(\$ETCDIR *= \)\"/etc/vdradmin\";:\1\"${ETCDIR}\";:" \
   	    -e "s:/usr/share/locale:${LOCDIR}:" \
@@ -228,6 +236,9 @@ function doUninstall()
 	if [ -d $LIBDIR ]; then
 		rm -rf $LIBDIR
 	fi
+	if [ -d $CACHEDIR ]; then
+		rm -rf $CACHEDIR
+	fi
 	if [ -e $MANDIR/vdradmind.pl.1 ]; then
 		rm -f $MANDIR/vdradmind.pl.1
 	fi
diff --git a/lfs/vdradmin b/lfs/vdradmin
index 632ced94c3..bbec919402 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 3.6.4
+VER        = 3.6.5
 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ae3efed3f803d8524098f15a365c7838
+$(DL_FILE)_MD5 = 34ac04af6d1b0495f10cd06e85abb990
 
 install : $(TARGET)