Development April 2022

development@lists.ipfire.org

18 participants
154 discussions

[PATCH] ncdu: Update to version 1.17
by Adolf Belka 29 Apr '22

29 Apr '22

- Update from version 1.16 to 1.17 - Update of rootfile not required - Changelog 1.17 - 2022-04-28 - ncdu-1.17.tar.gz Add ‘dark-bg’ color scheme and use that by default Use natural sort order when sorting by file name Improve compatibility with C89 environments Fix wrong assumption about errno not being set by realloc() Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/ncdu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/ncdu b/lfs/ncdu index 1e63a45aa..f1338f033 100644 --- a/lfs/ncdu +++ b/lfs/ncdu @@ -27,7 +27,7 @@ include Config SUMMARY = NCurses Disk Usage -VER = 1.16 +VER = 1.17 THISAPP = ncdu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ncdu -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 61d004581bdcf1885bec24d0a1de4fc890fe91bba511abbdbc507a48f31946caf5c7324979e8410e53cfca8ada1b20342b737dc4e8b1f034f2fca5aea84e4369 +$(DL_FILE)_BLAKE2 = 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f install : $(TARGET) -- 2.36.0

2 1

[PATCH] multipath-tools: Update to version 0.8.9
by Adolf Belka 29 Apr '22

29 Apr '22

- Update from commit 386d288, bumped to version 0.7.7 (May 2018) to version 0.8.9 (Feb 2022) - Update of rootfile - Changelog No changelog file in the source tarball or on website. Changelog is the commit tree see https://github.com/opensvc/multipath-tools/commits/master for more details Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/multipath-tools | 6 +++++- lfs/multipath-tools | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/multipath-tools b/config/rootfiles/common/multipath-tools index aa3f9d138..1f87feb0d 100644 --- a/config/rootfiles/common/multipath-tools +++ b/config/rootfiles/common/multipath-tools @@ -1,4 +1,8 @@ #sbin/kpartx +#usr/lib/udev +#usr/lib/udev/kpartx_id +#usr/lib/udev/rules.d #usr/lib/udev/rules.d/11-dm-parts.rules +#usr/lib/udev/rules.d/66-kpartx.rules #usr/lib/udev/rules.d/68-del-part-nodes.rules -#usr/share/man/man8/kpartx.8.gz +#usr/share/man/man8/kpartx.8 diff --git a/lfs/multipath-tools b/lfs/multipath-tools index 3dcf1e906..61b6183f0 100644 --- a/lfs/multipath-tools +++ b/lfs/multipath-tools @@ -24,7 +24,7 @@ include Config -VER = 386d288 +VER = 0.8.9 THISAPP = multipath-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b1cfde006416359f008c80f13f457a8eb79e4f5fd1c4dc222e8d5719f15e898e94527174c9ba28c736cb0b51870f5c4b690ed4b6ee1427673ac7d1746b79fadc +$(DL_FILE)_BLAKE2 = b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 install : $(TARGET) -- 2.36.0

2 1

[PATCH] mtr: Update to version 0.95
by Adolf Belka 29 Apr '22

29 Apr '22

- Update from version 0.94 to 0.95 - Update of rootfile not required - Changelog V0.95 Aaron Lipinski (27): move net_send_batch call to its caller addr -> hostent for consistency re-init source too additional call from net_reopen refactor - group local, remote inits reset ctl address family at net_reopen accept only value used in structure tell dns process if we want 4 or 6 resolve ipv6 only if we have ipv6 remove wrapper only function init structures correctly wired up prepare host with h_addr_list remove temporaries extract convert_addrinfo_to_hostent function move conversion call to caller use addrinfo remove conversion function switch gui to addrinfo export DEFAULT_AF reset addr family before searching again freeaddrinfo export get_hostent_from_name make Hostname as const rename function dont show json option if not available Egor Panov (1): Updated Readme R.E. Wolff (2): Slight cleanup, but no fix for code that came up in a bugreport. increased max length suggested by YVS2014 Roger Wolff (12): Rogier Wolff (2): Code formatting for Zenithal pull added clarification to readme suggested by Zenithal Sergei Trofimovich (1): ui/curses: always use "%s"-style format for printf()-style functions Vincent Bernat (3): ui: don't cast to void* when calling display_rawhost() net: fix MPLS display for curses and report report: fix display of MPLS labels when using --report Zenithal (1): Add display of destination with resolved addr under curses mode a1346054 (5): fix wrong bash completion flag fix shellcheck warnings unify codestyle fix spelling trim trailing whitespace gaamox(a)tutanota.com (1): Report secondary servers when CSV + wide report is enabled Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/mtr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lfs/mtr b/lfs/mtr index aadb71d5b..dd190a90f 100644 --- a/lfs/mtr +++ b/lfs/mtr @@ -26,7 +26,7 @@ include Config SUMMARY = Ping and Traceroute Network Diagnostic Tool -VER = 0.94 +VER = 0.95 THISAPP = mtr-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mtr -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 08f646774eaa323861863f08aa6f91995135923f1597d26790d3dce9d617700b41120686f71105054fb7f75b558c8753119dc5431c4584d88f8bef5629e0ebfa +$(DL_FILE)_BLAKE2 = 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b install : $(TARGET) @@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./bootstrap.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.36.0

2 1

[PATCH] sqlite: Update to version 3380300
by Adolf Belka 29 Apr '22

29 Apr '22

- Update from version 3380000 to 3380300 - Update of rootfile not required - Changelog 3.38.3 (2022-04-27): Fix a case of the query planner be overly aggressive with optimizing automatic-index and Bloom-filter construction, using inappropriate ON clause terms to restrict the size of the automatic-index or Bloom filter, and resulting in missing rows in the output. Forum thread 0d3200f4f3bcd3a3. Other minor patches. See the timeline for details. 3.38.2 (2022-03-26): Fix a user-discovered problem with the new Bloom filter optimization that might cause an incorrect answer when doing a LEFT JOIN with a WHERE clause constraint that says that one of the columns on the right table of the LEFT JOIN is NULL. See forum thread 031e262a89b6a9d2. Other minor patches. See the timeline for details. 3.38.1 (2022-03-12): Fix problems with the new Bloom filter optimization that might cause some obscure queries to get an incorrect answer. Fix the localtime modifier of the date and time functions so that it preserves fractional seconds. Fix the sqlite_offset SQL function so that it works correctly even in corner cases such as when the argument is a virtual column or the column of a view. Fix row value IN operator constraints on virtual tables so that they work correctly even if the virtual table implementation relies on bytecode to filter rows that do not satisfy the constraint. Other minor fixes to assert() statements, test cases, and documentation. See the source code timeline for details. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sqlite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sqlite b/lfs/sqlite index 7986b2ce5..076943280 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3380000 +VER = 3380300 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0b4eff73e9a7b317d080439c9e74b47a09e8809d4629a2ee31d410df2ce626d6bd6e9c5bdc5d0d4f104d981ee7b3a8a31bf2d7153932ad866f5e876c1608f6da +$(DL_FILE)_BLAKE2 = 35271246a27597ce88b4eaa1ff483b42421371737b5fe357eb6d2ad1d9c543b2d60341f7ee63f7dc95e374f61c539a607472b53881027c843b0da07704dd200f install : $(TARGET) -- 2.36.0

2 1

[PATCH] ncurses-compat: remove orphaned lfs file
by Adolf Belka 29 Apr '22

29 Apr '22

- ncurses-compat was removed from make.sh in Core Update 119 together with the rootfile --ncurses-compat lfs file was left behind at that time Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/ncurses-compat | 130 --------------------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 lfs/ncurses-compat diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat deleted file mode 100644 index fc63ab1b1..000000000 --- a/lfs/ncurses-compat +++ /dev/null @@ -1,130 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 5.9 - -THISAPP = ncurses-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) - -# Normal build or $(TOOLS_DIR) build. -# -ifeq "$(ROOT)" "" - TARGET = $(DIR_INFO)/$(THISAPP) - PREFIX = /usr -else - TARGET = $(DIR_INFO)/$(THISAPP)-tools - PREFIX = $(TOOLS_DIR) -endif - -EXTRA_CONFIG += \ - --prefix=$(PREFIX) \ - --with-shared \ - --without-debug \ - --without-ada \ - --with-ospeed=unsigned \ - --with-chtype=long \ - --enable-hard-tabs \ - --enable-xmc-glitch \ - --enable-colorfgbg \ - --enable-overwrite \ - --with-termlib=tinfo \ - --disable-nls - -export CPPFLAGS = -P - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && mkdir -pv narrowc widec - - # Build narrowc version. - cd $(DIR_APP)/narrowc && ln -svf ../configure . - cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib - cd $(DIR_APP)/narrowc && make libs - cd $(DIR_APP)/narrowc && make -C progs - - # Build widec version. - cd $(DIR_APP)/widec && ln -svf ../configure . - cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \ - --enable-widec --without-progs - cd $(DIR_APP)/widec && make libs - - # Install everything. - cd $(DIR_APP) && make -C narrowc install.{libs,progs,data} - rm -vf $(PREFIX)/lib/libtinfo.* - cd $(DIR_APP) && make -C widec install.{libs,includes,man} - - # don't require -ltinfo when linking with --no-add-needed - for l in $(PREFIX)/lib/libncurses{,w}.so; do \ - soname=$$(basename $$(readlink $$l)); \ - rm -f $$l; \ - echo "INPUT($$soname -ltinfo)" > $$l; \ - done - - rm -vf $(PREFIX)/lib/libcurses{,w}.so - echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so - echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so - echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so - @rm -rf $(DIR_APP) - @$(POSTBUILD) -- 2.36.0

2 1

[PATCH 1/3] mpd: Update to version 0.23.6
by Adolf Belka 29 Apr '22

29 Apr '22

- Update from version 0.22.6 to 0.23.6 - Update of rootfile not required - Since version 0.23 there is a new build time dependency for libfmt so a separate patch has been created to add fmt to the system but only for build - Changelog ver 0.23.6 (2022/03/14) * protocol - support filename "cover.webp" for "albumart" command - support "readcomments" and "readpicture" on CUE tracks * decoder - ffmpeg: fix end-of-file check (update stuck at empty files) - opus: fix "readpicture" on Opus files * output - pipewire: fix crash bug if setting volume before playback starts - wasapi: fix resume after pause ver 0.23.5 (2021/12/01) * protocol - support relative offsets for "searchadd" - fix "searchaddpl" bug (bogus error "Bad position") * database - upnp: fix crash bug * tags - fix MixRamp support * migrate to PCRE2 * GCC 12 build fixes ver 0.23.4 (2021/11/11) * protocol - add optional position parameter to "searchaddpl" * decoder - ffmpeg: support libavcodec 59 * output - alsa: add option "thesycon_dsd_workaround" to work around device bug * fix crash on debug builds if startup fails * systemd - remove "RuntimeDirectory" directive because it caused problems - ignore the "pid_file" setting if started as systemd service * Windows - enable the "openmpt" decoder plugin ver 0.23.3 (2021/10/31) * protocol - add optional position parameter to "add" and "playlistadd" - allow range in "playlistdelete" * database - fix scanning files with question mark in the name - inotify: fix use-after-free bug * output - alsa: add option "stop_dsd_silence" to work around DSD DAC noise * macOS: fix libfmt related build failure * systemd: add "RuntimeDirectory" directive ver 0.23.2 (2021/10/22) * protocol - fix "albumart" timeout bug * input - nfs: fix playback bug * output - pipewire: send artist and title to PipeWire - pipewire: DSD support * neighbor - mention failed plugin name in error message * player - fix cross-fade regression * fix crash with libfmt versions older than 7 ver 0.23.1 (2021/10/19) * protocol - use decimal notation instead of scientific notation - "load" supports relative positions * output - emit "mixer" idle event when replay gain changes volume - pipewire: emit "mixer" idle events on external volume change - pipewire: attempt to change the graph sample rate - snapcast: fix time stamp bug which caused "Failed to get chunk" * fix libfmt linker problems * fix broken password authentication ver 0.23 (2021/10/14) * protocol - new command "getvol" - show the audio format in "playlistinfo" - support "listfiles" with arbitrary storage plugins - support relative positions in "addid" - fix relative positions in "move" and "moveid" - add "position" parameter to "findadd" and "searchadd" - add position parameter to "load" * database - proxy: require MPD 0.20 or later - proxy: require libmpdclient 2.11 or later - proxy: split search into chunks to avoid exceeding the output buffer - simple: add option to hide CUE target songs - upnp: support libnpupnp instead of libupnp * archive - zzip, iso9660: ignore file names which are invalid UTF-8 * decoder - openmpt: new plugin - wavpack: fix WVC file support * player - do not cross-fade songs shorter than 20 seconds * output - oss: support DSD over PCM - pipewire: new plugin - snapcast: new plugin * tags - new tags "ComposerSort", "Ensemble", "Movement", "MovementNumber", and "Location" * split permission "player" from "control" * add option "host_permissions" * new build-time dependency: libfmt ver 0.22.11 (2021/08/24) * protocol - fix "albumart" crash * filter - ffmpeg: pass "channel_layout" instead of "channels" to buffersrc - ffmpeg: fix "av_buffersink_get_frame() failed: Resource temporarily unavailable" - ffmpeg: support double-precision samples (by converting to single precision) * Android - build with NDK r23 - playlist_directory defaults to "/sdcard/Android/data/org.musicpd/files/playlists" ver 0.22.10 (2021/08/06) * protocol - support "albumart" for virtual tracks in CUE sheets * database - simple: fix crash bug - simple: fix absolute paths in CUE "as_directory" entries - simple: prune CUE entries from database for non-existent songs * input - curl: fix crash bug after stream with Icy metadata was closed by peer - tidal: remove defunct unmaintained plugin * tags - fix crash caused by bug in TagBuilder and a few potential reference leaks * output - httpd: fix missing tag after seeking into a new song - oss: fix channel order of multi-channel files * mixer - alsa: fix yet more rounding errors ver 0.22.9 (2021/06/23) * database - simple: load all .mpdignore files of all parent directories * tags - fix "readcomments" and "readpicture" on remote files with ID3 tags * decoder - ffmpeg: support the tags "sort_album", "album-sort", "artist-sort" - ffmpeg: fix build failure with FFmpeg 3.4 * Android - fix auto-start on boot in Android 8 or later * Windows - fix build failure with SQLite ver 0.22.8 (2021/05/22) * fix crash bug in "albumart" command (0.22.7 regression) ver 0.22.7 (2021/05/19) * protocol - don't use glibc extension to parse time stamps - optimize the "albumart" command * input - curl: send user/password in the first request, save one roundtrip * decoder - ffmpeg: fix build problem with FFmpeg 3.4 - gme: support RSN files * storage - curl: don't use glibc extension * database - simple: fix database corruption bug * output - fix crash when pausing with multiple partitions - jack: enable on Windows - httpd: send header "Access-Control-Allow-Origin: *" - wasapi: add algorithm for finding usable audio format - wasapi: use default device only if none was configured - wasapi: add DoP support Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/mpd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/mpd b/lfs/mpd index 90c8cec41..e4381fc1b 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -26,7 +26,7 @@ include Config SUMMARY = Music Player Daemon -VER = 0.22.6 +VER = 0.23.6 THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 24 +PAK_VER = 25 SUP_ARCH = aarch64 armv6l x86_64 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c +$(DL_FILE)_BLAKE2 = 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb install : $(TARGET) -- 2.36.0

1 2

Nano: Move nano editor from packages to core system - new issue
by Jon Murphy 28 Apr '22

28 Apr '22

Hi Peter, I see nano is now part of the core in CU 167. Yay! But it still appears in the Pakfire add-on list. Ugh!! Jon [root@ipfire ~] # pakfire list | grep -A3 nano Name: nano ProgVersion: 6.1 Release: 41 [root@ipfire ~] #

3 3

[PATCH] manualpages: Add path and file extension to the configuration
by Leo-Andres Hofmann 25 Apr '22

25 Apr '22

This allows to correctly assign an URL to a file without relying on unique base names. A custom read function is required because General::readhash() doesn't allow paths as hash keys. Modifying the existing functions could affect other CGIs and was therefore dismissed. Fixes: #12806 Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- config/cfgroot/header.pl | 33 ++++- config/cfgroot/manualpages | 144 +++++++++---------- html/html/themes/ipfire/include/functions.pl | 4 +- tools/check_manualpages.pl | 17 +-- 4 files changed, 110 insertions(+), 88 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 65459cc92..3956d80a1 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -93,7 +93,7 @@ if ( -d "/var/ipfire/langs/${language}/" ) { ### Initialize user manual my %manualpages = (); -&General::readhash("${General::swroot}/main/manualpages", \%manualpages); +&_read_manualpage_hash("${General::swroot}/main/manualpages"); ### Load selected language and theme functions require "${swroot}/langs/en.pl"; @@ -558,20 +558,43 @@ sub colorize { } } -# Get user manual URL for the specified configuration page, returns empty if no entry is configured +# Get user manual URL for a configuration page inside the "/cgi-bin/" +# (reads current page from the environment variables unless defined) +# Returns empty if no URL is available sub get_manualpage_url() { - my ($cgi_page) = @_; + my ($cgifile) = @_; + $cgifile //= substr($ENV{'SCRIPT_NAME'}, 9); # remove fixed "/cgi-bin/" path # Ensure base url is configured return unless($manualpages{'BASE_URL'}); # Return URL - if($cgi_page && defined($manualpages{$cgi_page})) { - return "$manualpages{'BASE_URL'}/$manualpages{$cgi_page}"; + if($cgifile && defined($manualpages{$cgifile})) { + return "$manualpages{'BASE_URL'}/$manualpages{$cgifile}"; } # No manual page configured, return nothing return; } +# Private function to load a hash of configured user manual pages from file +# (run check_manualpages.pl to make sure the file is correct) +sub _read_manualpage_hash() { + my ($filename) = @_; + + open(my $file, "<", $filename) or return; # Fail silent + while(my $line = <$file>) { + chomp($line); + next if(substr($line, 0, 1) eq '#'); # Skip comments + next if(index($line, '=', 1) == -1); # Skip incomplete lines + + my($left, $value) = split(/=/, $line, 2); + if($left =~ /^([[:alnum:]\/._-]+)$/) { + my $key = $1; + $manualpages{$key} = $value; + } + } + close($file); +} + 1; # End of package "Header" diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages index 6c2e54b55..b92a81b56 100644 --- a/config/cfgroot/manualpages +++ b/config/cfgroot/manualpages @@ -1,88 +1,88 @@ -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) +# Assign manual page URL path to CGI file ([cgi file]=[path/to/page]) +# The CGI files are referenced relative to the "/cgi-bin/" path -# Base URL (without trailing slash) +# Fixed base URL (without trailing slash) BASE_URL=https://wiki.ipfire.org -index=configuration/system/startpage # System menu -index=configuration/system/startpage -mail=configuration/system/mail_service -remote=configuration/system/ssh -backup=configuration/system/backup -gui=configuration/system/userinterface -fireinfo=fireinfo -vulnerabilities=configuration/system/vulnerabilities -shutdown=configuration/system/shutdown -credits=configuration/system/credits +index.cgi=configuration/system/startpage +mail.cgi=configuration/system/mail_service +remote.cgi=configuration/system/ssh +backup.cgi=configuration/system/backup +gui.cgi=configuration/system/userinterface +fireinfo.cgi=fireinfo +vulnerabilities.cgi=configuration/system/vulnerabilities +shutdown.cgi=configuration/system/shutdown +credits.cgi=configuration/system/credits # Status menu -system=configuration/status/system -memory=configuration/status/memory -services=configuration/status/services -media=configuration/status/drives -netexternal=configuration/status/network_ext -netinternal=configuration/status/network_int -netother=configuration/status/network_int -netovpnrw=configuration/status/network_ovpnrw -#netovpnsrv= -wio=addons/wio -hardwaregraphs=configuration/status/hardware_diagrams -entropy=configuration/status/entropy -connections=configuration/status/connections -traffic=configuration/status/nettraffic -#mdstat= +system.cgi=configuration/status/system +memory.cgi=configuration/status/memory +services.cgi=configuration/status/services +media.cgi=configuration/status/drives +netexternal.cgi=configuration/status/network_ext +netinternal.cgi=configuration/status/network_int +netother.cgi=configuration/status/network_int +netovpnrw.cgi=configuration/status/network_ovpnrw +#netovpnsrv.cgi= +wio.cgi=addons/wio +hardwaregraphs.cgi=configuration/status/hardware_diagrams +entropy.cgi=configuration/status/entropy +connections.cgi=configuration/status/connections +traffic.cgi=configuration/status/nettraffic +#mdstat.cgi= # Network menu -zoneconf=configuration/network/zoneconf -dns=dns -proxy=configuration/network/proxy -urlfilter=configuration/network/proxy/url-filter -#updatexlrator=configuration/network/proxy/update_accelerator -dhcp=configuration/network/dhcp -captive=configuration/network/captive -connscheduler=configuration/network/connectionscheduler -hosts=configuration/network/hosts -dnsforward=configuration/network/dnsforward -routing=configuration/network/static -mac=configuration/network/mac-address -wakeonlan=configuration/network/wake-on-lan +zoneconf.cgi=configuration/network/zoneconf +dns.cgi=dns +proxy.cgi=configuration/network/proxy +urlfilter.cgi=configuration/network/proxy/url-filter +#updatexlrator.cgi=configuration/network/proxy/update_accelerator +dhcp.cgi=configuration/network/dhcp +captive.cgi=configuration/network/captive +connscheduler.cgi=configuration/network/connectionscheduler +hosts.cgi=configuration/network/hosts +dnsforward.cgi=configuration/network/dnsforward +routing.cgi=configuration/network/static +mac.cgi=configuration/network/mac-address +wakeonlan.cgi=configuration/network/wake-on-lan # Services menu -vpnmain=configuration/services/ipsec -ovpnmain=configuration/services/openvpn -ddns=configuration/services/dyndns -time=configuration/services/ntp -qos=configuration/services/qos -guardian=addons/guardian -extrahd=configuration/services/extrahd +vpnmain.cgi=configuration/services/ipsec +ovpnmain.cgi=configuration/services/openvpn +ddns.cgi=configuration/services/dyndns +time.cgi=configuration/services/ntp +qos.cgi=configuration/services/qos +guardian.cgi=addons/guardian +extrahd.cgi=configuration/services/extrahd # Firewall menu -firewall=configuration/firewall -fwhosts=configuration/firewall/fwgroups -optionsfw=configuration/firewall/options -ids=configuration/firewall/ips -location-block=configuration/firewall/geoip-block -wireless=configuration/firewall/accesstoblue -iptables=configuration/firewall/iptables +firewall.cgi=configuration/firewall +fwhosts.cgi=configuration/firewall/fwgroups +optionsfw.cgi=configuration/firewall/options +ids.cgi=configuration/firewall/ips +location-block.cgi=configuration/firewall/geoip-block +wireless.cgi=configuration/firewall/accesstoblue +iptables.cgi=configuration/firewall/iptables # IPfire menu -pakfire=configuration/ipfire/pakfire -wlanap=addons/wireless -tor=addons/tor -mpfire=addons/mpfire -samba=addons/samba +pakfire.cgi=configuration/ipfire/pakfire +wlanap.cgi=addons/wireless +tor.cgi=addons/tor +mpfire.cgi=addons/mpfire +samba.cgi=addons/samba # Logs menu -summary=configuration/logs/summary -config=configuration/logs/logsettings -proxylog=configuration/logs/proxy -calamaris=configuration/logs/proxyreports -accounting=addons/squid-accounting -firewalllog=configuration/logs/firewall -firewalllogip=configuration/logs/firewall-ip -firewalllogport=configuration/logs/firewall-port -firewalllogcountry=configuration/logs/firewall-country -ids=configuration/logs/ips -#ovpnclients= -urlfilter=configuration/logs/url-filter -log=configuration/logs/system +logs.cgi/summary.dat=configuration/logs/summary +logs.cgi/config.dat=configuration/logs/logsettings +logs.cgi/proxylog.dat=configuration/logs/proxy +logs.cgi/calamaris.dat=configuration/logs/proxyreports +logs.cgi/accounting.dat=addons/squid-accounting +logs.cgi/firewalllog.dat=configuration/logs/firewall +logs.cgi/firewalllogip.dat=configuration/logs/firewall-ip +logs.cgi/firewalllogport.dat=configuration/logs/firewall-port +logs.cgi/firewalllogcountry.dat=configuration/logs/firewall-country +logs.cgi/ids.dat=configuration/logs/ips +#logs.cgi/ovpnclients.dat= +logs.cgi/urlfilter.dat=configuration/logs/url-filter +logs.cgi/log.dat=configuration/logs/system diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index f90cd5fea..cc976e812 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -100,8 +100,6 @@ sub openpage { my $boh = shift; my $extrahead = shift; my $suppressMenu = shift // 0; - my @tmp = split(/\./, basename($0)); - my $scriptName = @tmp[0]; my $headline = "IPFire"; if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) { @@ -172,7 +170,7 @@ END ; # Print user manual link -my $manual_url = &Header::get_manualpage_url($scriptName); +my $manual_url = &Header::get_manualpage_url(); if($manual_url) { print <<END <span><a href="$manual_url" title="$Lang::tr{'online help en'}" target="_blank"><img src="/images/help-browser.png" alt="$Lang::tr{'online help en'}"></a></span> diff --git a/tools/check_manualpages.pl b/tools/check_manualpages.pl index 75a560560..446e94649 100644 --- a/tools/check_manualpages.pl +++ b/tools/check_manualpages.pl @@ -25,18 +25,19 @@ use strict; # Import make.sh environment my $basedir = $ENV{'BASEDIR'}; -# Load configuration file (General::readhash isn't available yet) +# Load configuration file (Header::_read_manualpage_hash() isn't available yet) my $configfile = "${basedir}/config/cfgroot/manualpages"; my %manualpages = (); open(my $file, "<", $configfile) or die "ERROR: Can't read from file '$configfile'!\n"; while(my $line = <$file>) { - $line =~ s/\R//g; - next unless($line =~ /=/); + chomp($line); + next if(substr($line, 0, 1) eq '#'); # Skip comments + next if(index($line, '=', 1) == -1); # Skip incomplete lines my($left, $value) = split(/=/, $line, 2); - if($left =~ /(^[A-Za-z0-9_-]+$)/) { - my $key = $1; # Got alphanumeric key + if($left =~ /^([[:alnum:]\/._-]+)$/) { + my $key = $1; $manualpages{$key} = $value; } } @@ -55,11 +56,11 @@ if ($baseurl =~ /\/\s*$/) { # Loop trough configured manual pages foreach my $page (keys %manualpages) { - # Build absolute path and URL - my $cgifile = "${basedir}/html/cgi-bin/${page}.cgi"; + # Build absolute path (inside cgi-bin) and URL + my $cgifile = "${basedir}/html/cgi-bin/${page}"; my $url = "${baseurl}/$manualpages{$page}"; - print "${page}.cgi -> '$url'\n"; + print "cgi-bin/${page} -> '$url'\n"; # Check CGI file exists if(! -f $cgifile) { -- 2.27.0.windows.1

1 0

[PATCH] powertop: Update to version 2.14
by Adolf Belka 25 Apr '22

25 Apr '22

- Update from v2.10 to 2.14 - added ./autogen.sh to create configure file - Update of rootfile - Changelog No changelog provided anywhere. For details of changes see commits in the github repository - https://github.com/fenrus75/powertop/commits/master Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/powertop | 1 + lfs/powertop | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop index b7d2550a6..3ec61dd8e 100644 --- a/config/rootfiles/packages/powertop +++ b/config/rootfiles/packages/powertop @@ -1,4 +1,5 @@ usr/sbin/powertop +#usr/share/bash-completion/completions/powertop #usr/share/locale/ca/LC_MESSAGES/powertop.mo #usr/share/locale/cs_CZ/LC_MESSAGES/powertop.mo #usr/share/locale/de_DE diff --git a/lfs/powertop b/lfs/powertop index c687cf729..c909a73bf 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -26,7 +26,7 @@ include Config SUMMARY = A Linux Tool to Find out What is Using Power on a Laptop -VER = v2.10 +VER = 2.14 THISAPP = powertop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = powertop -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 +$(DL_FILE)_BLAKE2 = 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc install : $(TARGET) @@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.36.0

2 1

[PATCH] wakeonlan.cgi: Fix meta refresh tag
by Leo-Andres Hofmann 24 Apr '22

24 Apr '22

This fixes an HTML error that is briefly visible on the "magic packet sent" page. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- html/cgi-bin/wakeonlan.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index c3c4c6911..e88448964 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -173,10 +173,10 @@ if ( $cgiparams{'ACTION'} eq 'wakeup' ) &General::system("/usr/sbin/etherwake", "-i", "$iface", "$mac"); - # make a box with info, 'refresh' to normal screen after 5 seconds + # make a box with info, 'refresh' to normal screen after 3 seconds if ( $refresh eq 'yes' ) { - &Header::openpage($Lang::tr{'WakeOnLan'}, 1, "<meta http-equiv='refresh' content='3;url=/cgi-bin/wakeonlan.cgi'"); + &Header::openpage($Lang::tr{'WakeOnLan'}, 1, "<meta http-equiv='refresh' content='3; url=/cgi-bin/wakeonlan.cgi'>"); &Header::openbigbox('100%', 'left'); } &Header::openbox('100%', 'left', $Lang::tr{'WakeOnLan'}); -- 2.27.0.windows.1

2 1

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2022