Development March 2020

development@lists.ipfire.org

14 participants
59 discussions

[PATCH 1/2] amazon-ssm-agent: Update to 2.3.930.0
by Michael Tremer 30 Mar '20

30 Mar '20

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/amazon-ssm-agent | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent index 44a91f4ac..d4aa3fa90 100644 --- a/lfs/amazon-ssm-agent +++ b/lfs/amazon-ssm-agent @@ -24,7 +24,7 @@ include Config -VER = 2.3.786.0 +VER = 2.3.930.0 SUP_ARCH = x86_64 THISAPP = amazon-ssm-agent-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = amazon-ssm-agent -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a2887445875d335b021c5044eab955dc +$(DL_FILE)_MD5 = cf7c50976e2853764d308581f94cbdd1 install : $(TARGET) @@ -88,6 +88,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Disable style check cd $(DIR_BUILD) && sed -e "/checkstyle.sh/d" -i makefile + # agent/plugins/inventory/gatherers/application/dataProvider.go:10:78: error: imported and not used: localpackages + cd $(DIR_BUILD) && sed -e "/localpackages/d" \ + -i agent/plugins/inventory/gatherers/application/dataProvider.go + # Build cd $(DIR_BUILD) && make build-linux -- 2.20.1

1 1

Fwd: Re: Opening or refreshing 'hosts.cgi' deletes first line
by Matthias Fischer 27 Mar '20

27 Mar '20

-------- Forwarded Message -------- Subject: Re: Opening or refreshing 'hosts.cgi' deletes first line Date: Fri, 27 Mar 2020 13:29:48 +0100 From: Matthias Fischer <matthias.fischer(a)ipfire.org> To: Michael Tremer <michael.tremer(a)ipfire.org> On 27.03.2020 13:11, Michael Tremer wrote: > Oh that is bad. Yep. But: it was all my fault, don't worry. I checked the langs in GIT and they are OK. > Is that only happening for the German translation? It happened here for all translations. That must have happened when I tried to optimize the language files. As I said: sorry - calm down - the problem sat between monitor and chair... > Best, > -Michael > >> On 27 Mar 2020, at 11:45, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >> >> Hi, >> >> sorry for the noise - it was my fault. >> >> I'll go and find me a hole to hide in! >> >> Somehow a translation string got lost: >> >> 'remove' => ' ...', >> >> This led to deleting the line. >> >> Sorry again. >> >> Best, >> Matthias >> >

2 1

Opening or refreshing 'hosts.cgi' deletes first line
by Matthias Fischer 27 Mar '20

27 Mar '20

Hi, I got a rather long list in '/var/ipfire/main/hosts'. The current list contains 41 hosts. Some activated, some not. Say, it *should* contain. But today the page looked somehow shorter than expected... I found that every time I *open*, *refresh* or *sort* (e.g.) this list through 'host.cgi' the first line is deleted. At the moment, adding new entries is ok, but when I reopen or reload the page the first line is gone. Every time, counting down... Just as I write: reloading just *doubled* the first line... Running Core 142/32bit. Can anyone confirm or tell me what is happening here? Best, Matthias

2 2

[PATCH] collectd: run sensors-detect in background
by Arne Fitzenreiter 26 Mar '20

26 Mar '20

on some machines the i2c sensor search take very long time which cause hang at first boot. Now the search is started in background and waited for max one minute before continue load of collectd. On such machines collectd will not get all sensors at first startup. fixes #12329 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- src/initscripts/system/collectd | 56 ++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 5233525f0..20072780a 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -6,6 +6,28 @@ eval $(/usr/local/bin/readhash /var/ipfire/main/settings) +scan_for_sensors() { + touch /var/lock/sensors_search + # pre scan and try to load modules + "yes" | /usr/sbin/sensors-detect > /dev/null + if [ -e /etc/sysconfig/lm_sensors ]; then + + # Module load + . /etc/sysconfig/lm_sensors + for modul in $BUS_MODULES $HWMON_MODULES ; do + modprobe $modul > /dev/null 2>&1; + done + fi + + # Final scan + "yes" | /usr/sbin/sensors-detect > /dev/null + + if [ ! -e /etc/sysconfig/lm_sensors ]; then + echo "#No Sensors detected " > /etc/sysconfig/lm_sensors + fi + rm /var/lock/sensors_search +} + if [ "$RRDLOG" = '' ]; then RRDLOG=/var/log/rrd fi @@ -42,27 +64,23 @@ case "$1" in # At first run search for sensors with sensors-detect if [ ! -e /etc/sysconfig/lm_sensors ]; then - boot_mesg "Searching for Sensors..." - - # pre scan and try to load modules - "yes" | /usr/sbin/sensors-detect > /dev/null - if [ -e /etc/sysconfig/lm_sensors ]; then - - # Module load - . /etc/sysconfig/lm_sensors - for modul in $BUS_MODULES $HWMON_MODULES ; do - modprobe $modul > /dev/null 2>&1; - done - fi - - # Final scan - "yes" | /usr/sbin/sensors-detect > /dev/null - evaluate_retval + # Don't run at next boot again + touch /etc/sysconfig/lm_sensors + boot_mesg -n "Searching for Sensors..." + scan_for_sensors & + sleep 2 + fi - if [ ! -e /etc/sysconfig/lm_sensors ]; then - echo "#No Sensors detected " > /etc/sysconfig/lm_sensors - fi + if [ -e /var/lock/sensors_search ]; then + for (( i=1; i<30; i++)) do + if [ ! -e /var/lock/sensors_search ]; then + break; + fi + boot_mesg -n "." + sleep 2 + done fi + boot_mesg "" # Load sensor modules only first start if [ ! -e /var/lock/sensors_modules ]; then -- 2.17.1

2 2

[PATCH] OpenVPN: Stop N2N connection before remove.
by Erik Kapfer 25 Mar '20

25 Mar '20

Fix #12334 Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index e76a688fe..a6fdd6d75 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2464,7 +2464,7 @@ else if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { # Stop the N2N connection before it is removed - system("/usr/local/bin/openvpnctrl -kn2n $confighash{$cgiparams{'KEY'}}[1] &>/dev/null"); + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); -- 2.12.2

3 5

[PATCH] bind: Update to 9.11.17
by Matthias Fischer 25 Mar '20

25 Mar '20

For details see: https://downloads.isc.org/isc/bind9/9.11.17/RELEASE-NOTES-bind-9.11.17.html "Notes for BIND 9.11.17 Feature Changes The configure option --with-libxml2 now uses pkg-config to detect libxml2 library availability. You will either have to install pkg-config or specify the exact path where libxml2 has been installed on your system. [GL #1635] Bug Fixes Fixed re-signing issues with inline zones which resulted in records being re-signed late or not at all." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 9 +++++---- lfs/bind | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index dd0293db7..3a306bf9e 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -198,6 +198,7 @@ usr/bin/nsupdate #usr/include/isc/socket.h #usr/include/isc/stat.h #usr/include/isc/stats.h +#usr/include/isc/stdatomic.h #usr/include/isc/stdio.h #usr/include/isc/stdlib.h #usr/include/isc/stdtime.h @@ -271,12 +272,12 @@ usr/lib/libbind9.so.161 usr/lib/libbind9.so.161.0.4 #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libdns.so.1109 -usr/lib/libdns.so.1109.0.1 +usr/lib/libdns.so.1110 +usr/lib/libdns.so.1110.0.0 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1105 -usr/lib/libisc.so.1105.0.0 +usr/lib/libisc.so.1105.0.1 #usr/lib/libisccc.la #usr/lib/libisccc.so usr/lib/libisccc.so.161 @@ -284,7 +285,7 @@ usr/lib/libisccc.so.161.0.1 #usr/lib/libisccfg.la #usr/lib/libisccfg.so usr/lib/libisccfg.so.163 -usr/lib/libisccfg.so.163.0.5 +usr/lib/libisccfg.so.163.0.6 #usr/lib/liblwres.la #usr/lib/liblwres.so usr/lib/liblwres.so.161 diff --git a/lfs/bind b/lfs/bind index 56bf8b4fd..85d7f85bb 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.16 +VER = 9.11.17 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e5a0fea6c636a9b8f350e6f9e3ecabc3 +$(DL_FILE)_MD5 = ceab137e8e7ce3b356be95f505abf737 install : $(TARGET) -- 2.18.0

2 1

[PATCH] ncurses: Update to 6.2
by Matthias Fischer 25 Mar '20

25 Mar '20

For details see: https://invisible-island.net/ncurses/announce.html#h2-release-notes Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/ncurses | 128 +++++++++++++++++++++++++++++++- lfs/ncurses | 6 +- 2 files changed, 127 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index 0b7cff8b1..ff3f7a7bd 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -34,20 +34,20 @@ usr/bin/tset #usr/lib/libform.so #usr/lib/libformw.so usr/lib/libformw.so.6 -usr/lib/libformw.so.6.0 +usr/lib/libformw.so.6.2 #usr/lib/libmenu.so #usr/lib/libmenuw.so usr/lib/libmenuw.so.6 -usr/lib/libmenuw.so.6.0 +usr/lib/libmenuw.so.6.2 #usr/lib/libncurses++w.a #usr/lib/libncurses.so #usr/lib/libncursesw.so usr/lib/libncursesw.so.6 -usr/lib/libncursesw.so.6.0 +usr/lib/libncursesw.so.6.2 #usr/lib/libpanel.so #usr/lib/libpanelw.so usr/lib/libpanelw.so.6 -usr/lib/libpanelw.so.6.0 +usr/lib/libpanelw.so.6.2 #usr/lib/pkgconfig/form.pc #usr/lib/pkgconfig/menu.pc #usr/lib/pkgconfig/ncurses.pc @@ -84,6 +84,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/TYPE_REGEXP.3x #usr/share/man/man3/UP.3x #usr/share/man/man3/_nc_free_and_exit.3x +#usr/share/man/man3/_nc_free_tinfo.3x #usr/share/man/man3/_nc_freeall.3x #usr/share/man/man3/_nc_tracebits.3x #usr/share/man/man3/_traceattr.3x @@ -107,6 +108,8 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/addnwstr.3x #usr/share/man/man3/addstr.3x #usr/share/man/man3/addwstr.3x +#usr/share/man/man3/alloc_pair.3x +#usr/share/man/man3/alloc_pair_sp.3x #usr/share/man/man3/assume_default_colors.3x #usr/share/man/man3/assume_default_colors_sp.3x #usr/share/man/man3/attr_get.3x @@ -214,6 +217,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/curs_window.3x #usr/share/man/man3/curscr.3x #usr/share/man/man3/curses.3x +#usr/share/man/man3/curses_trace.3x #usr/share/man/man3/curses_version.3x #usr/share/man/man3/data_ahead.3x #usr/share/man/man3/data_behind.3x @@ -249,6 +253,14 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/erasechar.3x #usr/share/man/man3/erasechar_sp.3x #usr/share/man/man3/erasewchar.3x +#usr/share/man/man3/exit_curses.3x +#usr/share/man/man3/exit_terminfo.3x +#usr/share/man/man3/extended_color_content.3x +#usr/share/man/man3/extended_color_content_sp.3x +#usr/share/man/man3/extended_pair_content.3x +#usr/share/man/man3/extended_pair_content_sp.3x +#usr/share/man/man3/extended_slk_color.3x +#usr/share/man/man3/extended_slk_color_sp.3x #usr/share/man/man3/field_arg.3x #usr/share/man/man3/field_back.3x #usr/share/man/man3/field_buffer.3x @@ -268,6 +280,8 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/field_userptr.3x #usr/share/man/man3/filter.3x #usr/share/man/man3/filter_sp.3x +#usr/share/man/man3/find_pair.3x +#usr/share/man/man3/find_pair_sp.3x #usr/share/man/man3/flash.3x #usr/share/man/man3/flash_sp.3x #usr/share/man/man3/flushinp.3x @@ -310,6 +324,8 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/free_form.3x #usr/share/man/man3/free_item.3x #usr/share/man/man3/free_menu.3x +#usr/share/man/man3/free_pair.3x +#usr/share/man/man3/free_pair_sp.3x #usr/share/man/man3/get_escdelay.3x #usr/share/man/man3/get_escdelay_sp.3x #usr/share/man/man3/get_wch.3x @@ -366,6 +382,10 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/inchstr.3x #usr/share/man/man3/init_color.3x #usr/share/man/man3/init_color_sp.3x +#usr/share/man/man3/init_extended_color.3x +#usr/share/man/man3/init_extended_color_sp.3x +#usr/share/man/man3/init_extended_pair.3x +#usr/share/man/man3/init_extended_pair_sp.3x #usr/share/man/man3/init_pair.3x #usr/share/man/man3/init_pair_sp.3x #usr/share/man/man3/initscr.3x @@ -431,6 +451,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/link_field.3x #usr/share/man/man3/link_fieldtype.3x #usr/share/man/man3/longname.3x +#usr/share/man/man3/longname_sp.3x #usr/share/man/man3/mcprint.3x #usr/share/man/man3/mcprint_sp.3x #usr/share/man/man3/menu.3x @@ -571,6 +592,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/new_menu.3x #usr/share/man/man3/new_menu_sp.3x #usr/share/man/man3/new_page.3x +#usr/share/man/man3/new_pair.3x #usr/share/man/man3/new_panel.3x #usr/share/man/man3/new_prescr.3x #usr/share/man/man3/newpad.3x @@ -629,6 +651,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/redrawwin.3x #usr/share/man/man3/refresh.3x #usr/share/man/man3/replace_panel.3x +#usr/share/man/man3/reset_color_pairs.3x #usr/share/man/man3/reset_prog_mode.3x #usr/share/man/man3/reset_prog_mode_sp.3x #usr/share/man/man3/reset_shell_mode.3x @@ -797,6 +820,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/typeahead_sp.3x #usr/share/man/man3/unctrl.3x #usr/share/man/man3/unctrl_sp.3x +#usr/share/man/man3/unfocus_current_field.3x #usr/share/man/man3/unget_wch.3x #usr/share/man/man3/unget_wch_sp.3x #usr/share/man/man3/ungetch.3x @@ -817,6 +841,7 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/use_legacy_coding_sp.3x #usr/share/man/man3/use_screen.3x #usr/share/man/man3/use_tioctl.3x +#usr/share/man/man3/use_tioctl_sp.3x #usr/share/man/man3/use_window.3x #usr/share/man/man3/vid_attr.3x #usr/share/man/man3/vid_attr_sp.3x @@ -917,8 +942,10 @@ usr/lib/libpanelw.so.6.0 #usr/share/man/man3/wunctrl_sp.3x #usr/share/man/man3/wvline.3x #usr/share/man/man3/wvline_set.3x +#usr/share/man/man5/scr_dump.5 #usr/share/man/man5/term.5 #usr/share/man/man5/terminfo.5 +#usr/share/man/man5/user_caps.5 #usr/share/man/man7/term.7 #usr/share/tabset #usr/share/tabset/std @@ -1063,6 +1090,7 @@ usr/share/terminfo/E/Eterm-color #usr/share/terminfo/a/act4 #usr/share/terminfo/a/act5 #usr/share/terminfo/a/addrinfo +#usr/share/terminfo/a/adds200 #usr/share/terminfo/a/adds980 #usr/share/terminfo/a/addsviewpoint #usr/share/terminfo/a/addsvp60 @@ -1094,6 +1122,9 @@ usr/share/terminfo/E/Eterm-color #usr/share/terminfo/a/aj510 #usr/share/terminfo/a/aj830 #usr/share/terminfo/a/aj832 +#usr/share/terminfo/a/alacritty +#usr/share/terminfo/a/alacritty+common +#usr/share/terminfo/a/alacritty-direct #usr/share/terminfo/a/alt2 #usr/share/terminfo/a/alt3 #usr/share/terminfo/a/alt4 @@ -1141,6 +1172,7 @@ usr/share/terminfo/a/ansi #usr/share/terminfo/a/ansi+enq #usr/share/terminfo/a/ansi+erase #usr/share/terminfo/a/ansi+idc +#usr/share/terminfo/a/ansi+idc1 #usr/share/terminfo/a/ansi+idl #usr/share/terminfo/a/ansi+idl1 #usr/share/terminfo/a/ansi+inittabs @@ -1186,6 +1218,7 @@ usr/share/terminfo/a/ansi #usr/share/terminfo/a/ansis #usr/share/terminfo/a/ansis-mono #usr/share/terminfo/a/ansisysk +#usr/share/terminfo/a/ansiterm #usr/share/terminfo/a/ansiw #usr/share/terminfo/a/ap-vm80 #usr/share/terminfo/a/apl @@ -1773,6 +1806,7 @@ usr/share/terminfo/c/cygwin #usr/share/terminfo/d/dmdt80 #usr/share/terminfo/d/dmdt80w #usr/share/terminfo/d/dmterm +#usr/share/terminfo/d/domterm #usr/share/terminfo/d/dp3360 #usr/share/terminfo/d/dp8242 #usr/share/terminfo/d/ds40 @@ -1789,6 +1823,9 @@ usr/share/terminfo/c/cygwin #usr/share/terminfo/d/dtc382 #usr/share/terminfo/d/dtterm usr/share/terminfo/d/dumb +#usr/share/terminfo/d/dumb-emacs-ansi +#usr/share/terminfo/d/dvtm +#usr/share/terminfo/d/dvtm-256color #usr/share/terminfo/d/dw #usr/share/terminfo/d/dw1 #usr/share/terminfo/d/dw2 @@ -1798,7 +1835,10 @@ usr/share/terminfo/d/dumb #usr/share/terminfo/d/dwk-vt #usr/share/terminfo/e #usr/share/terminfo/e/ecma+color +#usr/share/terminfo/e/ecma+index +#usr/share/terminfo/e/ecma+italics #usr/share/terminfo/e/ecma+sgr +#usr/share/terminfo/e/ecma+strikeout #usr/share/terminfo/e/elks #usr/share/terminfo/e/elks-ansi #usr/share/terminfo/e/elks-glasstty @@ -1841,6 +1881,7 @@ usr/share/terminfo/e/eterm-color #usr/share/terminfo/f/f200vi-w #usr/share/terminfo/f/falco #usr/share/terminfo/f/falco-p +#usr/share/terminfo/f/fbterm #usr/share/terminfo/f/fenix #usr/share/terminfo/f/fenixw #usr/share/terminfo/f/fixterm @@ -2054,6 +2095,7 @@ usr/share/terminfo/h/hurd #usr/share/terminfo/i/i3164 #usr/share/terminfo/i/i400 #usr/share/terminfo/i/iTerm.app +#usr/share/terminfo/i/iTerm2.app #usr/share/terminfo/i/ibcs2 #usr/share/terminfo/i/ibm+16color #usr/share/terminfo/i/ibm+color @@ -2131,6 +2173,8 @@ usr/share/terminfo/h/hurd #usr/share/terminfo/i/iris-color #usr/share/terminfo/i/iris40 #usr/share/terminfo/i/iterm +#usr/share/terminfo/i/iterm2 +#usr/share/terminfo/i/iterm2-direct #usr/share/terminfo/j #usr/share/terminfo/j/jaixterm #usr/share/terminfo/j/jaixterm-m @@ -2145,6 +2189,9 @@ usr/share/terminfo/j/jfbterm #usr/share/terminfo/k/kds7372-w #usr/share/terminfo/k/kermit #usr/share/terminfo/k/kermit-am +#usr/share/terminfo/k/kitty +#usr/share/terminfo/k/kitty+common +#usr/share/terminfo/k/kitty-direct #usr/share/terminfo/k/klone+acs #usr/share/terminfo/k/klone+color #usr/share/terminfo/k/klone+koi8acs @@ -2158,6 +2205,7 @@ usr/share/terminfo/k/konsole #usr/share/terminfo/k/konsole-16color usr/share/terminfo/k/konsole-256color #usr/share/terminfo/k/konsole-base +#usr/share/terminfo/k/konsole-direct #usr/share/terminfo/k/konsole-linux #usr/share/terminfo/k/konsole-solaris #usr/share/terminfo/k/konsole-vt100 @@ -2185,6 +2233,9 @@ usr/share/terminfo/l/linux #usr/share/terminfo/l/linux-koi8r #usr/share/terminfo/l/linux-lat #usr/share/terminfo/l/linux-m +#usr/share/terminfo/l/linux-m1 +#usr/share/terminfo/l/linux-m1b +#usr/share/terminfo/l/linux-m2 #usr/share/terminfo/l/linux-nic #usr/share/terminfo/l/linux-vt #usr/share/terminfo/l/linux2.2 @@ -2246,17 +2297,25 @@ usr/share/terminfo/m/mach-gnu-color #usr/share/terminfo/m/minitel-2 #usr/share/terminfo/m/minitel-2-nam #usr/share/terminfo/m/minitel1 +#usr/share/terminfo/m/minitel1-nb +#usr/share/terminfo/m/minitel12-80 #usr/share/terminfo/m/minitel1b #usr/share/terminfo/m/minitel1b-80 +#usr/share/terminfo/m/minitel1b-nb +#usr/share/terminfo/m/minitel2-80 #usr/share/terminfo/m/minix #usr/share/terminfo/m/minix-1.5 #usr/share/terminfo/m/minix-1.7 #usr/share/terminfo/m/minix-3.0 #usr/share/terminfo/m/minix-old #usr/share/terminfo/m/minix-old-am +#usr/share/terminfo/m/mintty +#usr/share/terminfo/m/mintty+common +#usr/share/terminfo/m/mintty-direct usr/share/terminfo/m/mlterm #usr/share/terminfo/m/mlterm+pcfkeys #usr/share/terminfo/m/mlterm-256color +#usr/share/terminfo/m/mlterm-direct #usr/share/terminfo/m/mlterm2 #usr/share/terminfo/m/mlterm3 #usr/share/terminfo/m/mm314 @@ -2271,6 +2330,7 @@ usr/share/terminfo/m/mlterm #usr/share/terminfo/m/mouse-sun usr/share/terminfo/m/mrxvt #usr/share/terminfo/m/mrxvt-256color +#usr/share/terminfo/m/ms-terminal #usr/share/terminfo/m/ms-vt-utf8 #usr/share/terminfo/m/ms-vt100 #usr/share/terminfo/m/ms-vt100+ @@ -2288,6 +2348,7 @@ usr/share/terminfo/m/mrxvt #usr/share/terminfo/m/mterm-ansi #usr/share/terminfo/m/mvterm #usr/share/terminfo/n +#usr/share/terminfo/n/n7900 #usr/share/terminfo/n/nansi.sys #usr/share/terminfo/n/nansi.sysk #usr/share/terminfo/n/nansisys @@ -2418,14 +2479,18 @@ usr/share/terminfo/n/nsterm #usr/share/terminfo/n/nsterm-acs-m-s #usr/share/terminfo/n/nsterm-acs-s #usr/share/terminfo/n/nsterm-bce +#usr/share/terminfo/n/nsterm-build309 #usr/share/terminfo/n/nsterm-build326 #usr/share/terminfo/n/nsterm-build343 +#usr/share/terminfo/n/nsterm-build361 +#usr/share/terminfo/n/nsterm-build400 #usr/share/terminfo/n/nsterm-c #usr/share/terminfo/n/nsterm-c-7 #usr/share/terminfo/n/nsterm-c-acs #usr/share/terminfo/n/nsterm-c-s #usr/share/terminfo/n/nsterm-c-s-7 #usr/share/terminfo/n/nsterm-c-s-acs +#usr/share/terminfo/n/nsterm-direct #usr/share/terminfo/n/nsterm-m #usr/share/terminfo/n/nsterm-m-7 #usr/share/terminfo/n/nsterm-m-acs @@ -2662,6 +2727,10 @@ usr/share/terminfo/p/putty+fnkeys+vt100 usr/share/terminfo/p/putty+fnkeys+vt400 usr/share/terminfo/p/putty+fnkeys+xterm usr/share/terminfo/p/putty-256color +#usr/share/terminfo/p/putty-m1 +#usr/share/terminfo/p/putty-m1b +#usr/share/terminfo/p/putty-m2 +#usr/share/terminfo/p/putty-noapp usr/share/terminfo/p/putty-sco usr/share/terminfo/p/putty-vt100 #usr/share/terminfo/q @@ -2774,11 +2843,24 @@ usr/share/terminfo/s/screen.gnome usr/share/terminfo/s/screen.konsole usr/share/terminfo/s/screen.konsole-256color usr/share/terminfo/s/screen.linux +#usr/share/terminfo/s/screen.linux-m1 +#usr/share/terminfo/s/screen.linux-m1b +#usr/share/terminfo/s/screen.linux-m2 +#usr/share/terminfo/s/screen.minitel1 +#usr/share/terminfo/s/screen.minitel1-nb +#usr/share/terminfo/s/screen.minitel12-80 +#usr/share/terminfo/s/screen.minitel1b +#usr/share/terminfo/s/screen.minitel1b-80 +#usr/share/terminfo/s/screen.minitel1b-nb +#usr/share/terminfo/s/screen.minitel2-80 usr/share/terminfo/s/screen.mlterm usr/share/terminfo/s/screen.mlterm-256color usr/share/terminfo/s/screen.mrxvt usr/share/terminfo/s/screen.putty usr/share/terminfo/s/screen.putty-256color +#usr/share/terminfo/s/screen.putty-m1 +#usr/share/terminfo/s/screen.putty-m1b +#usr/share/terminfo/s/screen.putty-m2 usr/share/terminfo/s/screen.rxvt usr/share/terminfo/s/screen.teraterm usr/share/terminfo/s/screen.vte @@ -2789,6 +2871,8 @@ usr/share/terminfo/s/screen.xterm-r6 usr/share/terminfo/s/screen.xterm-xfree86 usr/share/terminfo/s/screen2 usr/share/terminfo/s/screen3 +#usr/share/terminfo/s/screen4 +#usr/share/terminfo/s/screen5 #usr/share/terminfo/s/screwpoint #usr/share/terminfo/s/scrhp #usr/share/terminfo/s/sibo @@ -2799,8 +2883,12 @@ usr/share/terminfo/s/screen3 #usr/share/terminfo/s/soroc140 #usr/share/terminfo/s/spinwriter #usr/share/terminfo/s/st +#usr/share/terminfo/s/st-0.6 +#usr/share/terminfo/s/st-0.7 +#usr/share/terminfo/s/st-0.8 #usr/share/terminfo/s/st-16color #usr/share/terminfo/s/st-256color +#usr/share/terminfo/s/st-direct #usr/share/terminfo/s/st52 #usr/share/terminfo/s/st52-color #usr/share/terminfo/s/st52-m @@ -2901,15 +2989,24 @@ usr/share/terminfo/s/sun #usr/share/terminfo/t/teleray #usr/share/terminfo/t/teletec usr/share/terminfo/t/teraterm +#usr/share/terminfo/t/teraterm-256color usr/share/terminfo/t/teraterm2.3 #usr/share/terminfo/t/teraterm4.59 +#usr/share/terminfo/t/teraterm4.97 #usr/share/terminfo/t/terminator #usr/share/terminfo/t/terminet #usr/share/terminfo/t/terminet1200 #usr/share/terminfo/t/terminet300 #usr/share/terminfo/t/terminology +#usr/share/terminfo/t/terminology-0.6.1 +#usr/share/terminfo/t/terminology-1.0.0 +#usr/share/terminfo/t/termite #usr/share/terminfo/t/tgtelnet #usr/share/terminfo/t/ti700 +#usr/share/terminfo/t/ti703 +#usr/share/terminfo/t/ti703-w +#usr/share/terminfo/t/ti707 +#usr/share/terminfo/t/ti707-w #usr/share/terminfo/t/ti733 #usr/share/terminfo/t/ti735 #usr/share/terminfo/t/ti745 @@ -3133,6 +3230,9 @@ usr/share/terminfo/t/teraterm2.3 #usr/share/terminfo/v/vi55 #usr/share/terminfo/v/vi550 #usr/share/terminfo/v/vi603 +#usr/share/terminfo/v/viewdata +#usr/share/terminfo/v/viewdata-o +#usr/share/terminfo/v/viewdata-rv #usr/share/terminfo/v/viewpoint #usr/share/terminfo/v/viewpoint3a+ #usr/share/terminfo/v/viewpoint60 @@ -3155,10 +3255,13 @@ usr/share/terminfo/t/teraterm2.3 #usr/share/terminfo/v/vs100 #usr/share/terminfo/v/vs100-x10 #usr/share/terminfo/v/vsc +#usr/share/terminfo/v/vscode +#usr/share/terminfo/v/vscode-direct #usr/share/terminfo/v/vt-61 #usr/share/terminfo/v/vt-utf8 usr/share/terminfo/v/vt100 #usr/share/terminfo/v/vt100+ +#usr/share/terminfo/v/vt100+4bsd #usr/share/terminfo/v/vt100+enq #usr/share/terminfo/v/vt100+fnkeys #usr/share/terminfo/v/vt100+keypad @@ -3220,6 +3323,7 @@ usr/share/terminfo/v/vt220 #usr/share/terminfo/v/vt400 #usr/share/terminfo/v/vt400-24 #usr/share/terminfo/v/vt420 +#usr/share/terminfo/v/vt420+lrmm #usr/share/terminfo/v/vt420f #usr/share/terminfo/v/vt420pc #usr/share/terminfo/v/vt420pcdos @@ -3240,7 +3344,10 @@ usr/share/terminfo/v/vte #usr/share/terminfo/v/vte-2008 #usr/share/terminfo/v/vte-2012 #usr/share/terminfo/v/vte-2014 +#usr/share/terminfo/v/vte-2017 +#usr/share/terminfo/v/vte-2018 usr/share/terminfo/v/vte-256color +#usr/share/terminfo/v/vte-direct #usr/share/terminfo/v/vtnt #usr/share/terminfo/v/vv100 usr/share/terminfo/v/vwmterm @@ -3554,10 +3661,18 @@ usr/share/terminfo/x/xterm #usr/share/terminfo/x/xterm+256color #usr/share/terminfo/x/xterm+256setaf #usr/share/terminfo/x/xterm+88color +#usr/share/terminfo/x/xterm+alt+title +#usr/share/terminfo/x/xterm+alt1049 #usr/share/terminfo/x/xterm+app +#usr/share/terminfo/x/xterm+direct +#usr/share/terminfo/x/xterm+direct2 #usr/share/terminfo/x/xterm+edit +#usr/share/terminfo/x/xterm+indirect #usr/share/terminfo/x/xterm+kbs +#usr/share/terminfo/x/xterm+keypad +#usr/share/terminfo/x/xterm+noalt #usr/share/terminfo/x/xterm+noapp +#usr/share/terminfo/x/xterm+osc104 #usr/share/terminfo/x/xterm+pc+edit #usr/share/terminfo/x/xterm+pcc0 #usr/share/terminfo/x/xterm+pcc1 @@ -3574,6 +3689,7 @@ usr/share/terminfo/x/xterm #usr/share/terminfo/x/xterm+sm+1003 #usr/share/terminfo/x/xterm+sm+1005 #usr/share/terminfo/x/xterm+sm+1006 +#usr/share/terminfo/x/xterm+titlestack #usr/share/terminfo/x/xterm+tmux #usr/share/terminfo/x/xterm+vt+edit #usr/share/terminfo/x/xterm+x10mouse @@ -3591,7 +3707,10 @@ usr/share/terminfo/x/xterm-8bit usr/share/terminfo/x/xterm-basic usr/share/terminfo/x/xterm-bold usr/share/terminfo/x/xterm-color +#usr/share/terminfo/x/xterm-direct +#usr/share/terminfo/x/xterm-direct2 usr/share/terminfo/x/xterm-hp +#usr/share/terminfo/x/xterm-mono usr/share/terminfo/x/xterm-new usr/share/terminfo/x/xterm-nic usr/share/terminfo/x/xterm-noapp @@ -3615,6 +3734,7 @@ usr/share/terminfo/x/xterm-xf86-v43 usr/share/terminfo/x/xterm-xf86-v44 usr/share/terminfo/x/xterm-xfree86 usr/share/terminfo/x/xterm-xi +#usr/share/terminfo/x/xterm.js #usr/share/terminfo/x/xterm1 #usr/share/terminfo/x/xtermc #usr/share/terminfo/x/xtermm diff --git a/lfs/ncurses b/lfs/ncurses index ba5afcefd..1c8e9d076 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 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 # @@ -24,7 +24,7 @@ include Config -VER = 6.0 +VER = 6.2 THISAPP = ncurses-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -58,7 +58,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1 +$(DL_FILE)_MD5 = e812da327b1c2214ac1aed440ea3ae8d install : $(TARGET) -- 2.18.0

2 1

[PATCH] consort.sh: Shebang-Typo
by Matthias Fischer 25 Mar '20

25 Mar '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- src/scripts/consort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/consort.sh b/src/scripts/consort.sh index 1682f7ac4..ba6631f74 100644 --- a/src/scripts/consort.sh +++ b/src/scripts/consort.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash ############################################################################### # # # IPFire.org - A linux based firewall # -- 2.18.0

2 1

[PATCH] nano: Update to 4.9
by Matthias Fischer 25 Mar '20

25 Mar '20

For details see: https://www.nano-editor.org/news.php Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/nano | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/nano b/lfs/nano index b37d80cdf..5bb20cb79 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 4.7 +VER = 4.9 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 28 +PAK_VER = 29 -DEPS = +DEPS = "" ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8622b7b733dc5d9645f5ceaec24e6ba6 +$(DL_FILE)_MD5 = 280c9b40b1c6984a644467a2346a8536 install : $(TARGET) @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### -- 2.18.0

2 2

[PATCH 1/2] Current system time in WebUI Footer
by Stephan Mending 23 Mar '20

23 Mar '20

These changes add the current system time to the footer of the webinterface. Because of differing themes one has to differentiate between legacy themes (ipfire-legacy, darkdos, maniac) and the current standard (ipfire, ipfire-rounded). --- html/html/themes/darkdos/include/functions.pl | 4 ++ .../themes/ipfire-legacy/include/functions.pl | 36 ++++++++------- html/html/themes/ipfire/include/functions.pl | 33 +++++++------ html/html/themes/maniac/include/functions.pl | 46 ++++++++++--------- 4 files changed, 67 insertions(+), 52 deletions(-) diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl index ed3f546b0..9f3547237 100644 --- a/html/html/themes/darkdos/include/functions.pl +++ b/html/html/themes/darkdos/include/functions.pl @@ -19,6 +19,8 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print <<EOF <div id="menu"> @@ -322,6 +324,7 @@ END sub closepage () { my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; $uptime =~ s/year(s|)/$Lang::tr{'year'}/; $uptime =~ s/month(s|)/$Lang::tr{'month'}/; @@ -354,6 +357,7 @@ print <<END <br /> <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + <b>time:</b> $localtime_now END ; diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl index 26a8763c1..3ce62ea41 100644 --- a/html/html/themes/ipfire-legacy/include/functions.pl +++ b/html/html/themes/ipfire-legacy/include/functions.pl @@ -19,6 +19,8 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print <<EOF <div id="menu"> @@ -321,14 +323,15 @@ END } sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - + my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print <<END </div> </div> @@ -341,19 +344,20 @@ END &showsubsection($menu); &showsubsubsection($menu); - print <<END - </div> - </div> - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b> $uptime + print <<END + </div> + </div> + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { -print <<END +print <<END <br /> <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + <b>time:</b> $localtime_now END ; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 9aec77497..9e3063476 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -32,6 +32,7 @@ ############################################################################### require "${General::swroot}/lang.pl"; +use POSIX; ############################################################################### # @@ -194,29 +195,31 @@ sub openpagewithoutmenu { # print page closing html layout sub closepage () { - open(FILE, "</etc/system-release"); - my $system_release = <FILE>; - $system_release =~ s/core/Core Update /; - close(FILE); + open(FILE, "</etc/system-release"); + my $system_release = <FILE>; + $system_release =~ s/core/Core Update /; + close(FILE); + $localtime_now = strftime "%H:%M:%S", localtime; print <<END; - </div> - </div> - - <div id="footer" class='bigbox fixed'> - <span class="pull-right"> - <a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> • - <a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a> - </span> - - <strong>$system_release</strong> - </div> + </div> + </div> + + <div id="footer" class='bigbox fixed'> + <span class="pull-right"> + <a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> • + <a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a> + </span> + <strong>$system_release</strong> + <strong> - $localtime_now<strong> + </div> </body> </html> END ; } + ############################################################################### # # print big box opening html layout diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 1c0aea1c4..c50357070 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -19,6 +19,8 @@ # # ############################################################################### +use POSIX; + sub showmenu() { print <<EOF <div id="menu"> @@ -321,39 +323,41 @@ END } sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - + my $status = &connectionstatus(); + my $localtime_now = strftime "%H:%M:%S", localtime; + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print <<END - </div> - </div> + </div> + </div> - <div id="secondaryContent_2columns"> - - <div id="columnC_2columns"> + <div id="secondaryContent_2columns"> + + <div id="columnC_2columns"> END ; &showsubsection($menu); &showsubsubsection($menu); - print <<END - </div> - </div> - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b> $uptime + print <<END + </div> + </div> + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { -print <<END +print <<END <br /> <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + <b>time:</b> $localtime_now END ; -- 2.20.1

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2020