r62 - in vdr/vdradmin/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 12:42:10 +0100
Author: tschmidt
Date: 2005-02-23 12:42:09 +0100 (Wed, 23 Feb 2005)
New Revision: 62
Added:
vdr/vdradmin/trunk/debian/
vdr/vdradmin/trunk/debian/NEWS
vdr/vdradmin/trunk/debian/README.Debian
vdr/vdradmin/trunk/debian/changelog
vdr/vdradmin/trunk/debian/compat
vdr/vdradmin/trunk/debian/control
vdr/vdradmin/trunk/debian/copyright
vdr/vdradmin/trunk/debian/patches/
vdr/vdradmin/trunk/debian/patches/00list
vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
vdr/vdradmin/trunk/debian/postinst
vdr/vdradmin/trunk/debian/postrm
vdr/vdradmin/trunk/debian/prerm
vdr/vdradmin/trunk/debian/rules
vdr/vdradmin/trunk/debian/vdradmin.default
vdr/vdradmin/trunk/debian/vdradmin.dirs
vdr/vdradmin/trunk/debian/vdradmin.init
vdr/vdradmin/trunk/debian/vdradmin.install
vdr/vdradmin/trunk/debian/vdradmind.conf
vdr/vdradmin/trunk/debian/vdradmind.pl.1
vdr/vdradmin/trunk/debian/watch
Log:
Load newtrunk into vdr/vdradmin/trunk.
Added: vdr/vdradmin/trunk/debian/NEWS
===================================================================
--- vdr/vdradmin/trunk/debian/NEWS 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/NEWS 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,14 @@
+vdradmin (0.96-4) unstable; urgency=low
+
+ The most important change in this release is that vdradmin from
+ now on will run under the username vdradmin, not as root, the
+ configfiles will be changed at installation, so they are owned by
+ the user and group vdradmin.
+
+ We also changed the path of the files vdradmind.conf and vdradmind.at
+ from /etc/vdradmin/ to /var/lib/vdradmin both files will be moved to
+ the new directory when they allready exist. The symlink
+ /etc/vdradmin/vdradmind.conf will be created so will find the cfgfile
+ still under /etc/vdradmin.
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 23 Jan 2005 22:34:28 +0100
Added: vdr/vdradmin/trunk/debian/README.Debian
===================================================================
--- vdr/vdradmin/trunk/debian/README.Debian 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/README.Debian 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,23 @@
+vdradmin for Debian
+-------------------
+
+This package provides a working config-file under /var/lib/vdradmin/vdradmind.conf,
+this files uses a standard-username and standard-password (linvdr/linvdr), you
+should change this before you enable the vdradmin-service in
+/etc/default/vdradmin, alternatively you can generate a new config with:
+
+vdradmin.pl --config
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>, Fri, 6 Aug 2004 22:57:28 +0200
+
+
+To hide vdradmin behind apache:
+
+ you will need apache with mod_proxy and these lines in httpd.conf:
+
+ <IfModule mod_proxy.c>
+ ProxyRequests Off
+ ProxyPass /vdradmin/ http://127.0.0.1:8001/
+ </IfModule>
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>, Wed, 1 Oct 2003 21:07:47 +0200
Added: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/changelog 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,106 @@
+vdradmin (0.96-4) unstable; urgency=low
+
+ !!! unreleased !!!
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - From now on vdradmin will run under the user vdradmin,
+ the owner of the cfg-file will be changed in postinst
+ - Also change the permission of the cfg-file to 0600 in
+ postinst
+ - Rewrote the handling of the filename for the screenshot-
+ file again (the init-script now creates a temporary directory
+ with mktemp and the screenshot-file(s) are placed inside
+ this directory) (closes: #291731)
+ - Depend on adduser
+ - Now using start-stop-daemon in init-script
+ - Changed path of vdradmind.{conf,at} from /etc/vdradmin/ to
+ /var/lib/vdradmin to comply with the FHS (existing files
+ will be moved in postinst)
+ - Cleanup debian/rules a little bit
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 23 Jan 2005 21:25:39 +0100
+
+vdradmin (0.96-3) unstable; urgency=high
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Urgency high, because it fixes a security issue
+ - Added 02_sectmpfiles.dpatch: use File::Temp to create temporary
+ files, to prevent possible symlink-attacks (Closes: #287601)
+ - Set permissions of /etc/vdradmin/vdradmind.conf to 0600 on new
+ installations (users with an existing installation should
+ ensure that the cfg-file has a permission of 0600)
+ - Changed Maintainer to Debian VDR Team
+ <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+ - Added myself as uploader
+ - Build-depend on dpatch (>= 2.0.9)
+ - Converted 01_dist-var.dpatch to the new short format
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Wed, 29 Dec 2004 12:32:10 +0100
+
+vdradmin (0.96-2) unstable; urgency=low
+
+ * Thomas Schmidt:
+ - Thanks to Marc 'HE' Brockschmidt, who suggest all changes in
+ this release.
+ - Cleaned up debian/rules a lot
+ - Added copyright holder to debian/copyright and refer to
+ /usr/share/common-licenses/GPL-2, instead of GPL
+ - Do not install Base64.pm, Template.pm and RescDescent.pm
+ from upstream anymore, depend on libhtml-template-perl and
+ libparse-rescdescent-perl (Base64.pm is allready provided by
+ perl)
+ - Added a comment about the shipped config-file to README.Debian
+ - Added a manpage for vdradmind.pl
+ - Link /usr/share/vdradmin/template/{English,French}/bilder to
+ /usr/share/vdradmin/template/Deutsch/bilder, this reduces the
+ size of the deb by about 50%
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 14 Aug 2004 16:18:50 +0200
+
+vdradmin (0.96-1) unstable; urgency=low
+
+ * Thomas Schmidt:
+ - New upstream version
+ - Added a correct watch-file
+ - Use dpatch
+ - Cleaned up debian/rules (use dh_install...)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thu, 27 May 2004 01:11:07 +0200
+
+vdradmin (0.95-4) unstable; urgency=low
+
+ * Thomas Schmidt:
+ - Added Andreas Müller as Uploader
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 23 May 2004 00:00:08 +0200
+
+vdradmin (0.95-3) unstable; urgency=low
+
+ * Depend on libcompress-zlib-perl (closes: Bug#245464)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 23 Apr 2004 14:00:31 +0200
+
+vdradmin (0.95-2) unstable; urgency=low
+
+ * First upload to official Debian-archive (closes: Bug#229215)
+
+ -- Andreas Mueller <amu@debian.org> Fri, 5 Mar 2004 23:11:12 +0100
+
+vdradmin (0.95-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sat, 13 Dec 2003 15:59:47 +0100
+
+vdradmin (0.94-2) unstable; urgency=low
+
+ * change $idst to 0, to make vdradmin recognize the winter-time correctly
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thu, 30 Oct 2003 22:24:13 +0100
+
+vdradmin (0.94-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 1 Oct 2003 20:36:52 +0200
+
Added: vdr/vdradmin/trunk/debian/compat
===================================================================
--- vdr/vdradmin/trunk/debian/compat 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/compat 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1 @@
+4
Added: vdr/vdradmin/trunk/debian/control
===================================================================
--- vdr/vdradmin/trunk/debian/control 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/control 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,15 @@
+Source: vdradmin
+Section: web
+Priority: optional
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>, Andreas Mueller <amu@tr.debian.net>
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 2.0.9)
+Standards-Version: 3.6.1
+
+Package: vdradmin
+Architecture: all
+Depends: perl, libcompress-zlib-perl, libhtml-template-perl, libparse-recdescent-perl, adduser
+Suggests: vdr
+Description: Web-based administration tool for vdr
+ vdradmin provides a webinterface for managing
+ the Linux Video Disk Recorder (vdr)
Added: vdr/vdradmin/trunk/debian/copyright
===================================================================
--- vdr/vdradmin/trunk/debian/copyright 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/copyright 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,25 @@
+This package was debianized by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> on
+Wed, 1 Oct 2003 20:36:52 +0200.
+
+It was downloaded from http://linvdr.org/download/vdradmin/
+
+Upstream Author: Thomas Koch <tom@linvdr.org>
+
+Copyright: 2001-2004, Thomas Koch <tom@linvdr.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ see /usr/share/common-licenses/GPL-2
+
Added: vdr/vdradmin/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin/trunk/debian/patches/00list 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/patches/00list 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,3 @@
+01_dist-var
+02_sectmpfiles
+03_cfgfiles-fhs
Added: vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_dist-var.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change vdradmin.pl to search for it's files in system-directories,
+## DP: instead of local, relative paths
+
+@DPATCH@
+diff -urNad /home/chelli/vdr/cvs/vdr/vdradmin/vdradmind.pl vdradmin/vdradmind.pl
+--- /home/chelli/vdr/cvs/vdr/vdradmin/vdradmind.pl 2004-05-27 16:34:55.000000000 +0200
++++ vdradmin/vdradmind.pl 2004-05-27 16:35:55.000000000 +0200
+@@ -42,7 +42,7 @@
+ use strict;
+ #use warnings;
+
+-my $SEARCH_FILES_IN_SYSTEM = 0; # for distribution
++my $SEARCH_FILES_IN_SYSTEM = 1; # for distribution
+
+ sub true () { 1 };
+ sub false () { 0 };
Added: vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_sectmpfiles.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use File::Temp to create temporary files in a secure way
+
+@DPATCH@
+diff -urNad vdradmin-0.96/vdradmind.pl /tmp/dpep.WXXL4r/vdradmin-0.96/vdradmind.pl
+--- vdradmin-0.96/vdradmind.pl 2005-01-24 00:28:03.000000000 +0100
++++ /tmp/dpep.WXXL4r/vdradmin-0.96/vdradmind.pl 2005-01-24 00:28:19.000000000 +0100
+@@ -32,12 +32,15 @@
+ unshift(@INC, $BASENAME . "lib/");
+ }
+
++require File::Temp;
++
+ use CGI qw(:no_debug);
+ use IO::Socket;
+ use HTML::Template::Expr();
+ use Time::Local qw(timelocal);
+ use POSIX ":sys_wait_h", qw(strftime mktime);
+ use MIME::Base64();
++use File::Temp();
+
+ use strict;
+ #use warnings;
+@@ -659,7 +662,7 @@
+
+ sub GZip {
+ my $content = shift;
+- my $filename = "/tmp/vdradmin." . time();
++ my $filename = new File::Temp("vdradmin-XXXXX", UNLINK => 1);
+ open(PIPE, "| gzip -9 - > $filename") || die "cant open pipe to gzip ($!)";
+ print PIPE $$content;
+ close(PIPE);
+@@ -3038,7 +3041,16 @@
+ #############################################################################
+ sub grab_picture {
+ my $size = $q->param("size");
+- my $file = "/tmp/vdr.jpg";
++
++ my $file;
++
++ if (! $ENV{TEMPDIR} == "") {
++ my $time = my_strftime("%s");
++ $file = "$ENV{TEMPDIR}/$time.jpg";
++ } else {
++ $file = new File::Temp(UNLINK => 1, SUFFIX => '.jpg');
++ }
++
+ my $maxwidth = 768;
+ my $maxheight = 576;
+ my($width, $height);
Added: vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,24 @@
+#! /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";
Added: vdr/vdradmin/trunk/debian/postinst
===================================================================
--- vdr/vdradmin/trunk/debian/postinst 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/postinst 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,56 @@
+#!/bin/sh -e
+set -e
+
+TEMPLATE_DIR=/usr/share/vdradmin/template
+
+test -d $TEMPLATE_DIR/English/bilder && rm -rf $TEMPLATE_DIR/English/bilder
+test -d $TEMPLATE_DIR/French/bilder && rm -rf $TEMPLATE_DIR/French/bilder
+
+test -L $TEMPLATE_DIR/English/bilder || ln -s ../Deutsch/bilder $TEMPLATE_DIR/English/bilder
+test -L $TEMPLATE_DIR/French/bilder || ln -s ../Deutsch/bilder $TEMPLATE_DIR/French/bilder
+
+# Check if there are still cfgfiles in /etc/vdradmin/ and move them
+# to /var/lib/vdradmin
+if [ ! -f /var/lib/vdradmin/vdradmind.conf ]; then
+ if [ -f /etc/vdradmin/vdradmind.conf ]; then
+ mv /etc/vdradmin/vdradmind.conf /var/lib/vdradmin/
+ else
+ cp /usr/share/doc/vdradmin/examples/vdradmind.conf /var/lib/vdradmin/
+ fi
+fi
+
+[ -e /etc/vdradmin/vdradmind.conf ] || ln -s /var/lib/vdradmin/vdradmind.conf \
+/etc/vdradmin/vdradmind.conf
+
+if [ ! -f /var/lib/vdradmin/vdradmind.at ]; then
+ [ ! -f /etc/vdradmin/vdradmind.at ] || mv /etc/vdradmin/vdradmind.at /var/lib/vdradmin/
+fi
+
+# ensure that user and group 'vdradmin' exist
+USER=vdradmin
+GROUP=vdradmin
+if ! getent group | grep -q "^$GROUP:" ; then
+ echo -n "Adding group $GROUP.."
+ addgroup --quiet --system $GROUP
+ echo "..done"
+fi
+if ! getent passwd | grep -q "^$USER:"; then
+ echo -n "Adding user $USER.."
+ adduser --system --home /var/lib/vdradmin --shell /bin/false \
+ --gecos "VDRAdmin user" --no-create-home \
+ --disabled-login --disabled-password \
+ --ingroup $GROUP \
+ $USER
+ echo "...done"
+fi
+
+# ensure that vdradmin's config files have the correct owner
+[ ! -d /var/lib/vdradmin ] || chown -R $USER:$GROUP /var/lib/vdradmin/
+
+# change the permissions of the cfg-file to 0600
+[ ! -e /var/lib/vdradmin/vdradmind.conf ] || chmod 0600 /var/lib/vdradmin/vdradmind.conf
+
+# change the owner and group of the logfile to vdradmin
+[ ! -e /var/log/vdradmind.log ] || chown $USER:$GROUP /var/log/vdradmind.log
+
+##DEBHELPER##
Added: vdr/vdradmin/trunk/debian/postrm
===================================================================
--- vdr/vdradmin/trunk/debian/postrm 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/postrm 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+set -e
+
+case "$1" in
+ purge)
+ rm -f /var/lib/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdradmin/vdradmind.at > /dev/null 2>&1 || true
+ rm -f /etc/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
+
+ chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
+
+ deluser vdradmin > /dev/null || true
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+##DEBHELPER##
Added: vdr/vdradmin/trunk/debian/prerm
===================================================================
--- vdr/vdradmin/trunk/debian/prerm 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/prerm 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+set -e
+
+TEMPLATE_DIR=/usr/share/vdradmin/template
+
+test -L $TEMPLATE_DIR/English/bilder && rm -f $TEMPLATE_DIR/English/bilder
+test -L $TEMPLATE_DIR/French/bilder && rm -f $TEMPLATE_DIR/French/bilder
+
+##DEBHELPER##
Added: vdr/vdradmin/trunk/debian/rules
===================================================================
--- vdr/vdradmin/trunk/debian/rules 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/rules 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+clean: clean-patched unpatch
+
+clean-patched:
+ dh_testdir
+ dh_testroot
+ dh_clean
+
+build: patch-stamp
+ # Nothing to build here
+ #
+ # Note: all files are installed using dh_install
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+ dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs HISTORY
+ dh_installdocs
+ dh_installexamples debian/vdradmind.conf
+ dh_install
+ dh_installinit
+ dh_installman
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_perl
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep install patch unpatch
Property changes on: vdr/vdradmin/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdradmin/trunk/debian/vdradmin.default
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.default 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmin.default 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,20 @@
+# Defaults for vdradmin initscript
+# sourced by /etc/init.d/vdradmin
+# installed at /etc/default/vdradmin by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Should vdradmin's init-script be enabled?
+
+#################################################################
+# ATTENTION! YOU SHOULD MODIFY /var/lib/vdradmin/vdradmind.conf #
+# before enabling this, because the default config uses a #
+# really simple default username/password (linvdr/linvdr) #
+#################################################################
+
+ENABLED="0"
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
Added: vdr/vdradmin/trunk/debian/vdradmin.dirs
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.dirs 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmin.dirs 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,2 @@
+var/lib/vdradmin
+etc/vdradmin
Added: vdr/vdradmin/trunk/debian/vdradmin.init
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.init 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmin.init 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,78 @@
+#! /bin/sh
+#
+#
+# Init-script for vdradmin, created by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+#
+#
+
+# Default Settings:
+
+# Username vdradmin should run on:
+USER=vdradmin
+
+# Group under which vdradmin shoul run on:
+GROUP=vdradmin
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/vdradmind.pl
+NAME=vdradmin
+DESC="VDR Webadministration interface"
+
+test -x $DAEMON || exit 0
+
+# Include vdradmin defaults if available
+if [ -f /etc/default/vdradmin ] ; then
+ . /etc/default/vdradmin
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+set -e
+
+# Create Temporary Directory
+create_temp ()
+{
+ TEMPDIR=`mktemp -d -p /tmp vdradmin-XXXXXX`
+
+ # Check if the group vdr exists and make vdr
+ # the owner of the temporary directory
+ if getent group | grep -q "^vdr:" ; then
+ chown vdr $TEMPDIR
+ fi
+
+ chgrp vdradmin $TEMPDIR
+ chmod 2770 $TEMPDIR
+}
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: "
+ create_temp
+ TEMPDIR=$TEMPDIR start-stop-daemon --start \
+ -c $USER:$GROUP -b -m --pidfile /var/run/vdradmin.pid \
+ --exec /usr/bin/vdradmind.pl -- -nf
+ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop -q -o --pidfile /var/run/vdradmin.pid
+ echo "$NAME."
+ ;;
+ restart|force-reload)
+ echo -n "Restarting $DESC: "
+ create_temp
+ start-stop-daemon --stop -q -o --pidfile /var/run/vdradmin.pid
+ TEMPDIR=$TEMPDIR start-stop-daemon --start \
+ -c $USER:$GROUP -b -m --pidfile /var/run/vdradmin.pid \
+ --exec /usr/bin/vdradmind.pl -- -nf
+ echo "$NAME."
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: vdr/vdradmin/trunk/debian/vdradmin.install
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.install 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmin.install 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,16 @@
+lib/HTML/Template/ usr/share/vdradmin/lib/HTML/
+lib/Text/ usr/share/vdradmin/lib/
+
+template/Deutsch/ usr/share/vdradmin/template/
+
+template/English/*.html usr/share/vdradmin/template/English/
+template/English/*.css usr/share/vdradmin/template/English/
+template/English/*.pl usr/share/vdradmin/template/English/
+
+template/French/*.html usr/share/vdradmin/template/French/
+template/French/*.css usr/share/vdradmin/template/French/
+template/French/*.pl usr/share/vdradmin/template/French/
+
+vdradmind.pl usr/bin/
+
+debian/vdradmind.pl.1 usr/share/man/man1/
Added: vdr/vdradmin/trunk/debian/vdradmind.conf
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmind.conf 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmind.conf 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,24 @@
+VDR_HOST = localhost
+
+LOGLEVEL = 17
+TM_PRIORITY = 99
+AT_PRIORITY = 99
+TM_LIFETIME = 99
+AT_TIMEOUT = 10
+AT_FUNC = 0
+GUEST_ACCOUNT = 0
+CACHE_TIMEOUT = 5
+SERVERPORT = 8001
+PASSWORD = linvdr
+AT_LIFETIME = 99
+MOD_GZIP = 1
+TM_MARGIN_END = 10
+USERNAME = linvdr
+LOGFILE = vdradmind.log
+RECORDINGS = 1
+LANGUAGE = English
+CACHE_LASTUPDATE = 0
+TM_MARGIN_BEGIN = 10
+LOGINPAGE = 0
+VDR_PORT = 2001
+
Added: vdr/vdradmin/trunk/debian/vdradmind.pl.1
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmind.pl.1 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/vdradmind.pl.1 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,44 @@
+.\" Man page for vdradmind.pl
+
+.TH vdradmind.pl 1
+
+.SH NAME
+vdradmind.pl
+
+.SH SYNOPSIS
+
+.B vdradmind.pl [ \-\-nofork ] [ \-\-config ] [ \-\-kill ]
+
+.SH DESCRIPTION
+.B vdradmind.pl
+provides a webinterface for managing the Linux Video Disk Recorder (VDR), it has a virtual remote to control your VDR, you can view live-tv as a small slideshow, you can search for certain shows in the EPG....
+.PP
+By default
+.B vdradmind.pl
+will listen on port 8001.
+.PP
+.B Note: Your VDR must be configured to be accesable vie SVDRP from the machine, you run vdradmind.pl from.
+
+.SH OPTIONS
+
+.IP "\-\-nofork / -nf"
+Do not fork on start of vdradmin. (vdradmin does not go into daemon-mode)
+
+.IP "\-\-config / -c"
+Ask some questions, to interactively generate the config-file /etc/vdradmin/vdradmind.conf
+
+.IP "\-\-kill / -k"
+Kill a forked vdradmin.
+
+.IP "\-\-help"
+Display a short message about the options of the tool.
+
+.SH AUTHOR
+This man-page has been written by Thomas Schmidt <thomas@thsnet.de>
+.PP
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common\-licenses/GPL.
Added: vdr/vdradmin/trunk/debian/watch
===================================================================
--- vdr/vdradmin/trunk/debian/watch 2005-02-23 11:41:52 UTC (rev 61)
+++ vdr/vdradmin/trunk/debian/watch 2005-02-23 11:42:09 UTC (rev 62)
@@ -0,0 +1,2 @@
+version=2
+http://linvdr.org/download/vdradmin/ vdradmin.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate