This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 4dbe43173110f92aea314fb49689ebf0850a5292 (commit) via d4733815c0745989ba5e53ab0054ff9f3185a6cf (commit) from ad5b43907892ab30fe600e1b630b0b4f5fc0f323 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 4dbe43173110f92aea314fb49689ebf0850a5292 Merge: d4733815c0745989ba5e53ab0054ff9f3185a6cf ad5b43907892ab30fe600e1b630b0b4f5fc0f323 Author: Stefan Schantl Stevee@ipfire.org Date: Wed Jan 20 23:25:40 2010 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

commit d4733815c0745989ba5e53ab0054ff9f3185a6cf Author: Stefan Schantl Stevee@ipfire.org Date: Wed Jan 20 23:24:32 2010 +0100

Vdradmin: Update to 3.6.5

-----------------------------------------------------------------------

Summary of changes: config/vdradmin/install-ipfire.sh | 11 +++++++++++ lfs/vdradmin | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh index af77b49..8eceaac 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 632ced9..bbec919 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)

hooks/post-receive -- IPFire 2.x development tree