[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7885b1509cfb7d8aed4bc921bbafc18bbf67b62d
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 7885b1509cfb7d8aed4bc921bbafc18bbf67b62d (commit) via 8cc05c7486b13b6f185a7d7dc09336893193697c (commit) via 748ab174c279774f8ab8e7f429ff18d0996c9e17 (commit) via 6216b6709faffdc3071595f56db0b86f254c2589 (commit) via 1106abd31c1f79cae1dff045d07975938b98c00a (commit) via 4bad4d736c39ae8234087d7502a82d7591d51dc9 (commit) via 9272ab4a20d15d4371087e5bba6bc1789c8e81f3 (commit) via c095f8143580b587b8369a27fb93458a9cbdc169 (commit) via ad3cc7c98de86ef851a5efa2ffeb49e034d88a1c (commit) from efaed42101ed190df802f492cb00c8997f8a08b7 (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 7885b1509cfb7d8aed4bc921bbafc18bbf67b62d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 11 21:38:45 2021 +0200
kernel: update to 4.14.230
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8cc05c7486b13b6f185a7d7dc09336893193697c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 12 09:36:08 2021 +0000
core157: Fix ppp symlink
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 748ab174c279774f8ab8e7f429ff18d0996c9e17 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Apr 9 21:10:22 2021 +0200
libid3tag: Addition of pkgconfig file
- id3tag.pc pkgconfig file required for mpd-0.22.6 to find libid3tag library files - Update of rootfile - update lfs to install id3tag.pc file to /usr/lib/pkgconfig directory
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6216b6709faffdc3071595f56db0b86f254c2589 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 12 09:35:16 2021 +0000
core157: Ship libupnp
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1106abd31c1f79cae1dff045d07975938b98c00a Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Apr 9 21:10:21 2021 +0200
libupnp: Update to 1.14.5
- Update from 1.6.18 to 1.14.5 - Update required for successfgul build of mpd-0.22.6 - Update of rootfile - Changelog is too large to include here Full details can be found in the ChangeLog file in the source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4bad4d736c39ae8234087d7502a82d7591d51dc9 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Apr 9 21:10:20 2021 +0200
mpd: Update to 0.22.6
- Update from 0.19.19 to 0.22.6 - Update rootfile - Required update of libupnp - Autotools no longer available Build changed to meson Meson build required addition of pkgconfig file for libid3tag - Changelog is too large to include here. Full details can be found in the NEWS file in the source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9272ab4a20d15d4371087e5bba6bc1789c8e81f3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 12 09:32:00 2021 +0000
core157: Ship changes on RRD graphs tooling
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c095f8143580b587b8369a27fb93458a9cbdc169 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Sun Apr 11 14:01:06 2021 +0200
rrdimage: Improve CGI & cosmetic changes
Write graph error messages to the system log, to simplify further inspection by the user. Add additional parameter check to prevent a possible redirect loop if the URL format is changed in the future.
Cosmetic: Use underlining instead of background color for highlighting
Fixes #10643
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ad3cc7c98de86ef851a5efa2ffeb49e034d88a1c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 12 09:25:26 2021 +0000
samba: Update rootfiles
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 2 +- config/libid3tag/id3tag.pc | 8 +++++ config/rootfiles/common/libupnp | 33 +++++++++--------- config/rootfiles/core/157/filelists/files | 2 ++ .../{oldcore/66 => core/157}/filelists/libupnp | 0 .../{oldcore/125 => core/157}/filelists/ppp | 0 config/rootfiles/core/157/filelists/pppd | 1 - config/rootfiles/packages/aarch64/samba | 5 ++- config/rootfiles/packages/i586/samba | 5 ++- config/rootfiles/packages/libid3tag | 3 +- config/rootfiles/packages/mpd | 12 ++----- html/cgi-bin/getrrdimage.cgi | 6 +++- html/html/themes/ipfire/include/css/style.css | 4 +-- lfs/libid3tag | 5 ++- lfs/libupnp | 4 +-- lfs/linux | 8 ++--- lfs/mpd | 39 +++++++++++----------- 17 files changed, 75 insertions(+), 62 deletions(-) create mode 100644 config/libid3tag/id3tag.pc create mode 100644 config/rootfiles/core/157/filelists/files copy config/rootfiles/{oldcore/66 => core/157}/filelists/libupnp (100%) copy config/rootfiles/{oldcore/125 => core/157}/filelists/ppp (100%) delete mode 120000 config/rootfiles/core/157/filelists/pppd
Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 65c365c1b..c15fa8efc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.229 Kernel Configuration +# Linux/x86 4.14.230 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/config/libid3tag/id3tag.pc b/config/libid3tag/id3tag.pc new file mode 100644 index 000000000..e03cc771e --- /dev/null +++ b/config/libid3tag/id3tag.pc @@ -0,0 +1,8 @@ +prefix=/usr +libdir=${prefix}/lib + +Name: ID3TAG +Description: libid3tag - ID3 tag manipulation library +Version: 0.15.1b +Libs: -L${libdir} -lid3tag -lz +Cflags: diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp index cec62c463..d5b6f5df0 100644 --- a/config/rootfiles/common/libupnp +++ b/config/rootfiles/common/libupnp @@ -1,34 +1,37 @@ #usr/include/upnp -#usr/include/upnp/FreeList.h -#usr/include/upnp/LinkedList.h -#usr/include/upnp/ThreadPool.h -#usr/include/upnp/TimerThread.h +#usr/include/upnp/Callback.h +#usr/include/upnp/UpnpActionComplete.h +#usr/include/upnp/UpnpActionRequest.h +#usr/include/upnp/UpnpDiscovery.h +#usr/include/upnp/UpnpEvent.h +#usr/include/upnp/UpnpEventSubscribe.h +#usr/include/upnp/UpnpExtraHeaders.h +#usr/include/upnp/UpnpFileInfo.h #usr/include/upnp/UpnpGlobal.h #usr/include/upnp/UpnpInet.h #usr/include/upnp/UpnpIntTypes.h +#usr/include/upnp/UpnpStateVarComplete.h +#usr/include/upnp/UpnpStateVarRequest.h #usr/include/upnp/UpnpStdInt.h #usr/include/upnp/UpnpString.h +#usr/include/upnp/UpnpSubscriptionRequest.h #usr/include/upnp/UpnpUniStd.h #usr/include/upnp/ithread.h #usr/include/upnp/ixml.h #usr/include/upnp/ixmldebug.h +#usr/include/upnp/list.h #usr/include/upnp/upnp.h #usr/include/upnp/upnpconfig.h #usr/include/upnp/upnpdebug.h #usr/include/upnp/upnptools.h #usr/lib/libixml.a #usr/lib/libixml.la -usr/lib/libixml.so -usr/lib/libixml.so.2 -usr/lib/libixml.so.2.0.8 -#usr/lib/libthreadutil.a -#usr/lib/libthreadutil.la -usr/lib/libthreadutil.so -usr/lib/libthreadutil.so.6 -usr/lib/libthreadutil.so.6.0.3 +#usr/lib/libixml.so +usr/lib/libixml.so.11 +usr/lib/libixml.so.11.0.1 #usr/lib/libupnp.a #usr/lib/libupnp.la -usr/lib/libupnp.so -usr/lib/libupnp.so.6 -usr/lib/libupnp.so.6.3.2 +#usr/lib/libupnp.so +usr/lib/libupnp.so.17 +usr/lib/libupnp.so.17.0.5 #usr/lib/pkgconfig/libupnp.pc diff --git a/config/rootfiles/core/157/filelists/files b/config/rootfiles/core/157/filelists/files new file mode 100644 index 000000000..10a4ef778 --- /dev/null +++ b/config/rootfiles/core/157/filelists/files @@ -0,0 +1,2 @@ +srv/web/ipfire/cgi-bin/getrrdimage.cgi +srv/web/ipfire/html/themes/ipfire/include/css/style.css diff --git a/config/rootfiles/core/157/filelists/libupnp b/config/rootfiles/core/157/filelists/libupnp new file mode 120000 index 000000000..7ec2b0074 --- /dev/null +++ b/config/rootfiles/core/157/filelists/libupnp @@ -0,0 +1 @@ +../../../common/libupnp \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/ppp b/config/rootfiles/core/157/filelists/ppp new file mode 120000 index 000000000..4844a9b58 --- /dev/null +++ b/config/rootfiles/core/157/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/pppd b/config/rootfiles/core/157/filelists/pppd deleted file mode 120000 index 0f475891a..000000000 --- a/config/rootfiles/core/157/filelists/pppd +++ /dev/null @@ -1 +0,0 @@ -../../../common/pppd \ No newline at end of file diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index c0995904c..a0aab25c0 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -667,7 +667,7 @@ usr/lib/samba/libldb-key-value-samba4.so usr/lib/samba/libldb-tdb-err-map-samba4.so usr/lib/samba/libldb-tdb-int-samba4.so usr/lib/samba/libldb.so.2 -usr/lib/samba/libldb.so.2.2.0 +usr/lib/samba/libldb.so.2.2.1 usr/lib/samba/libldbsamba-samba4.so usr/lib/samba/liblibcli-lsa3-samba4.so usr/lib/samba/liblibcli-netlogon3-samba4.so @@ -688,7 +688,7 @@ usr/lib/samba/libposix-eadb-samba4.so usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2 -usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.0 +usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1 usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2 usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1 usr/lib/samba/libregistry-samba4.so @@ -711,7 +711,6 @@ usr/lib/samba/libshares-samba4.so usr/lib/samba/libsmb-transport-samba4.so usr/lib/samba/libsmbclient-raw-samba4.so usr/lib/samba/libsmbd-base-samba4.so -usr/lib/samba/libsmbd-conn-samba4.so usr/lib/samba/libsmbd-shim-samba4.so usr/lib/samba/libsmbldaphelper-samba4.so usr/lib/samba/libsmbpasswdparser-samba4.so diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 06780b2eb..b28a4d894 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -667,7 +667,7 @@ usr/lib/samba/libldb-key-value-samba4.so usr/lib/samba/libldb-tdb-err-map-samba4.so usr/lib/samba/libldb-tdb-int-samba4.so usr/lib/samba/libldb.so.2 -usr/lib/samba/libldb.so.2.2.0 +usr/lib/samba/libldb.so.2.2.1 usr/lib/samba/libldbsamba-samba4.so usr/lib/samba/liblibcli-lsa3-samba4.so usr/lib/samba/liblibcli-netlogon3-samba4.so @@ -688,7 +688,7 @@ usr/lib/samba/libposix-eadb-samba4.so usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2 -usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.0 +usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1 usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2 usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1 usr/lib/samba/libregistry-samba4.so @@ -711,7 +711,6 @@ usr/lib/samba/libshares-samba4.so usr/lib/samba/libsmb-transport-samba4.so usr/lib/samba/libsmbclient-raw-samba4.so usr/lib/samba/libsmbd-base-samba4.so -usr/lib/samba/libsmbd-conn-samba4.so usr/lib/samba/libsmbd-shim-samba4.so usr/lib/samba/libsmbldaphelper-samba4.so usr/lib/samba/libsmbpasswdparser-samba4.so diff --git a/config/rootfiles/packages/libid3tag b/config/rootfiles/packages/libid3tag index 8963ab803..0899f8702 100644 --- a/config/rootfiles/packages/libid3tag +++ b/config/rootfiles/packages/libid3tag @@ -1,6 +1,7 @@ #usr/include/id3tag.h #usr/lib/libid3tag.a #usr/lib/libid3tag.la -usr/lib/libid3tag.so +#usr/lib/libid3tag.so usr/lib/libid3tag.so.0 usr/lib/libid3tag.so.0.3.0 +usr/lib/pkgconfig/id3tag.pc diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd index c49d33498..85501238b 100644 --- a/config/rootfiles/packages/mpd +++ b/config/rootfiles/packages/mpd @@ -1,16 +1,10 @@ etc/rc.d/init.d/mpd usr/bin/mpd -var/log/mpd.error.log -var/log/mpd.log #usr/share/doc/mpd #usr/share/doc/mpd/AUTHORS #usr/share/doc/mpd/COPYING #usr/share/doc/mpd/NEWS -#usr/share/doc/mpd/COMMANDS -#usr/share/doc/mpd/README #usr/share/doc/mpd/README.md -#usr/share/doc/mpd/TODO -#usr/share/doc/mpd/UPGRADING -#usr/share/doc/mpd/mpdconf.example -#usr/share/man/man1/mpd.1 -#usr/share/man/man5/mpd.conf.5 +#usr/share/icons/hicolor/scalable/apps/mpd.svg +var/log/mpd.error.log +var/log/mpd.log diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi index 0caefe0ac..34ee4bf7a 100644 --- a/html/cgi-bin/getrrdimage.cgi +++ b/html/cgi-bin/getrrdimage.cgi @@ -60,7 +60,7 @@ unless(($origin =~ /^\w+?.cgi$/) && ($graph =~ /^[\w-]+?$/) && ($range ~~ @Grap
# Unsupported graph origin: Redirect request to the CGI specified in the "origin" parameter # This enables backwards compatibility with addons that use Graphs::makegraphbox to ouput their own graphs -unless($origin ~~ @supported_origins) { +unless(($origin ~~ @supported_origins) || ($origin eq "getrrdimage.cgi")) { # Rewrite to old URL format: /[graph origin cgi]?[graph name]?[time range] my $location = "https://$ENV%7B%27SERVER_NAME%27%7D:$ENV%7B%27SERVER_PORT%27%7D/cgi-bin/$%7B..."; @@ -195,6 +195,10 @@ if($origin eq "entropy.cgi") { ## entropy.cgi # Add request parameters for debugging if($graphstatus) { $graphstatus = "$graphstatus\n($origin, $graph, $range)"; + + # Save message in system log for further inspection + General::log($graphstatus); + _print_error($graphstatus); }
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 10644a9f8..2c727a770 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -348,14 +348,14 @@ div.rrdimage > ul { border: none; background: none; cursor: pointer; - text-decoration: underline; + text-decoration: none; } .rrdimage button:focus { outline: none; box-shadow: none; } .rrdimage button.selected { - background-color: rgba(135, 203, 0, 0.2); + text-decoration: underline; }
div.rrdimage > img { diff --git a/lfs/libid3tag b/lfs/libid3tag index 8c61c5157..9005ca94c 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libid3tag -PAK_VER = 1 +PAK_VER = 2
DEPS =
@@ -78,6 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + # install id3tag pkgconfig file + install -v -m 644 ${DIR_SRC}/config/libid3tag/id3tag.pc \ + /usr/lib/pkgconfig/id3tag.pc cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/libupnp b/lfs/libupnp index 683a887ad..90cb48b84 100644 --- a/lfs/libupnp +++ b/lfs/libupnp @@ -24,7 +24,7 @@
include Config
-VER = 1.6.18 +VER = 1.14.5
THISAPP = libupnp-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56 +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
install : $(TARGET)
diff --git a/lfs/linux b/lfs/linux index 86acc14f7..e6030bd49 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 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 # @@ -24,8 +24,8 @@
include Config
-VER = 4.14.229 -ARM_PATCHES = 4.14.229-ipfire0 +VER = 4.14.230 +ARM_PATCHES = 4.14.230-ipfire0
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -79,7 +79,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 9d4cf6e9ffff893d8a2ecea6a8c5a15b +$(DL_FILE)_MD5 = 9fceffba37032235767745a83b2f7ad2 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = a04b842733999abb818cabb0388572b8
install : $(TARGET) diff --git a/lfs/mpd b/lfs/mpd index f7abccf2c..3112575ad 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@
include Config
-VER = 0.19.19 +VER = 0.22.6
THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 20 +PAK_VER = 21
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db +$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
install : $(TARGET)
@@ -78,22 +78,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-ipv6 \ - --sysconfdir=/etc \ - --disable-sqlite \ - --disable-smbclient \ - --enable-id3 \ - --enable-vorbis \ - --enable-expat \ - --enable-ffmpeg \ - --enable-flac \ - --enable-lame-encoder \ - --enable-upnp \ - --disable-icu - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + -D ipv6=disabled \ + -D sqlite=disabled \ + -D smbclient=disabled \ + -D id3tag=enabled \ + -D vorbis=enabled \ + -D expat=enabled \ + -D ffmpeg=enabled \ + -D flac=enabled \ + -D lame=enabled \ + -D upnp=enabled \ + -D icu=disabled \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ install
#install initscripts $(call INSTALL_INITSCRIPT,mpd)
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer