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 e8ecc81a70f504430f2f0791789de4778f938fe3 (commit) via 5fa842475cd1059b2c1ddf6a7bcfbd7830ad7bd2 (commit) via 1e036ee90d098ab3dc62b2478dd2ce67b54a05e9 (commit) via c2773f237192aac6d4ff296c46cb32cb5f4aab00 (commit) via a260df361f462a3ed908f7105c1ac7883a5f7327 (commit) via 5c33a76135106614591684668bfe76f0ba8cdbff (commit) via fc31c28d5c1d54a81991a77fda7efbc482f04565 (commit) via 8797526d36e432aed406f6b5d8091358c30d2720 (commit) via 96d0c76154fe1b52796517afa7afe23f1d888638 (commit) via 4a388bc9f08909bd95831a7fc00b643a72a7360d (commit) via 8a4495a41f9bef41bb8e2c87cdd6556869bcd03e (commit) from 7adacda04c2ca766bd25ac62aa17cdbeadaa1abc (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 e8ecc81a70f504430f2f0791789de4778f938fe3 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Nov 26 19:27:33 2020 +0100

logwatch: Disable iptables output in summary.dat, fixes #12533

This patch disables the output of 'iptables' in 'summary.dat' by modifying '/usr/share/conf/logwatch.conf'.

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 5fa842475cd1059b2c1ddf6a7bcfbd7830ad7bd2 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Nov 27 15:50:49 2020 +0000

core153: Ship knot

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 1e036ee90d098ab3dc62b2478dd2ce67b54a05e9 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Nov 26 18:36:53 2020 +0100

knot: Update to 3.0.2

for details see: https://www.knot-dns.cz/2020-11-11-version-302.html

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit c2773f237192aac6d4ff296c46cb32cb5f4aab00 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Nov 26 18:34:23 2020 +0100

ghostscript: Update to 9.53.3

For details see: https://www.ghostscript.com/doc/current/History9.htm#Version9.53.3

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit a260df361f462a3ed908f7105c1ac7883a5f7327 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Nov 27 15:49:03 2020 +0000

core153: Ship updated zone configuration page

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 5c33a76135106614591684668bfe76f0ba8cdbff Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Nov 17 07:29:04 2020 +0100

zoneconf.cgi: Add NIC selection highlighting

This improves the usability of the zone configuration by marking assigned NICs in the zone color. The highlighting is initially applied to the static HTML output, and JavaScript is used to follow changes made by the user.

Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit fc31c28d5c1d54a81991a77fda7efbc482f04565 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Nov 17 07:29:03 2020 +0100

zoneconf.cgi: Improve CSS

- Add an element id so that the styling only affects the zone table - Alternating row colors are now generated by CSS, remove unneeded Perl code

Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 8797526d36e432aed406f6b5d8091358c30d2720 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Nov 17 07:29:02 2020 +0100

zoneconf.cgi: Make output HTML 5 standard compliant

This fixes two minor violations of the HTML standard: - <a> elements may not contain nested <button> elements: Replace the button with a simple hyperlink, because it was only used as a link anyway.

- "id" attributes may not contain whitespace: Remove unneeded attribute, use hyphens instead of spaces.

Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 96d0c76154fe1b52796517afa7afe23f1d888638 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Nov 17 07:29:01 2020 +0100

zoneconf.cgi: Clean up HTML output

This adds missing brackets, cleans up the indentation and removes unnecessary CSS.

Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 4a388bc9f08909bd95831a7fc00b643a72a7360d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Nov 27 15:46:39 2020 +0000

libloc: Import changes from upstream

This fixes the segmentation fault on 32 bit systems.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 8a4495a41f9bef41bb8e2c87cdd6556869bcd03e Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Nov 27 15:19:53 2020 +0000

gdb: Build package to be available in the build environment

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/gdb | 63 ++++ config/rootfiles/common/web-user-interface | 1 + config/rootfiles/core/153/filelists/files | 2 + .../{oldcore/128 => core/153}/filelists/knot | 0 config/rootfiles/packages/ghostscript | 403 ++++++++++----------- html/cgi-bin/zoneconf.cgi | 124 +++---- html/html/include/zoneconf.js | 56 +++ lfs/{poppler => gdb} | 23 +- lfs/ghostscript | 8 +- lfs/knot | 4 +- lfs/libloc | 2 +- lfs/logwatch | 1 + make.sh | 1 + src/patches/libloc-0.9.4-upstream.patch | 114 +++++- .../logwatch/logwatch-7.5.4-disable_iptables.patch | 14 + 15 files changed, 515 insertions(+), 301 deletions(-) create mode 100644 config/rootfiles/common/gdb copy config/rootfiles/{oldcore/128 => core/153}/filelists/knot (100%) create mode 100644 html/html/include/zoneconf.js copy lfs/{poppler => gdb} (91%) create mode 100644 src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch

Difference in files: diff --git a/config/rootfiles/common/gdb b/config/rootfiles/common/gdb new file mode 100644 index 000000000..0bb907f5e --- /dev/null +++ b/config/rootfiles/common/gdb @@ -0,0 +1,63 @@ +#usr/bin/gcore +#usr/bin/gdb +#usr/bin/gdb-add-index +#usr/bin/gdbserver +#usr/include/gdb +#usr/include/gdb/jit-reader.h +#usr/lib/libinproctrace.so +#usr/share/gdb/python +#usr/share/gdb/python/gdb +#usr/share/gdb/python/gdb/FrameDecorator.py +#usr/share/gdb/python/gdb/FrameIterator.py +#usr/share/gdb/python/gdb/__init__.py +#usr/share/gdb/python/gdb/command +#usr/share/gdb/python/gdb/command/__init__.py +#usr/share/gdb/python/gdb/command/explore.py +#usr/share/gdb/python/gdb/command/frame_filters.py +#usr/share/gdb/python/gdb/command/pretty_printers.py +#usr/share/gdb/python/gdb/command/prompt.py +#usr/share/gdb/python/gdb/command/type_printers.py +#usr/share/gdb/python/gdb/command/unwinders.py +#usr/share/gdb/python/gdb/command/xmethods.py +#usr/share/gdb/python/gdb/frames.py +#usr/share/gdb/python/gdb/function +#usr/share/gdb/python/gdb/function/__init__.py +#usr/share/gdb/python/gdb/function/as_string.py +#usr/share/gdb/python/gdb/function/caller_is.py +#usr/share/gdb/python/gdb/function/strfns.py +#usr/share/gdb/python/gdb/printer +#usr/share/gdb/python/gdb/printer/__init__.py +#usr/share/gdb/python/gdb/printer/bound_registers.py +#usr/share/gdb/python/gdb/printing.py +#usr/share/gdb/python/gdb/prompt.py +#usr/share/gdb/python/gdb/types.py +#usr/share/gdb/python/gdb/unwinder.py +#usr/share/gdb/python/gdb/xmethod.py +#usr/share/gdb/syscalls +#usr/share/gdb/syscalls/aarch64-linux.xml +#usr/share/gdb/syscalls/amd64-linux.xml +#usr/share/gdb/syscalls/arm-linux.xml +#usr/share/gdb/syscalls/freebsd.xml +#usr/share/gdb/syscalls/gdb-syscalls.dtd +#usr/share/gdb/syscalls/i386-linux.xml +#usr/share/gdb/syscalls/mips-n32-linux.xml +#usr/share/gdb/syscalls/mips-n64-linux.xml +#usr/share/gdb/syscalls/mips-o32-linux.xml +#usr/share/gdb/syscalls/netbsd.xml +#usr/share/gdb/syscalls/ppc-linux.xml +#usr/share/gdb/syscalls/ppc64-linux.xml +#usr/share/gdb/syscalls/s390-linux.xml +#usr/share/gdb/syscalls/s390x-linux.xml +#usr/share/gdb/syscalls/sparc-linux.xml +#usr/share/gdb/syscalls/sparc64-linux.xml +#usr/share/gdb/system-gdbinit +#usr/share/gdb/system-gdbinit/elinos.py +#usr/share/gdb/system-gdbinit/wrs-linux.py +#usr/share/info/annotate.info +#usr/share/info/gdb.info +#usr/share/info/stabs.info +#usr/share/man/man1/gcore.1 +#usr/share/man/man1/gdb-add-index.1 +#usr/share/man/man1/gdb.1 +#usr/share/man/man1/gdbserver.1 +#usr/share/man/man5/gdbinit.5 diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 44856fcc2..3eac4411a 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -308,6 +308,7 @@ srv/web/ipfire/html/images/wakeup.gif srv/web/ipfire/html/images/window-new.png srv/web/ipfire/html/include srv/web/ipfire/html/include/snortupdateutility.js +srv/web/ipfire/html/include/zoneconf.js srv/web/ipfire/html/index.cgi srv/web/ipfire/html/redirect-templates srv/web/ipfire/html/redirect-templates/legacy diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index 2f7edf6c5..0649f85cb 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -20,6 +20,8 @@ srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/zoneconf.cgi +srv/web/ipfire/html/include/zoneconf.js usr/lib/firewall/rules.pl var/ipfire/location-functions.pl var/ipfire/langs diff --git a/config/rootfiles/core/153/filelists/knot b/config/rootfiles/core/153/filelists/knot new file mode 120000 index 000000000..28e96f878 --- /dev/null +++ b/config/rootfiles/core/153/filelists/knot @@ -0,0 +1 @@ +../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript index dd45b5348..983d0b766 100644 --- a/config/rootfiles/packages/ghostscript +++ b/config/rootfiles/packages/ghostscript @@ -25,209 +25,208 @@ usr/bin/ps2ps usr/bin/ps2ps2 usr/bin/unix-lpr.sh #usr/share/doc/ghostscript -#usr/share/doc/ghostscript/9.26 -#usr/share/doc/ghostscript/9.26/API.htm -#usr/share/doc/ghostscript/9.26/C-style.htm -#usr/share/doc/ghostscript/9.26/Commprod.htm -#usr/share/doc/ghostscript/9.26/DLL.htm -#usr/share/doc/ghostscript/9.26/Deprecated.htm -#usr/share/doc/ghostscript/9.26/Develop.htm -#usr/share/doc/ghostscript/9.26/Devices.htm -#usr/share/doc/ghostscript/9.26/Drivers.htm -#usr/share/doc/ghostscript/9.26/Fonts.htm -#usr/share/doc/ghostscript/9.26/GS9_Color_Management.pdf -#usr/share/doc/ghostscript/9.26/History9.htm -#usr/share/doc/ghostscript/9.26/Install.htm -#usr/share/doc/ghostscript/9.26/Language.htm -#usr/share/doc/ghostscript/9.26/Lib.htm -#usr/share/doc/ghostscript/9.26/Make.htm -#usr/share/doc/ghostscript/9.26/News.htm -#usr/share/doc/ghostscript/9.26/Ps-style.htm -#usr/share/doc/ghostscript/9.26/Ps2epsi.htm -#usr/share/doc/ghostscript/9.26/Psfiles.htm -#usr/share/doc/ghostscript/9.26/Readme.htm -#usr/share/doc/ghostscript/9.26/Release.htm -#usr/share/doc/ghostscript/9.26/SavedPages.htm -#usr/share/doc/ghostscript/9.26/Source.htm -#usr/share/doc/ghostscript/9.26/Unix-lpr.htm -#usr/share/doc/ghostscript/9.26/Use.htm -#usr/share/doc/ghostscript/9.26/VectorDevices.htm -#usr/share/doc/ghostscript/9.26/WhatIsGS.htm -#usr/share/doc/ghostscript/9.26/gdevds32.c -#usr/share/doc/ghostscript/9.26/gs-style.css -#usr/share/doc/ghostscript/9.26/images -#usr/share/doc/ghostscript/9.26/images/Artifex_logo.png -#usr/share/doc/ghostscript/9.26/images/favicon.png -#usr/share/doc/ghostscript/9.26/images/ghostscript_logo.png -#usr/share/doc/ghostscript/9.26/images/hamburger-light.png -#usr/share/doc/ghostscript/9.26/images/x-light.png -#usr/share/doc/ghostscript/9.26/index.html -#usr/share/doc/ghostscript/9.26/index.js -#usr/share/doc/ghostscript/9.26/pscet_status.txt -#usr/share/doc/ghostscript/9.26/sample_downscale_device.htm -#usr/share/doc/ghostscript/9.26/style.css -#usr/share/doc/ghostscript/9.26/subclass.htm -#usr/share/doc/ghostscript/9.26/thirdparty.htm +#usr/share/doc/ghostscript/9.53.3 +#usr/share/doc/ghostscript/9.53.3/API.htm +#usr/share/doc/ghostscript/9.53.3/C-style.htm +#usr/share/doc/ghostscript/9.53.3/COPYING +#usr/share/doc/ghostscript/9.53.3/Commprod.htm +#usr/share/doc/ghostscript/9.53.3/DLL.htm +#usr/share/doc/ghostscript/9.53.3/Deprecated.htm +#usr/share/doc/ghostscript/9.53.3/Develop.htm +#usr/share/doc/ghostscript/9.53.3/Devices.htm +#usr/share/doc/ghostscript/9.53.3/Drivers.htm +#usr/share/doc/ghostscript/9.53.3/Fonts.htm +#usr/share/doc/ghostscript/9.53.3/GS9_Color_Management.pdf +#usr/share/doc/ghostscript/9.53.3/History9.htm +#usr/share/doc/ghostscript/9.53.3/Install.htm +#usr/share/doc/ghostscript/9.53.3/Language.htm +#usr/share/doc/ghostscript/9.53.3/Lib.htm +#usr/share/doc/ghostscript/9.53.3/Make.htm +#usr/share/doc/ghostscript/9.53.3/News.htm +#usr/share/doc/ghostscript/9.53.3/Ps-style.htm +#usr/share/doc/ghostscript/9.53.3/Ps2epsi.htm +#usr/share/doc/ghostscript/9.53.3/Psfiles.htm +#usr/share/doc/ghostscript/9.53.3/Readme.htm +#usr/share/doc/ghostscript/9.53.3/Release.htm +#usr/share/doc/ghostscript/9.53.3/SavedPages.htm +#usr/share/doc/ghostscript/9.53.3/Source.htm +#usr/share/doc/ghostscript/9.53.3/Unix-lpr.htm +#usr/share/doc/ghostscript/9.53.3/Use.htm +#usr/share/doc/ghostscript/9.53.3/VectorDevices.htm +#usr/share/doc/ghostscript/9.53.3/WhatIsGS.htm +#usr/share/doc/ghostscript/9.53.3/gdevds32.c +#usr/share/doc/ghostscript/9.53.3/gs-style.css +#usr/share/doc/ghostscript/9.53.3/images +#usr/share/doc/ghostscript/9.53.3/images/Artifex_logo.png +#usr/share/doc/ghostscript/9.53.3/images/favicon.png +#usr/share/doc/ghostscript/9.53.3/images/ghostscript_logo.png +#usr/share/doc/ghostscript/9.53.3/images/hamburger-light.png +#usr/share/doc/ghostscript/9.53.3/images/x-light.png +#usr/share/doc/ghostscript/9.53.3/index.html +#usr/share/doc/ghostscript/9.53.3/index.js +#usr/share/doc/ghostscript/9.53.3/pscet_status.txt +#usr/share/doc/ghostscript/9.53.3/sample_downscale_device.htm +#usr/share/doc/ghostscript/9.53.3/style.css +#usr/share/doc/ghostscript/9.53.3/subclass.htm +#usr/share/doc/ghostscript/9.53.3/thirdparty.htm #usr/share/ghostscript -#usr/share/ghostscript/9.26 -#usr/share/ghostscript/9.26/lib -#usr/share/ghostscript/9.26/lib/PDFA_def.ps -#usr/share/ghostscript/9.26/lib/PDFX_def.ps -#usr/share/ghostscript/9.26/lib/PM760p.upp -#usr/share/ghostscript/9.26/lib/PM760pl.upp -#usr/share/ghostscript/9.26/lib/PM820p.upp -#usr/share/ghostscript/9.26/lib/PM820pl.upp -#usr/share/ghostscript/9.26/lib/Stc670p.upp -#usr/share/ghostscript/9.26/lib/Stc670pl.upp -#usr/share/ghostscript/9.26/lib/Stc680p.upp -#usr/share/ghostscript/9.26/lib/Stc680pl.upp -#usr/share/ghostscript/9.26/lib/Stc740p.upp -#usr/share/ghostscript/9.26/lib/Stc740pl.upp -#usr/share/ghostscript/9.26/lib/Stc760p.upp -#usr/share/ghostscript/9.26/lib/Stc760pl.upp -#usr/share/ghostscript/9.26/lib/Stc777p.upp -#usr/share/ghostscript/9.26/lib/Stc777pl.upp -#usr/share/ghostscript/9.26/lib/Stp720p.upp -#usr/share/ghostscript/9.26/lib/Stp720pl.upp -#usr/share/ghostscript/9.26/lib/Stp870p.upp -#usr/share/ghostscript/9.26/lib/Stp870pl.upp -#usr/share/ghostscript/9.26/lib/acctest.ps -#usr/share/ghostscript/9.26/lib/align.ps -#usr/share/ghostscript/9.26/lib/bj8.rpd -#usr/share/ghostscript/9.26/lib/bj8gc12f.upp -#usr/share/ghostscript/9.26/lib/bj8hg12f.upp -#usr/share/ghostscript/9.26/lib/bj8oh06n.upp -#usr/share/ghostscript/9.26/lib/bj8pa06n.upp -#usr/share/ghostscript/9.26/lib/bj8pp12f.upp -#usr/share/ghostscript/9.26/lib/bj8ts06n.upp -#usr/share/ghostscript/9.26/lib/bjc6000a1.upp -#usr/share/ghostscript/9.26/lib/bjc6000b1.upp -#usr/share/ghostscript/9.26/lib/bjc610a0.upp -#usr/share/ghostscript/9.26/lib/bjc610a1.upp -#usr/share/ghostscript/9.26/lib/bjc610a2.upp -#usr/share/ghostscript/9.26/lib/bjc610a3.upp -#usr/share/ghostscript/9.26/lib/bjc610a4.upp -#usr/share/ghostscript/9.26/lib/bjc610a5.upp -#usr/share/ghostscript/9.26/lib/bjc610a6.upp -#usr/share/ghostscript/9.26/lib/bjc610a7.upp -#usr/share/ghostscript/9.26/lib/bjc610a8.upp -#usr/share/ghostscript/9.26/lib/bjc610b1.upp -#usr/share/ghostscript/9.26/lib/bjc610b2.upp -#usr/share/ghostscript/9.26/lib/bjc610b3.upp -#usr/share/ghostscript/9.26/lib/bjc610b4.upp -#usr/share/ghostscript/9.26/lib/bjc610b6.upp -#usr/share/ghostscript/9.26/lib/bjc610b7.upp -#usr/share/ghostscript/9.26/lib/bjc610b8.upp -#usr/share/ghostscript/9.26/lib/caption.ps -#usr/share/ghostscript/9.26/lib/cbjc600.ppd -#usr/share/ghostscript/9.26/lib/cbjc800.ppd -#usr/share/ghostscript/9.26/lib/cdj550.upp -#usr/share/ghostscript/9.26/lib/cdj690.upp -#usr/share/ghostscript/9.26/lib/cdj690ec.upp -#usr/share/ghostscript/9.26/lib/cid2code.ps -#usr/share/ghostscript/9.26/lib/dmp_init.ps -#usr/share/ghostscript/9.26/lib/dmp_site.ps -#usr/share/ghostscript/9.26/lib/dnj750c.upp -#usr/share/ghostscript/9.26/lib/dnj750m.upp -#usr/share/ghostscript/9.26/lib/docie.ps -#usr/share/ghostscript/9.26/lib/escp_24.src -#usr/share/ghostscript/9.26/lib/font2pcl.ps -#usr/share/ghostscript/9.26/lib/ghostpdf.ppd -#usr/share/ghostscript/9.26/lib/gs_ce_e.ps -#usr/share/ghostscript/9.26/lib/gs_il2_e.ps -#usr/share/ghostscript/9.26/lib/gs_kanji.ps -#usr/share/ghostscript/9.26/lib/gs_ksb_e.ps -#usr/share/ghostscript/9.26/lib/gs_l.xbm -#usr/share/ghostscript/9.26/lib/gs_l.xpm -#usr/share/ghostscript/9.26/lib/gs_l_m.xbm -#usr/share/ghostscript/9.26/lib/gs_lgo_e.ps -#usr/share/ghostscript/9.26/lib/gs_lgx_e.ps -#usr/share/ghostscript/9.26/lib/gs_m.xbm -#usr/share/ghostscript/9.26/lib/gs_m.xpm -#usr/share/ghostscript/9.26/lib/gs_m_m.xbm -#usr/share/ghostscript/9.26/lib/gs_s.xbm -#usr/share/ghostscript/9.26/lib/gs_s.xpm -#usr/share/ghostscript/9.26/lib/gs_s_m.xbm -#usr/share/ghostscript/9.26/lib/gs_t.xbm -#usr/share/ghostscript/9.26/lib/gs_t.xpm -#usr/share/ghostscript/9.26/lib/gs_t_m.xbm -#usr/share/ghostscript/9.26/lib/gs_wl1_e.ps -#usr/share/ghostscript/9.26/lib/gs_wl2_e.ps -#usr/share/ghostscript/9.26/lib/gs_wl5_e.ps -#usr/share/ghostscript/9.26/lib/gslp.ps -#usr/share/ghostscript/9.26/lib/gsnup.ps -#usr/share/ghostscript/9.26/lib/ht_ccsto.ps -#usr/share/ghostscript/9.26/lib/image-qa.ps -#usr/share/ghostscript/9.26/lib/jispaper.ps -#usr/share/ghostscript/9.26/lib/landscap.ps -#usr/share/ghostscript/9.26/lib/lines.ps -#usr/share/ghostscript/9.26/lib/mkcidfm.ps -#usr/share/ghostscript/9.26/lib/necp2x.upp -#usr/share/ghostscript/9.26/lib/necp2x6.upp -#usr/share/ghostscript/9.26/lib/pdf2dsc.ps -#usr/share/ghostscript/9.26/lib/pf2afm.ps -#usr/share/ghostscript/9.26/lib/pfbtopfa.ps -#usr/share/ghostscript/9.26/lib/ppath.ps -#usr/share/ghostscript/9.26/lib/pphs.ps -#usr/share/ghostscript/9.26/lib/prfont.ps -#usr/share/ghostscript/9.26/lib/printafm.ps -#usr/share/ghostscript/9.26/lib/ps2ai.ps -#usr/share/ghostscript/9.26/lib/ps2epsi.ps -#usr/share/ghostscript/9.26/lib/ras1.upp -#usr/share/ghostscript/9.26/lib/ras24.upp -#usr/share/ghostscript/9.26/lib/ras3.upp -#usr/share/ghostscript/9.26/lib/ras32.upp -#usr/share/ghostscript/9.26/lib/ras4.upp -#usr/share/ghostscript/9.26/lib/ras8m.upp -#usr/share/ghostscript/9.26/lib/rollconv.ps -#usr/share/ghostscript/9.26/lib/s400a1.upp -#usr/share/ghostscript/9.26/lib/s400b1.upp -#usr/share/ghostscript/9.26/lib/sharp.upp -#usr/share/ghostscript/9.26/lib/sipixa6.upp -#usr/share/ghostscript/9.26/lib/st640ih.upp -#usr/share/ghostscript/9.26/lib/st640ihg.upp -#usr/share/ghostscript/9.26/lib/st640p.upp -#usr/share/ghostscript/9.26/lib/st640pg.upp -#usr/share/ghostscript/9.26/lib/st640pl.upp -#usr/share/ghostscript/9.26/lib/st640plg.upp -#usr/share/ghostscript/9.26/lib/stc.upp -#usr/share/ghostscript/9.26/lib/stc1520h.upp -#usr/share/ghostscript/9.26/lib/stc2.upp -#usr/share/ghostscript/9.26/lib/stc200_h.upp -#usr/share/ghostscript/9.26/lib/stc2_h.upp -#usr/share/ghostscript/9.26/lib/stc2s_h.upp -#usr/share/ghostscript/9.26/lib/stc300.upp -#usr/share/ghostscript/9.26/lib/stc300bl.upp -#usr/share/ghostscript/9.26/lib/stc300bm.upp -#usr/share/ghostscript/9.26/lib/stc500p.upp -#usr/share/ghostscript/9.26/lib/stc500ph.upp -#usr/share/ghostscript/9.26/lib/stc600ih.upp -#usr/share/ghostscript/9.26/lib/stc600p.upp -#usr/share/ghostscript/9.26/lib/stc600pl.upp -#usr/share/ghostscript/9.26/lib/stc640p.upp -#usr/share/ghostscript/9.26/lib/stc740ih.upp -#usr/share/ghostscript/9.26/lib/stc800ih.upp -#usr/share/ghostscript/9.26/lib/stc800p.upp -#usr/share/ghostscript/9.26/lib/stc800pl.upp -#usr/share/ghostscript/9.26/lib/stc_h.upp -#usr/share/ghostscript/9.26/lib/stc_l.upp -#usr/share/ghostscript/9.26/lib/stcany.upp -#usr/share/ghostscript/9.26/lib/stcany_h.upp -#usr/share/ghostscript/9.26/lib/stcinfo.ps -#usr/share/ghostscript/9.26/lib/stcolor.ps -#usr/share/ghostscript/9.26/lib/stocht.ps -#usr/share/ghostscript/9.26/lib/traceimg.ps -#usr/share/ghostscript/9.26/lib/traceop.ps -#usr/share/ghostscript/9.26/lib/uninfo.ps -#usr/share/ghostscript/9.26/lib/viewcmyk.ps -#usr/share/ghostscript/9.26/lib/viewgif.ps -#usr/share/ghostscript/9.26/lib/viewjpeg.ps -#usr/share/ghostscript/9.26/lib/viewmiff.ps -#usr/share/ghostscript/9.26/lib/viewpbm.ps -#usr/share/ghostscript/9.26/lib/viewpcx.ps -#usr/share/ghostscript/9.26/lib/viewps2a.ps -#usr/share/ghostscript/9.26/lib/winmaps.ps -#usr/share/ghostscript/9.26/lib/zeroline.ps +#usr/share/ghostscript/9.53.3 +#usr/share/ghostscript/9.53.3/lib +#usr/share/ghostscript/9.53.3/lib/PDFA_def.ps +#usr/share/ghostscript/9.53.3/lib/PDFX_def.ps +#usr/share/ghostscript/9.53.3/lib/PM760p.upp +#usr/share/ghostscript/9.53.3/lib/PM760pl.upp +#usr/share/ghostscript/9.53.3/lib/PM820p.upp +#usr/share/ghostscript/9.53.3/lib/PM820pl.upp +#usr/share/ghostscript/9.53.3/lib/Stc670p.upp +#usr/share/ghostscript/9.53.3/lib/Stc670pl.upp +#usr/share/ghostscript/9.53.3/lib/Stc680p.upp +#usr/share/ghostscript/9.53.3/lib/Stc680pl.upp +#usr/share/ghostscript/9.53.3/lib/Stc740p.upp +#usr/share/ghostscript/9.53.3/lib/Stc740pl.upp +#usr/share/ghostscript/9.53.3/lib/Stc760p.upp +#usr/share/ghostscript/9.53.3/lib/Stc760pl.upp +#usr/share/ghostscript/9.53.3/lib/Stc777p.upp +#usr/share/ghostscript/9.53.3/lib/Stc777pl.upp +#usr/share/ghostscript/9.53.3/lib/Stp720p.upp +#usr/share/ghostscript/9.53.3/lib/Stp720pl.upp +#usr/share/ghostscript/9.53.3/lib/Stp870p.upp +#usr/share/ghostscript/9.53.3/lib/Stp870pl.upp +#usr/share/ghostscript/9.53.3/lib/acctest.ps +#usr/share/ghostscript/9.53.3/lib/align.ps +#usr/share/ghostscript/9.53.3/lib/bj8.rpd +#usr/share/ghostscript/9.53.3/lib/bj8gc12f.upp +#usr/share/ghostscript/9.53.3/lib/bj8hg12f.upp +#usr/share/ghostscript/9.53.3/lib/bj8oh06n.upp +#usr/share/ghostscript/9.53.3/lib/bj8pa06n.upp +#usr/share/ghostscript/9.53.3/lib/bj8pp12f.upp +#usr/share/ghostscript/9.53.3/lib/bj8ts06n.upp +#usr/share/ghostscript/9.53.3/lib/bjc6000a1.upp +#usr/share/ghostscript/9.53.3/lib/bjc6000b1.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a0.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a1.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a2.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a3.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a4.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a5.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a6.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a7.upp +#usr/share/ghostscript/9.53.3/lib/bjc610a8.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b1.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b2.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b3.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b4.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b6.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b7.upp +#usr/share/ghostscript/9.53.3/lib/bjc610b8.upp +#usr/share/ghostscript/9.53.3/lib/caption.ps +#usr/share/ghostscript/9.53.3/lib/cbjc600.ppd +#usr/share/ghostscript/9.53.3/lib/cbjc800.ppd +#usr/share/ghostscript/9.53.3/lib/cdj550.upp +#usr/share/ghostscript/9.53.3/lib/cdj690.upp +#usr/share/ghostscript/9.53.3/lib/cdj690ec.upp +#usr/share/ghostscript/9.53.3/lib/cid2code.ps +#usr/share/ghostscript/9.53.3/lib/dnj750c.upp +#usr/share/ghostscript/9.53.3/lib/dnj750m.upp +#usr/share/ghostscript/9.53.3/lib/docie.ps +#usr/share/ghostscript/9.53.3/lib/font2pcl.ps +#usr/share/ghostscript/9.53.3/lib/ghostpdf.ppd +#usr/share/ghostscript/9.53.3/lib/gs_ce_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_il2_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_kanji.ps +#usr/share/ghostscript/9.53.3/lib/gs_ksb_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_l.xbm +#usr/share/ghostscript/9.53.3/lib/gs_l.xpm +#usr/share/ghostscript/9.53.3/lib/gs_l_m.xbm +#usr/share/ghostscript/9.53.3/lib/gs_lgo_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_lgx_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_m.xbm +#usr/share/ghostscript/9.53.3/lib/gs_m.xpm +#usr/share/ghostscript/9.53.3/lib/gs_m_m.xbm +#usr/share/ghostscript/9.53.3/lib/gs_s.xbm +#usr/share/ghostscript/9.53.3/lib/gs_s.xpm +#usr/share/ghostscript/9.53.3/lib/gs_s_m.xbm +#usr/share/ghostscript/9.53.3/lib/gs_t.xbm +#usr/share/ghostscript/9.53.3/lib/gs_t.xpm +#usr/share/ghostscript/9.53.3/lib/gs_t_m.xbm +#usr/share/ghostscript/9.53.3/lib/gs_wl1_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_wl2_e.ps +#usr/share/ghostscript/9.53.3/lib/gs_wl5_e.ps +#usr/share/ghostscript/9.53.3/lib/gslp.ps +#usr/share/ghostscript/9.53.3/lib/gsnup.ps +#usr/share/ghostscript/9.53.3/lib/ht_ccsto.ps +#usr/share/ghostscript/9.53.3/lib/image-qa.ps +#usr/share/ghostscript/9.53.3/lib/jispaper.ps +#usr/share/ghostscript/9.53.3/lib/landscap.ps +#usr/share/ghostscript/9.53.3/lib/lines.ps +#usr/share/ghostscript/9.53.3/lib/mkcidfm.ps +#usr/share/ghostscript/9.53.3/lib/necp2x.upp +#usr/share/ghostscript/9.53.3/lib/necp2x6.upp +#usr/share/ghostscript/9.53.3/lib/pdf2dsc.ps +#usr/share/ghostscript/9.53.3/lib/pdf_info.ps +#usr/share/ghostscript/9.53.3/lib/pf2afm.ps +#usr/share/ghostscript/9.53.3/lib/pfbtopfa.ps +#usr/share/ghostscript/9.53.3/lib/ppath.ps +#usr/share/ghostscript/9.53.3/lib/pphs.ps +#usr/share/ghostscript/9.53.3/lib/prfont.ps +#usr/share/ghostscript/9.53.3/lib/printafm.ps +#usr/share/ghostscript/9.53.3/lib/ps2ai.ps +#usr/share/ghostscript/9.53.3/lib/ps2epsi.ps +#usr/share/ghostscript/9.53.3/lib/ras1.upp +#usr/share/ghostscript/9.53.3/lib/ras24.upp +#usr/share/ghostscript/9.53.3/lib/ras3.upp +#usr/share/ghostscript/9.53.3/lib/ras32.upp +#usr/share/ghostscript/9.53.3/lib/ras4.upp +#usr/share/ghostscript/9.53.3/lib/ras8m.upp +#usr/share/ghostscript/9.53.3/lib/rollconv.ps +#usr/share/ghostscript/9.53.3/lib/s400a1.upp +#usr/share/ghostscript/9.53.3/lib/s400b1.upp +#usr/share/ghostscript/9.53.3/lib/sharp.upp +#usr/share/ghostscript/9.53.3/lib/sipixa6.upp +#usr/share/ghostscript/9.53.3/lib/st640ih.upp +#usr/share/ghostscript/9.53.3/lib/st640ihg.upp +#usr/share/ghostscript/9.53.3/lib/st640p.upp +#usr/share/ghostscript/9.53.3/lib/st640pg.upp +#usr/share/ghostscript/9.53.3/lib/st640pl.upp +#usr/share/ghostscript/9.53.3/lib/st640plg.upp +#usr/share/ghostscript/9.53.3/lib/stc.upp +#usr/share/ghostscript/9.53.3/lib/stc1520h.upp +#usr/share/ghostscript/9.53.3/lib/stc2.upp +#usr/share/ghostscript/9.53.3/lib/stc200_h.upp +#usr/share/ghostscript/9.53.3/lib/stc2_h.upp +#usr/share/ghostscript/9.53.3/lib/stc2s_h.upp +#usr/share/ghostscript/9.53.3/lib/stc300.upp +#usr/share/ghostscript/9.53.3/lib/stc300bl.upp +#usr/share/ghostscript/9.53.3/lib/stc300bm.upp +#usr/share/ghostscript/9.53.3/lib/stc500p.upp +#usr/share/ghostscript/9.53.3/lib/stc500ph.upp +#usr/share/ghostscript/9.53.3/lib/stc600ih.upp +#usr/share/ghostscript/9.53.3/lib/stc600p.upp +#usr/share/ghostscript/9.53.3/lib/stc600pl.upp +#usr/share/ghostscript/9.53.3/lib/stc640p.upp +#usr/share/ghostscript/9.53.3/lib/stc740ih.upp +#usr/share/ghostscript/9.53.3/lib/stc800ih.upp +#usr/share/ghostscript/9.53.3/lib/stc800p.upp +#usr/share/ghostscript/9.53.3/lib/stc800pl.upp +#usr/share/ghostscript/9.53.3/lib/stc_h.upp +#usr/share/ghostscript/9.53.3/lib/stc_l.upp +#usr/share/ghostscript/9.53.3/lib/stcany.upp +#usr/share/ghostscript/9.53.3/lib/stcany_h.upp +#usr/share/ghostscript/9.53.3/lib/stcinfo.ps +#usr/share/ghostscript/9.53.3/lib/stcolor.ps +#usr/share/ghostscript/9.53.3/lib/stocht.ps +#usr/share/ghostscript/9.53.3/lib/traceimg.ps +#usr/share/ghostscript/9.53.3/lib/traceop.ps +#usr/share/ghostscript/9.53.3/lib/uninfo.ps +#usr/share/ghostscript/9.53.3/lib/viewcmyk.ps +#usr/share/ghostscript/9.53.3/lib/viewgif.ps +#usr/share/ghostscript/9.53.3/lib/viewjpeg.ps +#usr/share/ghostscript/9.53.3/lib/viewmiff.ps +#usr/share/ghostscript/9.53.3/lib/viewpbm.ps +#usr/share/ghostscript/9.53.3/lib/viewpcx.ps +#usr/share/ghostscript/9.53.3/lib/viewps2a.ps +#usr/share/ghostscript/9.53.3/lib/winmaps.ps +#usr/share/ghostscript/9.53.3/lib/zeroline.ps #usr/share/ghostscript/fonts #usr/share/ghostscript/fonts/COPYING #usr/share/ghostscript/fonts/ChangeLog diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index d99a3e611..0914ceb78 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -26,73 +26,66 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl";

-my $css = <<END +my $extraHead = <<END <style> - table { + table#zoneconf { width: 100%; border-collapse: collapse; table-layout: fixed; }

- tr { + #zoneconf tr { height: 4em; }

- tr.thin { - height: 3em; + #zoneconf td { + padding: 5px 10px; + border: 0.5px solid black; + text-align: center; }

- td.narrow { - width: 11em; + /* dark grey header cells */ + #zoneconf td.heading { + background-color: grey; + color: white; + } + #zoneconf td.heading::first-line { + font-weight: bold; + line-height: 1.6; }

- td { - padding: 5px; - padding-left: 10px; - padding-right: 10px; - border: 0.5px solid black; + /* narrow left column */ + #zoneconf tr > td:first-child { + width: 11em; }

- td.slightlygrey { + /* alternating row background color */ + #zoneconf tr:nth-child(2n+3) { background-color: #F0F0F0; }

- td.h { - background-color: grey; - color: white; - font-weight: 800; - } - - td.green { + #zoneconf td.green { background-color: $Header::colourgreen; }

- td.red { + #zoneconf td.red { background-color: $Header::colourred; }

- td.blue { + #zoneconf td.blue { background-color: $Header::colourblue; }

- td.orange { + #zoneconf td.orange { background-color: $Header::colourorange; }

- td.topleft { - background-color: white; + #zoneconf td.topleft { + background-color: $Header::pagecolour; border-top-style: none; border-left-style: none; }

- td.disabled { - background-color: #cccccc; - } - - td.textcenter { - text-align: center; - } - input.vlanid { width: 4em; } @@ -107,11 +100,9 @@ my $css = <<END #submit-container.input { margin-left: auto; } - - button { - margin-top: 1em; - } </style> + +<script src="/include/zoneconf.js"></script> END ;

@@ -162,7 +153,7 @@ foreach (@nics) { } }

-&Header::openpage($Lang::tr{"zoneconf title"}, 1, $css); +&Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead); &Header::openbigbox('100%', 'center');

### Evaluate POST parameters ### @@ -290,7 +281,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { if ($VALIDATE_error) { &Header::openbox('100%', 'left', $Lang::tr{"error"});

- print "$VALIDATE_error<br><a href='/cgi-bin/zoneconf.cgi'><button>$Lang::tr{'ok'}</button></a>"; + print "$VALIDATE_error<br><br><a href='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'back'}</a>\n";

&Header::closebox(); &Header::closebigbox(); @@ -311,9 +302,9 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {

print <<END <form method='post' enctype='multipart/form-data'> - <table> - <tr> - <td class="h narrow topleft" /td> + <table id="zoneconf"> + <tr> + <td class="topleft"></td> END ;

@@ -332,7 +323,7 @@ foreach (@zones) { my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP"));

if ($red_restricted) { - print "<td class='h textcenter $_'>$uc ($red_type)</td>"; + print "\t\t<td class='heading $_'>$uc ($red_type)</td>\n";

next; # We're done here } @@ -350,7 +341,7 @@ foreach (@zones) { }

print <<END - <td class='h textcenter $_'>$uc</br> + <td class='heading $_'>$uc<br> <select name="MODE $uc"> <option value="DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf nicmode default"}</option> <option value="BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf nicmode bridge"}</option> @@ -361,21 +352,21 @@ END ; }

-print "</tr>"; - -my $slightlygrey = ""; +print "\t</tr>\n";

foreach (@nics) { my $mac = $_->[0]; my $nic = $_->[1]; my $wlan = $_->[2];

- print "<tr><td class='h narrow textcenter'>$nic<br>$mac</td>"; + print "\t<tr>\n"; + print "\t\t<td class='heading'>$nic<br>$mac</td>\n";

# Iterate through all zones and check if the current NIC is assigned to it foreach (@zones) { my $uc = uc $_; my $dev_name = $ethsettings{"${uc}_DEV"}; + my $highlight = "";

if ($dev_name eq "") { # Again, skip the zone if it is not activated next; @@ -391,9 +382,15 @@ foreach (@nics) {

if ($mac eq $ethsettings{"${uc}_MACADDR"}) { $checked = "checked"; + $highlight = $_; }

- print "<td class='textcenter $slightlygrey'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>"; + print <<END + <td class="$highlight"> + <input type="radio" name="PPPACCESS" value="$mac" data-zone="RED" data-mac="$mac" onchange="highlightAccess(this)" $checked> + </td> +END +; next; # We're done here } } @@ -431,26 +428,25 @@ foreach (@nics) { $access_selected{"NONE"} = ($access_selected{"NATIVE"} eq "") && ($access_selected{"VLAN"} eq "") ? "selected" : ""; my $vlan_disabled = ($wlan) ? "disabled" : "";

+ # If the interface is assigned, hightlight table cell + if ($access_selected{"NONE"} eq "") { + $highlight = $_; + } + print <<END - <td class="textcenter $slightlygrey"> - <select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)"> - <option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option> - <option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option> - <option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option> - </select> - <input type="number" class="vlanid" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled> - </td> + <td class="$highlight"> + <select name="ACCESS $uc $mac" data-zone="$uc" data-mac="$mac" onchange="highlightAccess(this)"> + <option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option> + <option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option> + <option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option> + </select> + <input type="number" class="vlanid" id="TAG-$uc-$mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled> + </td> END ; }

- print "</tr>"; - - if ($slightlygrey) { - $slightlygrey = ""; - } else { - $slightlygrey = "slightlygrey"; - } + print "\t</tr>\n"; }

print <<END diff --git a/html/html/include/zoneconf.js b/html/html/include/zoneconf.js new file mode 100644 index 000000000..d76f0ab68 --- /dev/null +++ b/html/html/include/zoneconf.js @@ -0,0 +1,56 @@ +/*############################################################################# +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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/. # +# # +#############################################################################*/ + +//zoneconf.cgi dynamic highlighting of interface access selection +//(call this from "onchange" event of selection elements) +function highlightAccess(selectObj) { + if(!(selectObj && ('zone' in selectObj.dataset) && ('mac' in selectObj.dataset))) { + return; //required parameters are missing + } + + var zoneColor = selectObj.dataset.zone.trim().toLowerCase(); //zone color (red/green/blue/orange) CSS class + + function colorParentCell(obj, color, enabled = true) { //find nearest parent table cell of "obj" and set its CSS color class + do { + obj = obj.parentElement; + } while(obj && (obj.nodeName.toUpperCase() !== 'TD')); + if(obj && (['green', 'red', 'orange', 'blue'].includes(color))) { + obj.classList.toggle(color, enabled); + } + } + + //handle other associated input fields + if(selectObj.type.toUpperCase() === 'RADIO') { //this is a radio button group: clear all highlights + let radios = document.getElementsByName(selectObj.name); + radios.forEach(function(button) { + if(button.nodeName.toUpperCase() === 'INPUT') { //make sure the found element is a button + colorParentCell(button, zoneColor, false); //remove css + } + }); + } else { //this is a dropdown menu: enable/disable additional VLAN tag input box + let tagInput = document.getElementById('TAG-' + selectObj.dataset.zone + '-' + selectObj.dataset.mac); //tag input element selector + if(tagInput) { + tagInput.disabled = (selectObj.value !== 'VLAN'); //enable tag input if VLAN mode selected + } + } + + //if interface is assigned, highlight table cell in zone color + colorParentCell(selectObj, zoneColor, (selectObj.value !== 'NONE')); +} diff --git a/lfs/gdb b/lfs/gdb new file mode 100644 index 000000000..88ce5d34e --- /dev/null +++ b/lfs/gdb @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# 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 = 10.1 + +THISAPP = gdb-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1822a7dd45e7813f4408407eec1a6af1 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && \ + ../configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-nls \ + --enable-tui \ + --with-system-readline \ + --with-python=/usr/bin/python3 + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ghostscript b/lfs/ghostscript index 7dd32858e..edf019f5d 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -24,15 +24,15 @@

include Config

-VER = 9.26 +VER = 9.53.3

THISAPP = ghostscript-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ghostscript -PAK_VER = 5 +PAK_VER = 6

DEPS = cups dbus libtiff

@@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz

-$(DL_FILE)_MD5 = 806bc2dedbc7f69b003f536658e08d4a +$(DL_FILE)_MD5 = bf0b41d6e19fdeb4b050afad309248d2 ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6 gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f

diff --git a/lfs/knot b/lfs/knot index e1fb0fac7..4bb8dcbf0 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@

include Config

-VER = 3.0.1 +VER = 3.0.2

THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 7dc32e034bab142c7a0fcf6d531ee881 +$(DL_FILE)_MD5 = c4e18bd1e595cffb185a042522985dec

install : $(TARGET)

diff --git a/lfs/libloc b/lfs/libloc index 65270eb24..010ddf1cb 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -91,7 +91,7 @@ endif --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-manpages + --disable-man-pages cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install

diff --git a/lfs/logwatch b/lfs/logwatch index abf1ba02f..7aa145121 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch

@cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/make.sh b/make.sh index b2c7df50c..3caae9552 100755 --- a/make.sh +++ b/make.sh @@ -1239,6 +1239,7 @@ buildipfire() { lfsmake2 libffi lfsmake2 python lfsmake2 python3 + lfsmake2 gdb lfsmake2 grub lfsmake2 efivar lfsmake2 efibootmgr diff --git a/src/patches/libloc-0.9.4-upstream.patch b/src/patches/libloc-0.9.4-upstream.patch index 79db50903..a224baec2 100644 --- a/src/patches/libloc-0.9.4-upstream.patch +++ b/src/patches/libloc-0.9.4-upstream.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index a0431a6..ebd7e17 100644 +index a0431a6..dc594f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,11 +91,14 @@ EXTRA_DIST += \ @@ -54,8 +54,17 @@ index a0431a6..ebd7e17 100644 src_test_stringpool_SOURCES = \ src/test-stringpool.c

+@@ -390,7 +406,7 @@ MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) + .PHONY: man + man: $(MANPAGES) $(MANPAGES_HTML) + +-if ENABLE_MANPAGES ++if ENABLE_MAN_PAGES + man_MANS = \ + $(MANPAGES) + endif diff --git a/configure.ac b/configure.ac -index 2364dfd..012d8ca 100644 +index 2364dfd..9eb9012 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ @@ -66,6 +75,28 @@ index 2364dfd..012d8ca 100644 [location@lists.ipfire.org], [libloc], [https://location.ipfire.org/]) +@@ -43,16 +43,16 @@ AC_PROG_MKDIR_P + + # - man ------------------------------------------------------------------------ + +-have_manpages=no +-AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages], ++have_man_pages=no ++AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages], + [do not install man pages])) +-AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) +-AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) ++AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes]) ++AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"]) + + AC_PATH_PROG([XSLTPROC], [xsltproc]) + + AC_CHECK_PROGS(ASCIIDOC, [asciidoc]) +-if test "${have_manpages}" = "yes" && test -z "${ASCIIDOC}"; then ++if test "${have_man_pages}" = "yes" && test -z "${ASCIIDOC}"; then + AC_MSG_ERROR([Required program 'asciidoc' not found]) + fi + # - debug ---------------------------------------------------------------------- diff --git a/src/.gitignore b/src/.gitignore index caf80b5..3ccbdb8 100644 --- a/src/.gitignore @@ -456,7 +487,7 @@ index 2ba93e6..7aac0db 100644 if (!c) return -ENOMEM; diff --git a/src/database.c b/src/database.c -index fa1dad0..1871b74 100644 +index fa1dad0..7100298 100644 --- a/src/database.c +++ b/src/database.c @@ -38,8 +38,10 @@ @@ -497,6 +528,20 @@ index fa1dad0..1871b74 100644 };

static int loc_database_read_magic(struct loc_database* db) { +@@ -242,11 +250,11 @@ static int loc_database_read_signature(struct loc_database* db, + char** dst, char* src, size_t length) { + // Check for a plausible signature length + if (length > LOC_SIGNATURE_MAX_LENGTH) { +- ERROR(db->ctx, "Signature too long: %ld\n", length); ++ ERROR(db->ctx, "Signature too long: %zu\n", length); + return -EINVAL; + } + +- DEBUG(db->ctx, "Reading signature of %ld bytes\n", length); ++ DEBUG(db->ctx, "Reading signature of %zu bytes\n", length); + + // Allocate space + *dst = malloc(length); @@ -611,7 +619,7 @@ LOC_EXPORT int loc_database_verify(struct loc_database* db, FILE* f) { }

@@ -1336,10 +1381,10 @@ index 70c3803..af3dafd 100644

diff --git a/src/network-list.c b/src/network-list.c new file mode 100644 -index 0000000..e2b20f3 +index 0000000..698d3ab --- /dev/null +++ b/src/network-list.c -@@ -0,0 +1,295 @@ +@@ -0,0 +1,299 @@ +/* + libloc - A library to determine the location of someone on the Internet + @@ -1476,6 +1521,10 @@ index 0000000..e2b20f3 + +static off_t loc_network_list_find(struct loc_network_list* list, + struct loc_network* network, int* found) { ++ // Insert at the beginning for an empty list ++ if (loc_network_list_empty(list)) ++ return 0; ++ + off_t lo = 0; + off_t hi = list->size - 1; + int result; @@ -2235,7 +2284,7 @@ index dcf3f0d..b7676d2 100644 if (err) { croak("Could not create a database enumerator\n"); diff --git a/src/python/database.c b/src/python/database.c -index 1013a58..f385c61 100644 +index 1013a58..0aa03cc 100644 --- a/src/python/database.c +++ b/src/python/database.c @@ -17,6 +17,8 @@ @@ -2326,7 +2375,7 @@ index 1013a58..f385c61 100644 + return NULL; + } + -+ for (unsigned int i = 0; i < PyList_Size(country_codes); i++) { ++ for (int i = 0; i < PyList_Size(country_codes); i++) { + PyObject* item = PyList_GetItem(country_codes, i); + + if (!PyUnicode_Check(item)) { @@ -2385,7 +2434,7 @@ index 1013a58..f385c61 100644 + return NULL; + } + -+ for (unsigned int i = 0; i < PyList_Size(asn_list); i++) { ++ for (int i = 0; i < PyList_Size(asn_list); i++) { + PyObject* item = PyList_GetItem(asn_list, i); + + if (!PyLong_Check(item)) { @@ -3125,10 +3174,14 @@ index 44ad726..b30beae 100644 with open(ns.public_key, "r") as f: if not db.verify(f): diff --git a/src/python/network.c b/src/python/network.c -index 5496d1e..b6e92fb 100644 +index 5496d1e..5b1369d 100644 --- a/src/python/network.c +++ b/src/python/network.c -@@ -20,10 +20,29 @@ +@@ -17,13 +17,33 @@ + #include <Python.h> + + #include <errno.h> ++#include <limits.h>

#include <loc/libloc.h> #include <loc/network.h> @@ -3158,7 +3211,27 @@ index 5496d1e..b6e92fb 100644 PyObject* new_network(PyTypeObject* type, struct loc_network* network) { NetworkObject* self = (NetworkObject*)type->tp_alloc(type, 0); if (self) { -@@ -154,13 +173,28 @@ static PyObject* Network_set_flag(NetworkObject* self, PyObject* args) { +@@ -114,10 +134,18 @@ static int Network_set_asn(NetworkObject* self, PyObject* value) { + long int asn = PyLong_AsLong(value); + + // Check if the ASN is within the valid range +- if (asn <= 0 || asn > UINT32_MAX) { ++ if (asn <= 0) { ++ PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn); ++ return -1; ++ } ++ ++#if (__WORDSIZE > 32) ++ // Check whether the input was longer than 32 bit ++ if (asn > UINT32_MAX) { + PyErr_Format(PyExc_ValueError, "Invalid ASN %ld", asn); + return -1; + } ++#endif + + int r = loc_network_set_asn(self->network, asn); + if (r) +@@ -154,13 +182,28 @@ static PyObject* Network_set_flag(NetworkObject* self, PyObject* args) { Py_RETURN_NONE; }

@@ -3188,7 +3261,7 @@ index 5496d1e..b6e92fb 100644 Py_RETURN_TRUE;

Py_RETURN_FALSE; -@@ -181,6 +215,26 @@ static PyObject* Network_get_first_address(NetworkObject* self) { +@@ -181,6 +224,26 @@ static PyObject* Network_get_first_address(NetworkObject* self) { return obj; }

@@ -3215,7 +3288,7 @@ index 5496d1e..b6e92fb 100644 static PyObject* Network_get_last_address(NetworkObject* self) { char* address = loc_network_format_last_address(self->network);

-@@ -190,7 +244,19 @@ static PyObject* Network_get_last_address(NetworkObject* self) { +@@ -190,7 +253,19 @@ static PyObject* Network_get_last_address(NetworkObject* self) { return obj; }

@@ -3235,7 +3308,7 @@ index 5496d1e..b6e92fb 100644 { "has_flag", (PyCFunction)Network_has_flag, -@@ -241,6 +307,13 @@ static struct PyGetSetDef Network_getsetters[] = { +@@ -241,6 +316,13 @@ static struct PyGetSetDef Network_getsetters[] = { NULL, NULL, }, @@ -3249,7 +3322,7 @@ index 5496d1e..b6e92fb 100644 { "last_address", (getter)Network_get_last_address, -@@ -248,6 +321,13 @@ static struct PyGetSetDef Network_getsetters[] = { +@@ -248,6 +330,13 @@ static struct PyGetSetDef Network_getsetters[] = { NULL, NULL, }, @@ -3743,7 +3816,7 @@ index d38f13d..dde13f1 100644 // And open it again from disk struct loc_database* db; diff --git a/src/writer.c b/src/writer.c -index 5939cff..2f09b56 100644 +index 5939cff..c61a6df 100644 --- a/src/writer.c +++ b/src/writer.c @@ -147,8 +147,19 @@ static void loc_writer_free(struct loc_writer* writer) { @@ -3768,3 +3841,12 @@ index 5939cff..2f09b56 100644 }

// Release network tree +@@ -601,7 +612,7 @@ static int loc_writer_create_signature(struct loc_writer* writer, + goto END; + } + +- DEBUG(writer->ctx, "Successfully generated signature of %lu bytes\n", *length); ++ DEBUG(writer->ctx, "Successfully generated signature of %zu bytes\n", *length); + r = 0; + + // Dump signature diff --git a/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch new file mode 100644 index 000000000..8ad0c3b3d --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch @@ -0,0 +1,14 @@ +diff -U 3 a/conf/logwatch.conf b/conf/logwatch.conf +--- a/conf/logwatch.conf Thu Sep 19 01:58:55 2019 ++++ b/conf/logwatch.conf Thu Nov 26 18:46:12 2020 +@@ -94,6 +94,10 @@ + # prints useful system configuration info. + Service = "-eximstats" # Prevents execution of eximstats service, which + # is a wrapper for the eximstats program. ++ ++# Disabled: 'iptables' ++Service = "-iptables" ++ + # If you only cared about FTP messages, you could use these 2 lines + # instead of the above: + #Service = ftpd-messages # Processes ftpd messages in /var/log/messages

hooks/post-receive -- IPFire 2.x development tree