[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f64ce4966bd33c4c574697e4f3f114b70ffdb5c0
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 f64ce4966bd33c4c574697e4f3f114b70ffdb5c0 (commit) via 07d9e1914a989911aa01425f6a122d0e465571c7 (commit) via ff9788d2d82001322d677c6b14b841a93673cadf (commit) via fdf3e9a96bb39d6759607e5c66ac7d9c69ed8518 (commit) via 2c0b745abba77f3b7a2a654e0d102456b969f819 (commit) via 1b1fe2f2b12ae2898b57ca417a20c17935c319cf (commit) via 87b18665c0bbeac0e4e661120698c88c416d4d87 (commit) via 6ad43b0f218faa004986fca0c79e1446697c7b27 (commit) via a3b07005c11938f426e208be42cf32bcbc62da31 (commit) via a7e9342c18397f7a0dd93c842171aaa7cccbb612 (commit) via f99fbec2e33c5cb20b462fd4ae06adb688c90bbd (commit) via bd4f0794d24f01d8b7b0fa381225c7311097ae48 (commit) from b5f45d70cc07ccdbe1abc9743b822ef7568572f0 (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 f64ce4966bd33c4c574697e4f3f114b70ffdb5c0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Mar 26 10:09:14 2020 +0000
core143: add localnet initscript
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 07d9e1914a989911aa01425f6a122d0e465571c7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 5 11:45:47 2020 +0000
resolv.conf: Add "trust-ad" option
Since we are running unbound locally which always runs DNSSEC validation, we can simply trust it and pass the ad flag on to applications which make use of it.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ff9788d2d82001322d677c6b14b841a93673cadf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Mar 26 10:04:15 2020 +0000
core143: netother.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fdf3e9a96bb39d6759607e5c66ac7d9c69ed8518 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Mar 21 16:03:00 2020 +0000
netother.cgi: show content of routing table 220
Since IPsec routing information do not show up in the normal routing table, also displaying the contents of table 220 on netother.cgi might be useful for debugging purposes.
The second version of this patch omits the output if routing table 220 is empty and introduces a custom translation for IPsec routing table entries instead of just adding the table number to the generic translation.
Cc: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 2c0b745abba77f3b7a2a654e0d102456b969f819 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Mar 26 10:00:20 2020 +0000
core143: add smartmontools
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1b1fe2f2b12ae2898b57ca417a20c17935c319cf Author: Peter Müller peter.mueller@ipfire.org Date: Sat Mar 21 19:59:00 2020 +0000
smartmontools: update to 7.1
Summary: smartmontools release 7.1 ----------------------------------------------------------- - smartctl: Fixed bogus exception on unknown form factor value (regression). - smartctl '--json=cg': Suppresses extra spaces also in 'g' format. - smartctl '-i': ATA ACS-4 and ACS-5 enhancements. - smartd: No longer truncates very long device names in warning emails. - smartd: No longer skips scheduled tests if system clock has been adjusted to the past. - smartd '-A': Attribute logs now use local time instead of UTC. - ATA: Device type '-d jmb39x,N' for drives behind JMicron JMB39x RAID port multipliers. - SCSI: Workaround for incomplete Log subpages response from some SAS SSDs. - HDD, SSD and USB additions to drive database. - Autodetection of '-d sntjmicron' type for JMicron USB to NVMe bridges. - configure: Defines '_FORTIFY_SOURCE=2' if supported and not defined. - Linux/FreeBSD: Fixed segfault on CCISS transfer sizes > 512 bytes. - Linux: Fixed smartd.service 'Type' if libsystemd-dev is not available. - Linux: Fixed '/dev/megaraid_sas_ioctl_node' fd leak. - Linux: Fixed GPL licensing problem of 'linux_nvme_ioctl.h'. - FreeBSD update-smart-drivedb: Now uses 'fetch' as default download tool. - FreeBSD big endian: Fixed NVMe access. - FreeBSD: Compile fix for FreeBSD 12. - NetBSD: Fixed device scan crash on empty name list. - NetBSD: Fixed memory leak in device scan. - Windows: Fixed log page access via Windows 10 NVMe driver for NVMe 1.2.1+. - Windows: Allow drive letters as device names for Windows 10 NVMe driver. - Windows: Workround to allow CSMI access to devices behind AMD RAID drivers. - Windows: Fixed MinGW options to add relocation info if ASLR is enabled. - Windows wtssendmsg: No longer writes '\n' line endings to event log. - Windows wtssendmsg: New options '-t' and '-w'.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 87b18665c0bbeac0e4e661120698c88c416d4d87 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Mar 26 09:45:17 2020 +0000
core143: add ovpnmain.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6ad43b0f218faa004986fca0c79e1446697c7b27 Author: Erik Kapfer ummeegge@ipfire.org Date: Tue Mar 24 11:29:05 2020 +0100
OpenVPN: Stop N2N connection before remove.
Fix #12334
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a3b07005c11938f426e208be42cf32bcbc62da31 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Mar 25 07:35:38 2020 +0100
collectd: run sensors-detect in background
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@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a7e9342c18397f7a0dd93c842171aaa7cccbb612 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Mar 25 12:38:02 2020 +0100
ncurses: Update to 6.2
For details see: https://invisible-island.net/ncurses/announce.html#h2-release-notes
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f99fbec2e33c5cb20b462fd4ae06adb688c90bbd Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Mar 25 12:51:07 2020 +0100
nano: Update to 4.9
For details see: https://www.nano-editor.org/news.php
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bd4f0794d24f01d8b7b0fa381225c7311097ae48 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Mar 25 12:54:20 2020 +0100
consort.sh: Shebang-Typo
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/ncurses | 128 ++++++++++++++++++++- config/rootfiles/core/143/filelists/files | 5 +- .../106 => core/143}/filelists/smartmontools | 0 html/cgi-bin/netother.cgi | 8 ++ html/cgi-bin/ovpnmain.cgi | 2 +- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/nano | 10 +- lfs/ncurses | 6 +- lfs/smartmontools | 7 +- src/initscripts/system/collectd | 56 ++++++--- src/initscripts/system/localnet | 1 + src/patches/smartmontools-6.5-exit_segfault.patch | 16 --- src/scripts/consort.sh | 2 +- 14 files changed, 189 insertions(+), 54 deletions(-) copy config/rootfiles/{oldcore/106 => core/143}/filelists/smartmontools (100%) mode change 100644 => 100755 html/cgi-bin/netother.cgi delete mode 100644 src/patches/smartmontools-6.5-exit_segfault.patch
Difference in files: 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/config/rootfiles/core/143/filelists/files b/config/rootfiles/core/143/filelists/files index 6ecdbdb4d..e5edae10f 100644 --- a/config/rootfiles/core/143/filelists/files +++ b/config/rootfiles/core/143/filelists/files @@ -1,7 +1,10 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi -usr/lib/firewall/rules.pl var/ipfire/langs +etc/rc.d/init.d/localnet srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/fireinfo.cgi +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/lib/firewall/rules.pl diff --git a/config/rootfiles/core/143/filelists/smartmontools b/config/rootfiles/core/143/filelists/smartmontools new file mode 120000 index 000000000..fb66dafef --- /dev/null +++ b/config/rootfiles/core/143/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi old mode 100644 new mode 100755 index dde1b603a..4f03c82e8 --- a/html/cgi-bin/netother.cgi +++ b/html/cgi-bin/netother.cgi @@ -79,6 +79,14 @@ if ( $querry[0] =~ "fwhits"){ print "<pre>$output</pre>\n"; &Header::closebox();
+ $output = `/sbin/ip route list table 220`; + if ( $output ) { + &Header::openbox('100%', 'left', $Lang::tr{'ipsec routing table entries'}); + $output = &Header::cleanhtml($output,"y"); + print "<pre>$output</pre>\n"; + &Header::closebox() + } + &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'}); $output = `/sbin/ip neigh show`; $output = &Header::cleanhtml($output,"y"); 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"); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index bf43357b9..be6daa3ea 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1525,6 +1525,7 @@ 'ipsec mode tunnel' => 'Tunnel', 'ipsec network' => 'IPsec-Netzwerk', 'ipsec no connections' => 'Keine aktiven IPsec-Verbindungen', +'ipsec routing table entries' => 'Einträge der IPsec-Routing-Tabelle', 'ipsec settings' => 'IPsec-Einstellungen', 'iptable rules' => 'IPTable-Regeln', 'iptmangles' => 'IPTable Mangles', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a68c8f411..1e1aed53c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1547,6 +1547,7 @@ 'ipsec mode tunnel' => 'Tunnel', 'ipsec network' => 'IPsec network', 'ipsec no connections' => 'No active IPsec connections', +'ipsec routing table entries' => 'IPsec Routing Table Entries', 'ipsec settings' => 'IPsec Settings', 'iptable rules' => 'IPTable rules', 'iptmangles' => 'IPTable Mangles', 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)
############################################################################### 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@ipfire.org # +# Copyright (C) 2007-2019 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,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)
diff --git a/lfs/smartmontools b/lfs/smartmontools index 2c3fd39d8..98f6a5eca 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 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,7 +24,7 @@
include Config
-VER = 6.6 +VER = 7.1
THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ae2c6e7131cd2813edcc65cbe5f223f +$(DL_FILE)_MD5 = 430cd5f64caa4524018b536e5ecd9c29
install : $(TARGET)
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/smartmontools-6.5-exit_segfault.patch cd $(DIR_APP) && autoreconf cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make BUILD_INFO='"($(NAME) $(VERSION))"' $(MAKETUNING) 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 diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index a16b32e46..0d01bd300 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -19,6 +19,7 @@ write_resolv_conf() { ( [ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}" echo "nameserver 127.0.0.1" + echo "options trust-ad" ) > /etc/resolv.conf }
diff --git a/src/patches/smartmontools-6.5-exit_segfault.patch b/src/patches/smartmontools-6.5-exit_segfault.patch deleted file mode 100644 index 6c5df8aac..000000000 --- a/src/patches/smartmontools-6.5-exit_segfault.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/utility.h Sun Apr 24 16:59:15 2016 -+++ b/utility.h Sat Aug 20 22:40:33 2016 -@@ -97,7 +97,11 @@ - - // Replacement for exit(status) - // (exit is not compatible with C++ destructors) --#define EXIT(status) { throw (int)(status); } -+ -+//This doesn't work on IPFire. -+//#define EXIT(status) { throw (int)(status); } -+//tried to use exit and found no problems yet -+#define EXIT(status) { exit ((int)(status)); } - - // Compile time check of byte ordering - // (inline const function allows compiler to remove dead code) - 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 #
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter