Development June 2019

development@lists.ipfire.org

14 participants
77 discussions

[PATCH] BUG11695: Adding/editing rules with preset broken
by Alexander Marx 15 Jul '21

15 Jul '21

added another check to fill same ports in source and destination when a custom service is selected. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Reported-by: erik(a)vanlinsteeict.nl --- html/cgi-bin/firewall.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 499f279..d17afab 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -757,6 +757,7 @@ sub checkrule } } if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;} + if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'cust_srv'){$fwdfwsettings{'dnatport'}=$custsrvport;} } #check if DNAT port is multiple if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){ -- 2.7.4

3 2

Improving build performance (on slow storage)
by Michael Tremer 18 Sep '19

18 Sep '19

Hello, I just wanted to post you an update about the build system which we have recently merged. The whole build process is primarily CPU bound and secondarily IO bound. Some builders have by definition slow storage (the ARM SBCs for example), but also for other reason it does not make sense to run the build on persistent storage. We can keep it in RAM instead which makes accessing files a lot faster and saves write cycles on the media. Therefore, the make.sh build script is mounting /usr/src in the build environment as a ramdisk. All source will be extracted there and the build will be performed. After the build is done, the whole ramdisk will be destroyed again. This feature is automatically enabled on all build systems which have 4GB of RAM or more. You can manually disable it with the ENABLE_RAMDISK=off switch in .config. I hope this brief email makes sense. If you have any questions, feel free to ask. Best, -Michael

3 8

[PATCH] firewall-lib.pl: Populate GeoIP rules only if location is available.
by Stefan Schantl 04 Jul '19

04 Jul '19

In case a GeoIP related firewall rule should be created, the script now will check if the given location is still available. Fixes #12054. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/firewall/firewall-lib.pl | 40 ++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl index 118744fd6..59ae096b0 100644 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -70,6 +70,9 @@ my $netsettings = "${General::swroot}/ethernet/settings"; &General::readhasharray("$configsrvgrp", \%customservicegrp); &General::get_aliases(\%aliases); +# Get all available GeoIP locations. +my @available_geoip_locations = &get_geoip_locations(); + sub get_srv_prot { my $val=shift; @@ -456,17 +459,23 @@ sub get_address # Handle rule options with GeoIP as source. } elsif ($key eq "cust_geoip_src") { - # Get external interface. - my $external_interface = &get_external_interface(); + # Check if the given GeoIP location is available. + if(&geoip_location_is_available($value)) { + # Get external interface. + my $external_interface = &get_external_interface(); - push(@ret, ["-m geoip --src-cc $value", "$external_interface"]); + push(@ret, ["-m geoip --src-cc $value", "$external_interface"]); + } # Handle rule options with GeoIP as target. } elsif ($key eq "cust_geoip_tgt") { - # Get external interface. - my $external_interface = &get_external_interface(); + # Check if the given GeoIP location is available. + if(&geoip_location_is_available($value)) { + # Get external interface. + my $external_interface = &get_external_interface(); - push(@ret, ["-m geoip --dst-cc $value", "$external_interface"]); + push(@ret, ["-m geoip --dst-cc $value", "$external_interface"]); + } # If nothing was selected, we assume "any". } else { @@ -610,4 +619,23 @@ sub get_geoip_locations() { return &GeoIP::get_geoip_locations(); } +# Function to check if a database of a given GeoIP location is +# available. +sub geoip_location_is_available($) { + my ($location) = @_; + + # Loop through the global array of available GeoIP locations. + foreach my $geoip_location (@available_geoip_locations) { + # Check if the current processed location is the searched one. + if($location eq $geoip_location) { + # If it is part of the array, return "1" - True. + return 1; + } + } + + # If we got here, the given location is not part of the array of available + # zones. Return nothing. + return; +} + return 1; -- 2.20.1

3 3

Core 134 test
by Mentalic 03 Jul '19

03 Jul '19

Core 134 Geoip had the same string of geoip boot errors as Core update 133 does. Tried the missing folder fix I found for core update 133 but if fails on to fix core update 134. So somewhat different problem. Regards Wayne

2 2

[PATCH] nettle: Update to 3.5.1
by Matthias Fischer 28 Jun '19

28 Jun '19

For details see: https://git.lysator.liu.se/nettle/nettle/blob/master/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/nettle | 12 ++++++------ lfs/nettle | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle index d3621683c..58e3f57a0 100644 --- a/config/rootfiles/common/nettle +++ b/config/rootfiles/common/nettle @@ -20,9 +20,9 @@ #usr/include/nettle/cfb.h #usr/include/nettle/chacha-poly1305.h #usr/include/nettle/chacha.h +#usr/include/nettle/cmac.h #usr/include/nettle/ctr.h #usr/include/nettle/curve25519.h -#usr/include/nettle/des-compat.h #usr/include/nettle/des.h #usr/include/nettle/dsa-compat.h #usr/include/nettle/dsa.h @@ -44,7 +44,6 @@ #usr/include/nettle/memops.h #usr/include/nettle/memxor.h #usr/include/nettle/nettle-meta.h -#usr/include/nettle/nettle-stdint.h #usr/include/nettle/nettle-types.h #usr/include/nettle/pbkdf2.h #usr/include/nettle/pgp.h @@ -65,12 +64,13 @@ #usr/include/nettle/twofish.h #usr/include/nettle/umac.h #usr/include/nettle/version.h +#usr/include/nettle/xts.h #usr/include/nettle/yarrow.h usr/lib/libhogweed.so -usr/lib/libhogweed.so.4 -usr/lib/libhogweed.so.4.5 +usr/lib/libhogweed.so.5 +usr/lib/libhogweed.so.5.0 #usr/lib/libnettle.so -usr/lib/libnettle.so.6 -usr/lib/libnettle.so.6.5 +usr/lib/libnettle.so.7 +usr/lib/libnettle.so.7.0 #usr/lib/pkgconfig/hogweed.pc #usr/lib/pkgconfig/nettle.pc diff --git a/lfs/nettle b/lfs/nettle index 36f247d34..cc34b1fad 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -24,7 +24,7 @@ include Config -VER = 3.4.1 +VER = 3.5.1 THISAPP = nettle-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9bdebb0e2f638d3b9d91f7fc264b70c1 +$(DL_FILE)_MD5 = 0e5707b418c3826768d41130fbe4ee86 install : $(TARGET) -- 2.18.0

1 0

[PATCH] dhcpcd: Update to 7.2.3
by Matthias Fischer 27 Jun '19

27 Jun '19

For details see: Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> https://roy.marples.name/blog/dhcpcd-7-2-3-released "Minor update with the following changes: OpenBSD: compiles again BSD: Check RTM lengths incase of kernel issues DHCP6: Don't stop even when last router goes away DHCP6: Fix inform from RA hostname: Fix short hostname check" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/dhcpcd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 08d763f37..83252e897 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 7.2.2 +VER = 7.2.3 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2f17034432ea10415ee84a97ef131128 +$(DL_FILE)_MD5 = b7aade2cc47afa6d645f798103365402 install : $(TARGET) -- 2.18.0

1 0

Core 133 test
by Mentalic 25 Jun '19

25 Jun '19

Installed fresh iso x86_64. Restored backup from 132 system. Geoip is having a problem, countries show up in setting gui but nothing is actually being blocked. When booting there are many Geoip directory not found errors on screen. Wayne

3 4

[PATCH] mc: Update to 4.8.23
by Matthias Fischer 24 Jun '19

24 Jun '19

For details see: http://midnight-commander.org/wiki/NEWS-4.8.23 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/mc | 1 + lfs/mc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 06c536ed4..73ff588c7 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -106,6 +106,7 @@ usr/share/mc/skins/dark.ini usr/share/mc/skins/darkfar.ini usr/share/mc/skins/default.ini usr/share/mc/skins/double-lines.ini +usr/share/mc/skins/featured-plus.ini usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini usr/share/mc/skins/gray-green-purple256.ini diff --git a/lfs/mc b/lfs/mc index 6600702e5..ff23c4064 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.8.22 +VER = 4.8.23 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 17 +PAK_VER = 18 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 62bba2bfccadf08eb554321899f475bc +$(DL_FILE)_MD5 = 466c3135f727f8ac2102d060a080ace3 install : $(TARGET) -- 2.18.0

2 1

[PATCH] libyaml: Update to 0.2.2
by Stefan Schantl 23 Jun '19

23 Jun '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- libyaml/libyaml.nm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm index 6a07ec851..88375fbb1 100644 --- a/libyaml/libyaml.nm +++ b/libyaml/libyaml.nm @@ -4,8 +4,8 @@ ############################################################################### name = libyaml -version = 0.1.3 -release = 2 +version = 0.2.2 +release = 1 groups = System/Libraries url = http://pyyaml.org/ @@ -13,12 +13,12 @@ license = MIT summary = YAML 1.1 parser and emitter written in C. description - YAML is a data serialization format designed for human readability \ - and interaction with scripting languages. LibYAML is a YAML parser \ + YAML is a data serialization format designed for human readability + and interaction with scripting languages. LibYAML is a YAML parser and emitter written in C. end -source_dl = +source_dl = http://pyyaml.org/download/libyaml/ sources = yaml-%{version}.tar.gz build @@ -32,7 +32,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL -- 2.20.1

1 0

[PATCH] python-yaml: New package
by Stefan Schantl 23 Jun '19

23 Jun '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- python-yaml/python-yaml.nm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 python-yaml/python-yaml.nm diff --git a/python-yaml/python-yaml.nm b/python-yaml/python-yaml.nm new file mode 100644 index 000000000..9e777463b --- /dev/null +++ b/python-yaml/python-yaml.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = python-yaml +version = 5.1 +release = 1 + +groups = Development/Libraries +url = https://pyyaml.org/wiki/PyYAML +license = MIT +summary = PyYAML is a YAML parser and emitter for Python. + +description + PyYAML is a YAML parser and emitter for the Python programming language. +end + +source_dl = http://pyyaml.org/download/pyyaml/ +sources = PyYAML-%{version}.tar.gz + +build + requires + libyaml-devel + python-devel + end + + DIR_APP = %{DIR_SRC}/PyYAML-%{version} + + build + python setup.py build + end + + install + python setup.py install --root=%{BUILDROOT} + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end -- 2.20.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2019