Development November 2020

development@lists.ipfire.org

20 participants
71 discussions

Quick reminder for patch #3625
by Peter Müller 11 Nov '20

11 Nov '20

Hello development folks, just a short reminder to whoever is in charge of merging Core Update 153 together (Michael?): Please do not forget to include patch #3625 (https://patchwork.ipfire.org/patch/3625/) as well, as it contains a fix for the location filter on dial-up machines. Thanks, and best regards, Peter Müller

2 1

[PATCH 1/4] location-functions.pl: add functions for fetching AS information
by Peter Müller 11 Nov '20

11 Nov '20

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/cfgroot/location-functions.pl | 68 +++++++++++++++++++--------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index 2cfe7f908..ee03a6611 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -1,25 +1,23 @@ #!/usr/bin/perl -w -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 - 2020 IPFire Team <info(a)ipfire.org>. # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### package Location::Functions; @@ -83,7 +81,7 @@ sub verify ($) { } # -## Function to the the country code of a given address. +## Function to get the country code of a given address. # sub lookup_country_code($$) { my ($db_handle, $address) = @_; @@ -221,4 +219,30 @@ sub address_has_flags($) { return @flags; } +# +## Function to get the Autonomous System Number of a given address. +# +sub lookup_asn($$) { + my ($db_handle, $address) = @_; + + # Lookup the given address. + my $asn = &Location::lookup_asn($db_handle, $address); + + # Return the number of the Autonomous System + return $asn; +} + +# +## Function to get the name of an Autonomous System. +# +sub get_as_name($$) { + my ($db_handle, $asn) = @_; + + # Fetch the name of this AS... + my $as_name = &Location::get_as_name($db_handle, $asn); + + # Return the name of the Autonomous System + return $as_name; +} + 1; -- 2.26.2

2 8

[PATCH v2 1/3] location-functions.pl: add functions for fetching AS information
by Peter Müller 11 Nov '20

11 Nov '20

The second version of this patch only unifies the licence banner, but leaves GPLv2 untouched. In addition, functions have been changed to use a script-wide location database handle, as introduced in commit b62d7e0cc71cc1ff23d66dd8baf0f5f3c5c7a29b. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/cfgroot/location-functions.pl | 68 +++++++++++++++++++--------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index fdf2c6efe..b7465c5ef 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -1,25 +1,23 @@ #!/usr/bin/perl -w -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 - 2020 IPFire Team <info(a)ipfire.org>. # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 2 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/>. # +# # +############################################################################### package Location::Functions; @@ -86,7 +84,7 @@ sub verify ($) { } # -## Function to the the country code of a given address. +## Function to get the country code of a given address. # sub lookup_country_code($$) { my ($address) = @_; @@ -236,6 +234,32 @@ sub address_has_flags($) { return @flags; } +# +## Function to get the Autonomous System Number of a given address. +# +sub lookup_asn($) { + my ($address) = @_; + + # Lookup the given address. + my $asn = &Location::lookup_asn($db_handle, $address); + + # Return the number of the Autonomous System + return $asn; +} + +# +## Function to get the name of an Autonomous System. +# +sub get_as_name($) { + my ($asn) = @_; + + # Fetch the name of this AS... + my $as_name = &Location::get_as_name($db_handle, $asn); + + # Return the name of the Autonomous System + return $as_name; +} + # Custom END declaration which will be executed when perl # ends, to release the database handle to libloc. END { -- 2.26.2

1 2

[PATCH] spectre-meltdown-checker: update to 0.44
by Peter Müller 11 Nov '20

11 Nov '20

Full changelog as per https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.44 : feat: add support for SRBDS related vulnerabilities feat: add zstd kernel decompression (#370) enh: arm: add experimental support for binary arm images enh: rsb filling: no longer need the 'strings' tool to check for kernel support in live mode fix: fwdb: remove Intel extract tempdir on exit fix: has_vmm: ignore kernel threads when looking for a hypervisor (fixes #278) fix: fwdb: use the commit date as the intel fwdb version fix: fwdb: update Intel's repository URL fix: arm64: cve-2017-5753: kernels 4.19+ use a different nospec macro fix: on CPU parse info under FreeBSD chore: github: add check run on pull requests chore: fwdb: update to v165.20201021+i20200616 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/spectre-meltdown-checker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker index 2bf34f590..063ef727e 100644 --- a/lfs/spectre-meltdown-checker +++ b/lfs/spectre-meltdown-checker @@ -24,7 +24,7 @@ include Config -VER = 0.43 +VER = 0.44 THISAPP = spectre-meltdown-checker-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = spectre-meltdown-checker -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 05cd2e53edbdcccfc072a66fafa4ea38 +$(DL_FILE)_MD5 = 7bfa5b00ce9dc9400887b9bbb9748a22 install : $(TARGET) -- 2.26.2

1 0

[PATCH] kernel: aarch64: enable ahci
by Arne Fitzenreiter 11 Nov '20

11 Nov '20

this is needed to boot on ESXi on arm. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/kernel/kernel.config.aarch64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 2d4934a09..bc389470b 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1819,7 +1819,7 @@ CONFIG_SATA_PMP=y # # Controllers with non-SFF native interface # -# CONFIG_SATA_AHCI is not set +CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=m CONFIG_AHCI_CEVA=m CONFIG_AHCI_MVEBU=m diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 6f76519d0..0961daffe 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9617,6 +9617,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/s2io.h #lib/modules/KVER-ipfire/build/include/config/sata #lib/modules/KVER-ipfire/build/include/config/sata/ahci +#lib/modules/KVER-ipfire/build/include/config/sata/ahci.h #lib/modules/KVER-ipfire/build/include/config/sata/ahci/platform.h #lib/modules/KVER-ipfire/build/include/config/sata/dwc.h #lib/modules/KVER-ipfire/build/include/config/sata/mv.h @@ -17306,7 +17307,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_platform.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_qoriq.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_sunxi.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ata/libahci_platform.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_dwc_460ex.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_mv.ko.xz -- 2.17.1

2 1

[PATCH] intel-microcode: update to 20201110
by Arne Fitzenreiter 11 Nov '20

11 Nov '20

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/rootfiles/common/i586/intel-microcode | 7 +++++++ config/rootfiles/common/x86_64/intel-microcode | 7 +++++++ lfs/intel-microcode | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/i586/intel-microcode b/config/rootfiles/common/i586/intel-microcode index 9b3c50897..3185cd01a 100644 --- a/config/rootfiles/common/i586/intel-microcode +++ b/config/rootfiles/common/i586/intel-microcode @@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03 lib/firmware/intel-ucode/06-55-04 lib/firmware/intel-ucode/06-55-06 lib/firmware/intel-ucode/06-55-07 +lib/firmware/intel-ucode/06-55-0b lib/firmware/intel-ucode/06-56-02 lib/firmware/intel-ucode/06-56-03 lib/firmware/intel-ucode/06-56-04 @@ -82,6 +83,8 @@ lib/firmware/intel-ucode/06-66-03 lib/firmware/intel-ucode/06-7a-01 lib/firmware/intel-ucode/06-7a-08 lib/firmware/intel-ucode/06-7e-05 +lib/firmware/intel-ucode/06-8a-01 +lib/firmware/intel-ucode/06-8c-01 lib/firmware/intel-ucode/06-8e-09 lib/firmware/intel-ucode/06-8e-0a lib/firmware/intel-ucode/06-8e-0b @@ -91,7 +94,11 @@ lib/firmware/intel-ucode/06-9e-0a lib/firmware/intel-ucode/06-9e-0b lib/firmware/intel-ucode/06-9e-0c lib/firmware/intel-ucode/06-9e-0d +lib/firmware/intel-ucode/06-a5-02 +lib/firmware/intel-ucode/06-a5-03 +lib/firmware/intel-ucode/06-a5-05 lib/firmware/intel-ucode/06-a6-00 +lib/firmware/intel-ucode/06-a6-01 lib/firmware/intel-ucode/0f-00-07 lib/firmware/intel-ucode/0f-00-0a lib/firmware/intel-ucode/0f-01-02 diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode index 9b3c50897..3185cd01a 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03 lib/firmware/intel-ucode/06-55-04 lib/firmware/intel-ucode/06-55-06 lib/firmware/intel-ucode/06-55-07 +lib/firmware/intel-ucode/06-55-0b lib/firmware/intel-ucode/06-56-02 lib/firmware/intel-ucode/06-56-03 lib/firmware/intel-ucode/06-56-04 @@ -82,6 +83,8 @@ lib/firmware/intel-ucode/06-66-03 lib/firmware/intel-ucode/06-7a-01 lib/firmware/intel-ucode/06-7a-08 lib/firmware/intel-ucode/06-7e-05 +lib/firmware/intel-ucode/06-8a-01 +lib/firmware/intel-ucode/06-8c-01 lib/firmware/intel-ucode/06-8e-09 lib/firmware/intel-ucode/06-8e-0a lib/firmware/intel-ucode/06-8e-0b @@ -91,7 +94,11 @@ lib/firmware/intel-ucode/06-9e-0a lib/firmware/intel-ucode/06-9e-0b lib/firmware/intel-ucode/06-9e-0c lib/firmware/intel-ucode/06-9e-0d +lib/firmware/intel-ucode/06-a5-02 +lib/firmware/intel-ucode/06-a5-03 +lib/firmware/intel-ucode/06-a5-05 lib/firmware/intel-ucode/06-a6-00 +lib/firmware/intel-ucode/06-a6-01 lib/firmware/intel-ucode/0f-00-07 lib/firmware/intel-ucode/0f-00-0a lib/firmware/intel-ucode/0f-01-02 diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 025a789a5..c94bd6fa7 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@ include Config -VER = 20200616 +VER = 20201110 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b5e2f0cc9db2ed3d2760a5a859a0a387 +$(DL_FILE)_MD5 = 132d927e9fc1ba01d8464ab3560e3ea6 install : $(TARGET) -- 2.17.1

2 1

[PATCH 1/5] location-functions.pl: Use a single script-wide db_handle.
by Stefan Schantl 10 Nov '20

10 Nov '20

Create and use a single script-wide database handle for libloc to prevent from creating multiple ones. This helps saving memory, especially on small systems. Reference #12515. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/cfgroot/location-functions.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index 2cfe7f908..9b1d0bfb5 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -55,6 +55,9 @@ our $keyfile = "$location_dir/signing-key.pem"; # Directory which contains the exported databases. our $xt_geoip_db_directory = "/usr/share/xt_geoip/"; +# Create libloc database handle. +my $db_handle = &init(); + # ## Tiny function to init the location database. # @@ -86,7 +89,7 @@ sub verify ($) { ## Function to the the country code of a given address. # sub lookup_country_code($$) { - my ($db_handle, $address) = @_; + my ($address) = @_; # Lookup the given address. my $country_code = &Location::lookup_country_code($db_handle, $address); @@ -174,9 +177,6 @@ sub get_full_country_name($) { # Function to get all available locations. sub get_locations() { - # Create libloc database handle. - my $db_handle = &init(); - # Get locations which are stored in the location database. my @database_locations = &Location::database_countries($db_handle); @@ -197,9 +197,6 @@ sub address_has_flags($) { # Array to store the flags of the address. my @flags; - # Init libloc database handle. - my $db_handle = &init(); - # Loop through the hash of possible network flags. foreach my $flag (keys(%network_flags)) { # Check if the address has the current flag. -- 2.20.1

3 12

[PATCH] git: Update to version 2.28.0
by Erik 10 Nov '20

10 Nov '20

Several changes s been made since version 2.12.2 . The documentation RelNotes of Git can be found in here --> https://github.com/git/git/tree/master/Documentation/RelNotes . Signed-off-by: Erik <ummeegge(a)ipfire.org> --- config/rootfiles/packages/git | 77 ++++++++++++++++++++++++++----------------- lfs/git | 8 ++--- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 52a2042ee..df159acb4 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -5,25 +5,6 @@ usr/bin/git-shell usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk -usr/lib/perl5/site_perl/5.30.0/Error.pm -#usr/lib/perl5/site_perl/5.30.0/Git -usr/lib/perl5/site_perl/5.30.0/Git.pm -usr/lib/perl5/site_perl/5.30.0/Git/I18N.pm -usr/lib/perl5/site_perl/5.30.0/Git/IndexInfo.pm -usr/lib/perl5/site_perl/5.30.0/Git/SVN -#usr/lib/perl5/site_perl/5.30.0/Git/SVN.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Editor.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Fetcher.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/GlobSpec.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Log.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize/YAML.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Migration.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Prompt.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Ra.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Utils.pm -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git/.packlist #usr/libexec/git-core #usr/libexec/git-core/git usr/libexec/git-core/git-add @@ -37,6 +18,7 @@ usr/libexec/git-core/git-bisect usr/libexec/git-core/git-bisect--helper usr/libexec/git-core/git-blame usr/libexec/git-core/git-branch +usr/libexec/git-core/git-bugreport usr/libexec/git-core/git-bundle usr/libexec/git-core/git-cat-file usr/libexec/git-core/git-check-attr @@ -52,6 +34,7 @@ usr/libexec/git-core/git-clean usr/libexec/git-core/git-clone usr/libexec/git-core/git-column usr/libexec/git-core/git-commit +usr/libexec/git-core/git-commit-graph usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects @@ -70,6 +53,7 @@ usr/libexec/git-core/git-diff-index usr/libexec/git-core/git-diff-tree usr/libexec/git-core/git-difftool usr/libexec/git-core/git-difftool--helper +usr/libexec/git-core/git-env--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch @@ -117,6 +101,7 @@ usr/libexec/git-core/git-mergetool usr/libexec/git-core/git-mergetool--lib usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree +usr/libexec/git-core/git-multi-pack-index usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev usr/libexec/git-core/git-notes @@ -131,11 +116,10 @@ usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport +usr/libexec/git-core/git-range-diff usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase -usr/libexec/git-core/git-rebase--am -usr/libexec/git-core/git-rebase--interactive -usr/libexec/git-core/git-rebase--merge +usr/libexec/git-core/git-rebase--preserve-merges usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-remote @@ -151,6 +135,7 @@ usr/libexec/git-core/git-replace usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset +usr/libexec/git-core/git-restore usr/libexec/git-core/git-rev-list usr/libexec/git-core/git-rev-parse usr/libexec/git-core/git-revert @@ -166,6 +151,7 @@ usr/libexec/git-core/git-show usr/libexec/git-core/git-show-branch usr/libexec/git-core/git-show-index usr/libexec/git-core/git-show-ref +usr/libexec/git-core/git-sparse-checkout usr/libexec/git-core/git-stage usr/libexec/git-core/git-stash usr/libexec/git-core/git-status @@ -173,6 +159,7 @@ usr/libexec/git-core/git-stripspace usr/libexec/git-core/git-submodule usr/libexec/git-core/git-submodule--helper usr/libexec/git-core/git-svn +usr/libexec/git-core/git-switch usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag usr/libexec/git-core/git-unpack-file @@ -201,6 +188,7 @@ usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge usr/libexec/git-core/mergetools/examdiff +usr/libexec/git-core/mergetools/guiffy usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 usr/libexec/git-core/mergetools/gvimdiff3 @@ -209,6 +197,7 @@ usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld usr/libexec/git-core/mergetools/opendiff usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/smerge usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff @@ -223,9 +212,11 @@ usr/share/git-core/templates/description #usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample +usr/share/git-core/templates/hooks/fsmonitor-watchman.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample +usr/share/git-core/templates/hooks/pre-merge-commit.sample usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample usr/share/git-core/templates/hooks/pre-receive.sample @@ -247,6 +238,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/choose_font.tcl #usr/share/git-gui/lib/choose_repository.tcl #usr/share/git-gui/lib/choose_rev.tcl +#usr/share/git-gui/lib/chord.tcl #usr/share/git-gui/lib/class.tcl #usr/share/git-gui/lib/commit.tcl #usr/share/git-gui/lib/console.tcl @@ -308,6 +300,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg #usr/share/gitk/lib/msgs/vi.msg +#usr/share/gitk/lib/msgs/zh_cn.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -318,6 +311,8 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/bg/LC_MESSAGES/git.mo #usr/share/locale/ca/LC_MESSAGES/git.mo #usr/share/locale/de/LC_MESSAGES/git.mo +#usr/share/locale/el/LC_MESSAGES/git.mo +#usr/share/locale/es/LC_MESSAGES/git.mo #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo @@ -325,14 +320,34 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/pt_PT/LC_MESSAGES/git.mo #usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo +#usr/share/locale/tr/LC_MESSAGES/git.mo #usr/share/locale/vi/LC_MESSAGES/git.mo #usr/share/locale/zh_CN/LC_MESSAGES/git.mo -#usr/share/man/man3/Git.3 -#usr/share/man/man3/Git::I18N.3 -#usr/share/man/man3/Git::SVN::Editor.3 -#usr/share/man/man3/Git::SVN::Fetcher.3 -#usr/share/man/man3/Git::SVN::Memoize::YAML.3 -#usr/share/man/man3/Git::SVN::Prompt.3 -#usr/share/man/man3/Git::SVN::Ra.3 -#usr/share/man/man3/Git::SVN::Utils.3 -#usr/share/man/man3/private-Error.3 +#usr/share/locale/zh_TW/LC_MESSAGES/git.mo +#usr/share/perl5 +#usr/share/perl5/FromCPAN +usr/share/perl5/FromCPAN/Error.pm +#usr/share/perl5/FromCPAN/Mail +#usr/share/perl5/FromCPAN/Mail/Address.pm +#usr/share/perl5/Git +usr/share/perl5/Git.pm +usr/share/perl5/Git/I18N.pm +usr/share/perl5/Git/IndexInfo.pm +#usr/share/perl5/Git/LoadCPAN +#usr/share/perl5/Git/LoadCPAN.pm +#usr/share/perl5/Git/LoadCPAN/Error.pm +#usr/share/perl5/Git/LoadCPAN/Mail +#usr/share/perl5/Git/LoadCPAN/Mail/Address.pm +#usr/share/perl5/Git/Packet.pm +usr/share/perl5/Git/SVN +#usr/share/perl5/Git/SVN.pm +#usr/share/perl5/Git/SVN/Editor.pm +#usr/share/perl5/Git/SVN/Fetcher.pm +#usr/share/perl5/Git/SVN/GlobSpec.pm +#usr/share/perl5/Git/SVN/Log.pm +#usr/share/perl5/Git/SVN/Memoize +#usr/share/perl5/Git/SVN/Memoize/YAML.pm +#usr/share/perl5/Git/SVN/Migration.pm +#usr/share/perl5/Git/SVN/Prompt.pm +#usr/share/perl5/Git/SVN/Ra.pm +#usr/share/perl5/Git/SVN/Utils.pm diff --git a/lfs/git b/lfs/git index 86ba8d98d..2928d59e6 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 = 2.12.2 +VER = 2.28.0 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 16 +PAK_VER = 17 DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ad5ae08664c40caf074392abc301cccd +$(DL_FILE)_MD5 = 5fde0206768ed70092d1fcc8f447251a install : $(TARGET) -- 2.12.2

4 4

Fwd: IPS configuration recommendations for IPFire users
by Daniel Weismüller 10 Nov '20

10 Nov '20

Hi all, Peter Müller wrote another great blog article https://blog.ipfire.org/post/ips-configuration-recommendations-for-ipfire-u…. Thank you for that. After reading this one and looking into my IPS logs I had an idea and I would like to hear your opinion about it. If I have activated IPS not only on Red but also on other zones, wouldn't it make sense to be able to split the IPS logs to see faster / easier what happened in which zone? Is this even possible with reasonable effort? - Daniel

1 0

[PATCH] dns.cgi: Cosmetics and customized translations
by Matthias Fischer 07 Nov '20

07 Nov '20

Updated/deleted redundant, unused or missing translation strings for dns.cgi Affected: 'dns', 'dns title', 'dns server', 'dns servers' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/dns.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 -- langs/en/cgi-bin/en.pl | 1 - langs/fr/cgi-bin/fr.pl | 2 -- langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 1 - 9 files changed, 5 insertions(+), 12 deletions(-) diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 0a097e2c0..13dd9d6a0 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -272,7 +272,7 @@ my %dns_servers = (); # Libloc database handle my $libloc_db_handle = &Location::Functions::init(); -&Header::openpage($Lang::tr{'dns'}, 1, ''); +&Header::openpage($Lang::tr{'dns title'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -419,7 +419,7 @@ END # Section to display the configured and used DNS servers. # sub show_nameservers () { - &Header::openbox('100%', 'center', "$Lang::tr{'dns title'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'dns servers'}"); # Determine if we are running in recursor mode my $recursor = 0; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6ad0e02c5..d4dad7652 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -819,7 +819,6 @@ 'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu', 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.', 'dnat address' => 'Firewall-Interface', -'dns' => 'Domain Name System', 'dns address deleted' => 'Erfolgreich gelöscht! ', 'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.', 'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.', @@ -848,7 +847,6 @@ 'dns recursor mode' => 'Recursor-Modus', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert. Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS-Server', 'dns title' => 'Domain Name System', 'dns tls hostname' => 'TLS-Hostname', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d00de3d03..19a5eb02f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -870,7 +870,6 @@ 'dns recursor mode' => 'Recursor Mode', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully. You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dns tls hostname' => 'TLS Hostname', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 00328440d..b5232db8c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -847,7 +847,6 @@ 'dmz pinhole rule removed' => 'Règle DMZ pinhole supprimée; Redémarrage DMZ pinhole', 'dmzpinholes for same net not necessary' => 'Les DMZ Pinholes ne sont pas forcément dans le même réseau. Choisir différentes sources ou destinations réseau.', 'dnat address' => 'Interface pare-feu', -'dns' => 'Système de noms de domaines', 'dns address deleted' => 'Suppression effectuée !', 'dns address deleted txt' => 'Les adresses du serveur DNS ont été supprimées avec succès. Vous devez redémarrer ou reconnecter pour que les modifications prennent effet !', 'dns address done' => 'Les adresses du serveur DNS vont être sauvegardées.', @@ -877,7 +876,6 @@ 'dns recursor mode' => 'Exécution en mode récursif.', 'dns saved' => 'Sauvegarde effectuée !', 'dns saved txt' => 'La sauvegarde des deux adresses saisies du serveur DNS a été effectée correctement. Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets !', -'dns server' => 'Serveur DNS', 'dns servers' => 'Serveurs DNS', 'dns title' => 'Système de noms de domaine (DNS)', 'dns tls hostname' => 'Nom d\'hôte TLS', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index d0e9dc4c9..ada8887ac 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -764,7 +764,6 @@ 'dns proxy server' => 'DNS Proxy Server', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully. You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Server', 'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dnsforward' => 'Inoltro DNS', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index f67eb0383..bbd5a3f3d 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -754,7 +754,7 @@ 'dns proxy server' => 'DNS Proxy Server', 'dns saved' => 'Succesvol opgeslagen!', 'dns saved txt' => 'De twee ingevoerde DNS serveradressen zijn succesvol opgeslagen. U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!', -'dns server' => 'DNS Server', +'dns servers' => 'DNS Server', 'dns title' => 'Domein Naam Systeem', 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Voeg een nieuwe regel toe', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 3f4fc0143..e85173021 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -686,7 +686,7 @@ 'dns proxy server' => 'Serwer Proxy DNS', 'dns saved' => 'Zapisano poprawnie!', 'dns saved txt' => 'Podane adresy serwerów DNS zostały poprawnie zapisane. Należy wykonać restart lub wykonać ponowne łączenie, aby zmiany zostały zastosowane!', -'dns server' => 'Serwer DNS', +'dns servers' => 'Serwer DNS', 'dns title' => 'Domain Name System', 'do not log this port list' => 'Odrzucaj tą listę portów zanim zostaną zapisane do logu (zmniejsza rozmiar logów)', 'dod' => 'Łącz na żądanie', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2c91a3fee..371394474 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -682,7 +682,7 @@ 'dns proxy server' => 'DNS Proxy Сервер', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully. You have to reboot or reconnect that the changes have effect!', -'dns server' => 'DNS Сервер', +'dns servers' => 'DNS Сервер', 'dns title' => 'Domain Name System', 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)', 'dod' => 'Dial on Demand', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index b958d63fe..da868a312 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -836,7 +836,6 @@ 'dns proxy server' => 'DNS Vekil Sunucusu', 'dns saved' => 'Başarıyla kaydedildi!', 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi. Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!', -'dns server' => 'DNS Sunucusu', 'dns servers' => 'DNS sunucuları', 'dns title' => 'Etki Alanı Ad Sistemi', 'dnsforward' => 'DNS Yönlendirmesi', -- 2.25.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development November 2020