From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 761e73230f5e6540e3bdc9d49dfcde158356cfc2
Date: Sun, 11 Feb 2024 12:14:53 +0000 [thread overview]
Message-ID: <4TXmk55G4Nz2xWl@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6603 bytes --]
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, next has been updated
via 761e73230f5e6540e3bdc9d49dfcde158356cfc2 (commit)
from 1b57f838f19e2a8c1e1a3bd903b2a70c730ab08f (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 761e73230f5e6540e3bdc9d49dfcde158356cfc2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 11 11:27:48 2024 +0100
mympd: update to 14.0.1
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/menu/EX-mympd.menu | 5 +++++
config/rootfiles/common/configroot | 1 +
config/rootfiles/common/web-user-interface | 1 +
config/rootfiles/packages/mympd | 4 ++++
html/cgi-bin/{vdr.cgi => mympd.cgi} | 2 +-
lfs/mympd | 6 +++---
6 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 config/menu/EX-mympd.menu
copy html/cgi-bin/{vdr.cgi => mympd.cgi} (96%)
Difference in files:
diff --git a/config/menu/EX-mympd.menu b/config/menu/EX-mympd.menu
new file mode 100644
index 000000000..b3108d393
--- /dev/null
+++ b/config/menu/EX-mympd.menu
@@ -0,0 +1,5 @@
+ $subipfire->{'41.mympd'} = {'caption' => myMPD,
+ 'uri' => '/cgi-bin/mympd.cgi',
+ 'title' => myMPD,
+ 'enabled' => 1,
+ };
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 7235ce10f..64c88f933 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -120,6 +120,7 @@ var/ipfire/menu.d/70-log.menu
#var/ipfire/menu.d/EX-apcupsd.menu
#var/ipfire/menu.d/EX-guardian.menu
#var/ipfire/menu.d/EX-mpfire.menu
+#var/ipfire/menu.d/EX-mympd.menu
#var/ipfire/menu.d/EX-samba.menu
#var/ipfire/menu.d/EX-tor.menu
#var/ipfire/menu.d/EX-vdr.menu
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index f00a3cb37..882f1397e 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -57,6 +57,7 @@ srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/modem.cgi
#srv/web/ipfire/cgi-bin/mpfire.cgi
+#srv/web/ipfire/cgi-bin/mympd.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd
index bc9912b85..b0ac2859f 100644
--- a/config/rootfiles/packages/mympd
+++ b/config/rootfiles/packages/mympd
@@ -1,5 +1,6 @@
etc/rc.d/init.d/mympd
usr/bin/mympd
+usr/bin/mympd-config
usr/bin/mympd-script
#usr/lib/systemd/system/mympd.service
#usr/share/doc/mympd
@@ -7,6 +8,7 @@ usr/bin/mympd-script
#usr/share/doc/mympd/LICENSE.md
#usr/share/doc/mympd/README.md
#usr/share/doc/mympd/SECURITY.md
+#usr/share/man/man1/mympd-config.1.gz
#usr/share/man/man1/mympd-script.1.gz
#usr/share/man/man1/mympd.1.gz
var/ipfire/backup/addons/includes/mympd
@@ -16,3 +18,5 @@ var/lib/mympd
#var/lib/mympd/config/ssl_port
#var/lib/mympd/state
#var/lib/mympd/state/music_directory
+srv/web/ipfire/cgi-bin/mympd.cgi
+var/ipfire/menu.d/EX-mympd.menu
diff --git a/html/cgi-bin/mympd.cgi b/html/cgi-bin/mympd.cgi
new file mode 100644
index 000000000..4b524d25c
--- /dev/null
+++ b/html/cgi-bin/mympd.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: https://$ENV{SERVER_ADDR}:8800\n\n";
+
+exit (0);
diff --git a/lfs/mympd b/lfs/mympd
index 9a43ac6b7..bc0cc4da9 100644
--- a/lfs/mympd
+++ b/lfs/mympd
@@ -26,7 +26,7 @@ include Config
SUMMARY = Webfrontend for Music Player Daemon
-VER = 13.0.6
+VER = 14.0.1
THISAPP = myMPD-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mympd
-PAK_VER = 1
+PAK_VER = 2
# TODO move mpd initskript and config to mpd package to run without mpfire
DEPS = mpd libmpdclient mpfire
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2ecd8d42b9398e85fc6c149c9e55f760f2039434039d558ac1914b447858a59676ed9300bc89b2a25757b8d9828dec5934376d4587f6b84026d07adbfd2e4a33
+$(DL_FILE)_BLAKE2 = adc78e430f6afa88e35712119ce7a1545a962204b62f44a895fac17527ee696060f2e71a9313792d7c89d47905e27c4b4b72c3d13471fab27b16421eb2d992a5
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2024-02-11 12:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4TXmk55G4Nz2xWl@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox