vdr: add menu entry for vdr website

we had discussed this on december telco but it is not so
easy because our menusystem only shows entry's existing cgi's.
so i add a cgi redirect to http://$ENV{SERVER_ADDR}:3000
this add the entry under pakfire and also to service page.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/menu/EX-vdr.menu b/config/menu/EX-vdr.menu
new file mode 100644 (file)
index 0000000..3164067
--- /dev/null
+++ b/config/menu/EX-vdr.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'60.vdr'} = {'caption' => VDR,
+                                 'uri' => '/cgi-bin/vdr.cgi',
+                                 'title' => VDR,
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index b920dd248c1879c7ee311ff07534378e05135bd1..7235ce10fa32cfa6d9a3143a8a8dc8a1f1816364 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -122,6 +122,7 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tor.menu
+#var/ipfire/menu.d/EX-vdr.menu
 #var/ipfire/menu.d/EX-wio.menu
 #var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/modem

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 2fbbcbcf2e3434edb0919539c2794518a60fea6b..f00a3cb37c61a9d5827e20f0a95aca2eaa58f824 100644 (file)
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -80,6 +80,7 @@ srv/web/ipfire/cgi-bin/time.cgi
 srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
+#srv/web/ipfire/cgi-bin/vdr.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/cgi-bin/vulnerabilities.cgi
 srv/web/ipfire/cgi-bin/wakeonlan.cgi

diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index b08f1f04d0fb50533e5dd91cd7d2bc7b4c77adb8..8a6895df4fa1bc6cb707f8e608165367b5b464f4 100644 (file)
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -87,3 +87,5 @@ usr/share/vdr
 var/cache/vdr
 var/ipfire/backup/addons/includes/vdr
 #var/video
+srv/web/ipfire/cgi-bin/vdr.cgi
+var/ipfire/menu.d/EX-vdr.menu

diff --git a/html/cgi-bin/vdr.cgi b/html/cgi-bin/vdr.cgi
new file mode 100644 (file)
index 0000000..aaf722e
--- /dev/null
+++ b/html/cgi-bin/vdr.cgi
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.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 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/>.       #
+#                                                                             #
+###############################################################################
+
+print "Status: 302 Moved Temporarily\n";
+print "Location: http://$ENV{SERVER_ADDR}:3000\n\n";
+
+exit (0);

diff --git a/lfs/vdr b/lfs/vdr
index eb761123d115dadf5c29d80da8ccab3358904e7f..41dd4e92dd3bc3b1242ff7422dc23dc847de6e39 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -39,7 +39,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       = vdr_streamdev