Added new package: vdradmin.

diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
new file mode 100644 (file)
index 0000000..19ba6d8
--- /dev/null
+++ b/config/rootfiles/packages/vdradmin
@@ -0,0 +1,243 @@
+opt/vdradmin
+#opt/vdradmin/COPYING
+#opt/vdradmin/CREDITS
+#opt/vdradmin/ChangeLog
+#opt/vdradmin/FAQ
+#opt/vdradmin/HISTORY
+#opt/vdradmin/INSTALL
+#opt/vdradmin/LGPL.txt
+#opt/vdradmin/README
+#opt/vdradmin/README.translators
+#opt/vdradmin/REQUIREMENTS
+opt/vdradmin/autotimer2searchtimer.pl
+opt/vdradmin/contrib
+opt/vdradmin/contrib/HISTORY
+opt/vdradmin/contrib/HISTORY.bigpatch
+opt/vdradmin/contrib/HISTORY.ct
+opt/vdradmin/contrib/HISTORY.macfly
+opt/vdradmin/contrib/README.Streaming
+opt/vdradmin/contrib/user.css.example
+opt/vdradmin/contrib/vdradmind.bl_example
+opt/vdradmin/convert.pl
+#opt/vdradmin/install.sh
+opt/vdradmin/lib
+opt/vdradmin/lib/File
+opt/vdradmin/lib/File/Temp.pm
+opt/vdradmin/lib/MIME
+opt/vdradmin/lib/MIME/Base64.pm
+opt/vdradmin/lib/Template
+opt/vdradmin/lib/Template.pm
+opt/vdradmin/lib/Template/Base.pm
+opt/vdradmin/lib/Template/Config.pm
+opt/vdradmin/lib/Template/Constants.pm
+opt/vdradmin/lib/Template/Context.pm
+opt/vdradmin/lib/Template/Directive.pm
+opt/vdradmin/lib/Template/Document.pm
+opt/vdradmin/lib/Template/Exception.pm
+opt/vdradmin/lib/Template/Filters.pm
+opt/vdradmin/lib/Template/Grammar.pm
+opt/vdradmin/lib/Template/Iterator.pm
+opt/vdradmin/lib/Template/Namespace
+opt/vdradmin/lib/Template/Namespace/Constants.pm
+opt/vdradmin/lib/Template/Parser.pm
+opt/vdradmin/lib/Template/Plugin
+opt/vdradmin/lib/Template/Plugin.pm
+opt/vdradmin/lib/Template/Plugin/Date.pm
+opt/vdradmin/lib/Template/Plugin/HTML.pm
+opt/vdradmin/lib/Template/Plugin/JavaScript.pm
+opt/vdradmin/lib/Template/Plugins.pm
+opt/vdradmin/lib/Template/Provider.pm
+opt/vdradmin/lib/Template/Service.pm
+opt/vdradmin/lib/Template/Stash
+opt/vdradmin/lib/Template/Stash.pm
+opt/vdradmin/lib/Template/Stash/Context.pm
+opt/vdradmin/lib/Template/Stash/XS.pm
+opt/vdradmin/lib/Template/Test.pm
+opt/vdradmin/lib/Template/View.pm
+opt/vdradmin/lib/URI
+opt/vdradmin/lib/URI/Escape.pm
+opt/vdradmin/locale
+opt/vdradmin/locale/cs
+opt/vdradmin/locale/cs/LC_MESSAGES
+opt/vdradmin/locale/cs/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/cs_CZ.utf8
+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES
+opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/de
+opt/vdradmin/locale/de/LC_MESSAGES
+opt/vdradmin/locale/de/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/de_DE.utf8
+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES
+opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/en_US.utf8
+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES
+opt/vdradmin/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/es
+opt/vdradmin/locale/es/LC_MESSAGES
+opt/vdradmin/locale/es/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/es_ES.utf8
+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES
+opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fi
+opt/vdradmin/locale/fi/LC_MESSAGES
+opt/vdradmin/locale/fi/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fi_FI.utf8
+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES
+opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fr
+opt/vdradmin/locale/fr/LC_MESSAGES
+opt/vdradmin/locale/fr/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/fr_FR.utf8
+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES
+opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/it
+opt/vdradmin/locale/it/LC_MESSAGES
+opt/vdradmin/locale/it/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/it_IT.utf8
+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES
+opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/nl
+opt/vdradmin/locale/nl/LC_MESSAGES
+opt/vdradmin/locale/nl/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/nl_NL.utf8
+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES
+opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/ru
+opt/vdradmin/locale/ru/LC_MESSAGES
+opt/vdradmin/locale/ru/LC_MESSAGES/vdradmin.mo
+opt/vdradmin/locale/ru_RU.utf8
+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES
+opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
+#opt/vdradmin/make.sh
+opt/vdradmin/po
+opt/vdradmin/po/cs.po
+opt/vdradmin/po/cs_CZ.utf8.po
+opt/vdradmin/po/de.po
+opt/vdradmin/po/de_DE.utf8.po
+opt/vdradmin/po/en_US.utf8.po
+opt/vdradmin/po/es.po
+opt/vdradmin/po/es_ES.utf8.po
+opt/vdradmin/po/fi.po
+opt/vdradmin/po/fi_FI.utf8.po
+opt/vdradmin/po/fr.po
+opt/vdradmin/po/fr_FR.utf8.po
+opt/vdradmin/po/it.po
+opt/vdradmin/po/it_IT.utf8.po
+opt/vdradmin/po/nl.po
+opt/vdradmin/po/nl_NL.utf8.po
+opt/vdradmin/po/ru.po
+opt/vdradmin/po/ru_RU.utf8.po
+opt/vdradmin/po/vdradmin.pot
+opt/vdradmin/template
+opt/vdradmin/template/default
+opt/vdradmin/template/default/about.html
+opt/vdradmin/template/default/at_timer_list.html
+opt/vdradmin/template/default/at_timer_new.html
+opt/vdradmin/template/default/config.html
+opt/vdradmin/template/default/default
+opt/vdradmin/template/default/default/aktion.png
+opt/vdradmin/template/default/default/close.png
+opt/vdradmin/template/default/default/configure.png
+opt/vdradmin/template/default/default/cut.png
+opt/vdradmin/template/default/default/delete.png
+opt/vdradmin/template/default/default/edit.png
+opt/vdradmin/template/default/default/fern_03.jpg
+opt/vdradmin/template/default/default/fern_05.jpg
+opt/vdradmin/template/default/default/fern_06.jpg
+opt/vdradmin/template/default/default/fern_07.jpg
+opt/vdradmin/template/default/default/fern_08.jpg
+opt/vdradmin/template/default/default/fern_09.jpg
+opt/vdradmin/template/default/default/fern_10.jpg
+opt/vdradmin/template/default/default/fern_11.jpg
+opt/vdradmin/template/default/default/fern_12.jpg
+opt/vdradmin/template/default/default/fern_13.jpg
+opt/vdradmin/template/default/default/fern_15.jpg
+opt/vdradmin/template/default/default/fern_18.jpg
+opt/vdradmin/template/default/default/fern_19.jpg
+opt/vdradmin/template/default/default/fern_22.jpg
+opt/vdradmin/template/default/default/fern_23.jpg
+opt/vdradmin/template/default/default/fern_24.jpg
+opt/vdradmin/template/default/default/fern_25.jpg
+opt/vdradmin/template/default/default/fern_28.jpg
+opt/vdradmin/template/default/default/fern_31.jpg
+opt/vdradmin/template/default/default/fern_32.jpg
+opt/vdradmin/template/default/default/fern_33.jpg
+opt/vdradmin/template/default/default/fern_36.jpg
+opt/vdradmin/template/default/default/fern_39.jpg
+opt/vdradmin/template/default/default/fern_40.jpg
+opt/vdradmin/template/default/default/fern_41.jpg
+opt/vdradmin/template/default/default/fern_42.jpg
+opt/vdradmin/template/default/default/fern_43.jpg
+opt/vdradmin/template/default/default/fern_44.jpg
+opt/vdradmin/template/default/default/fern_45.jpg
+opt/vdradmin/template/default/default/fern_46.jpg
+opt/vdradmin/template/default/default/fern_47.jpg
+opt/vdradmin/template/default/default/fern_48.jpg
+opt/vdradmin/template/default/default/fern_back.jpg
+opt/vdradmin/template/default/default/fern_mute.jpg
+opt/vdradmin/template/default/default/find.png
+opt/vdradmin/template/default/default/folder_video.png
+opt/vdradmin/template/default/default/help.png
+opt/vdradmin/template/default/default/imdb.png
+opt/vdradmin/template/default/default/info_button.png
+opt/vdradmin/template/default/default/info_button_disabled.png
+opt/vdradmin/template/default/default/logo.png
+opt/vdradmin/template/default/default/noise.gif
+opt/vdradmin/template/default/default/pfeile_nachlinks.png
+opt/vdradmin/template/default/default/pfeile_nachlinks_soft.png
+opt/vdradmin/template/default/default/pfeile_nachrechts.png
+opt/vdradmin/template/default/default/pfeile_nachrechts_soft.png
+opt/vdradmin/template/default/default/play.png
+opt/vdradmin/template/default/default/poempl_gelb.png
+opt/vdradmin/template/default/default/poempl_grau.png
+opt/vdradmin/template/default/default/poempl_gruen.png
+opt/vdradmin/template/default/default/poempl_rot.png
+opt/vdradmin/template/default/default/rec.gif
+opt/vdradmin/template/default/default/rec_button.png
+opt/vdradmin/template/default/default/sortiert_asc.gif
+opt/vdradmin/template/default/default/sortiert_desc.gif
+opt/vdradmin/template/default/default/spacer.gif
+opt/vdradmin/template/default/default/stream.png
+opt/vdradmin/template/default/default/sum_find.png
+opt/vdradmin/template/default/default/tv_bottom.gif
+opt/vdradmin/template/default/default/udef_search.png
+opt/vdradmin/template/default/default/view.png
+opt/vdradmin/template/default/epgsearch_config.html
+opt/vdradmin/template/default/epgsearch_list.html
+opt/vdradmin/template/default/epgsearch_new.html
+opt/vdradmin/template/default/error.html
+opt/vdradmin/template/default/favicon.ico
+opt/vdradmin/template/default/help_at_timer_list.html
+opt/vdradmin/template/default/help_at_timer_new.html
+opt/vdradmin/template/default/help_config.html
+opt/vdradmin/template/default/help_edit_epg.html
+opt/vdradmin/template/default/help_no.html
+opt/vdradmin/template/default/help_rec_list.html
+opt/vdradmin/template/default/help_timer_list.html
+opt/vdradmin/template/default/help_timer_new.html
+opt/vdradmin/template/default/index.html
+opt/vdradmin/template/default/infobox.js
+opt/vdradmin/template/default/library.js
+opt/vdradmin/template/default/navigation.html
+opt/vdradmin/template/default/noauth.html
+opt/vdradmin/template/default/noperm.html
+opt/vdradmin/template/default/prog_detail.html
+opt/vdradmin/template/default/prog_detail_form.html
+opt/vdradmin/template/default/prog_list.html
+opt/vdradmin/template/default/prog_list2.html
+opt/vdradmin/template/default/prog_summary.html
+opt/vdradmin/template/default/prog_summary2.html
+opt/vdradmin/template/default/prog_timeline.html
+opt/vdradmin/template/default/rc.html
+opt/vdradmin/template/default/rec_edit.html
+opt/vdradmin/template/default/rec_list.html
+opt/vdradmin/template/default/style.css
+opt/vdradmin/template/default/timeline.js
+opt/vdradmin/template/default/timer_list.html
+opt/vdradmin/template/default/timer_new.html
+opt/vdradmin/template/default/tv.html
+opt/vdradmin/template/default/vdr_cmds.html
+#opt/vdradmin/uninstall.sh
+opt/vdradmin/vdradmind
+opt/vdradmin/vdradmind.pl
+#opt/vdradmin/vdradmind.pl.1

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 47e9d4603e5fce9b086e067d53fe7b1c37bf23c6..7e658a422ed8c8b3fb7e121c0d645195a114a79e 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -303,6 +303,7 @@
 * util-linux-2.12r
 * v4l-dvb-e9a442d3b53a-kmod-2.6.25.19
 * vdr-1.6.0
+* vdradmin-am-3.6.4
 * vim-7.0
 * vlan.1.9
 * vlc-0.8.6i

diff --git a/lfs/vdradmin b/lfs/vdradmin
new file mode 100644 (file)
index 0000000..4636cd8
--- /dev/null
+++ b/lfs/vdradmin
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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 3 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, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.6.4
+
+THISAPP    = vdradmin-am-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdradmin
+PAK_VER    = 1
+
+DEPS       = perl-gettext vdr
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ae3efed3f803d8524098f15a365c7838
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_SRC) && mv -vf vdradmin-am-$(VER) vdradmin && mv -vf vdradmin /opt
+       #@rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index b008bdb98d5d0f00dee33fbb085083f2ddbdaa42..95eec7e9756c89bf10585a561ab5dd446ebb94b8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -591,6 +591,7 @@ buildipfire() {
   ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
+  ipfiremake vdradmin
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
new file mode 100644 (file)
index 0000000..e0ef061
--- /dev/null
+++ b/src/initscripts/init.d/vdradmin
@@ -0,0 +1,50 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/vdradmind
+#
+# Description : This is a script that starts vdradmind as deamon
+#
+# Authors     : Arne Fitzenreiter (arne@ipfire.org)
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting VDR Webadministration Tool..."
+               if [ "$(ps -A | grep vdradmind)" != "" ]; then
+                  boot_mesg "Error! Already running!"
+                  echo_failure
+                  exit 1;
+               fi
+               loadproc /opt/vdradmin/vdradmind.pl
+               ;;
+               
+       stop)
+               boot_mesg "Stopping VDR Webadministration Tool..."
+               killproc /opt/vdradmin/vdradmind.pl
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /usr/bin/vdradmind
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/vdr