From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] vdr: add menu entry for vdr website
Date: Sat, 10 Feb 2024 12:53:22 +0100
Message-ID: <20240210115322.521732-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1951257598215707426=="
List-Id: <development.lists.ipfire.org>

--===============1951257598215707426==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 config/menu/EX-vdr.menu                    |  5 +++++
 config/rootfiles/common/configroot         |  1 +
 config/rootfiles/common/web-user-interface |  1 +
 config/rootfiles/packages/vdr              |  2 ++
 html/cgi-bin/vdr.cgi                       | 25 ++++++++++++++++++++++
 lfs/vdr                                    |  2 +-
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 config/menu/EX-vdr.menu
 create mode 100644 html/cgi-bin/vdr.cgi

diff --git a/config/menu/EX-vdr.menu b/config/menu/EX-vdr.menu
new file mode 100644
index 000000000..31640678d
--- /dev/null
+++ b/config/menu/EX-vdr.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'60.vdr'} =3D {'caption' =3D> VDR,
+				  'uri' =3D> '/cgi-bin/vdr.cgi',
+				  'title' =3D> VDR,
+				  'enabled' =3D> 1,
+				  };
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/con=
figroot
index b920dd248..7235ce10f 100644
--- 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/co=
mmon/web-user-interface
index 2fbbcbcf2..f00a3cb37 100644
--- 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 b08f1f04d..8a6895df4 100644
--- 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
index 000000000..aaf722ee3
--- /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(a)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 eb761123d..41dd4e92d 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -39,7 +39,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D vdr
-PAK_VER    =3D 16
+PAK_VER    =3D 17
=20
 DEPS       =3D vdr_streamdev
=20
--=20
2.39.2


--===============1951257598215707426==--