Development October 2015

development@lists.ipfire.org

11 participants
48 discussions

[PATCH] functions.ipv6: Fix doubble square bracket when calling assert
by Stefan Schantl 18 Oct '15

18 Oct '15

The assert check does not proper work when using doubble square backets, so the check fails for some unknown reasons. Removing one bracket will allow to successfully perform the assert check again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/functions/functions.ipv6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6 index 9aedf84..2299135 100644 --- a/src/functions/functions.ipv6 +++ b/src/functions/functions.ipv6 @@ -399,7 +399,7 @@ ipv6_format() { } ipv6_addr_eq() { - assert [[ $# -eq 2 ]] + assert [ $# -eq 2 ] local addr1="${1}" local addr2="${2}" @@ -409,7 +409,7 @@ ipv6_addr_eq() { } ipv6_addr_gt() { - assert [[ $# -eq 2 ]] + assert [ $# -eq 2 ] local addr1="${1}" local addr2="${2}" -- 2.4.3

1 0

[PATCH] monit addon: Upgrade to 5.14
by Dirk Wagner 18 Oct '15

18 Oct '15

--- lfs/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/monit b/lfs/monit index 92e0760..453ad03 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.12.1 +VER = 5.14 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 6 +PAK_VER = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ffde79207270925f6f7df787d19100a +$(DL_FILE)_MD5 = 1b3ae1eb08a0914402a8764e5689c1c5 install : $(TARGET) -- 2.1.4

2 1

[PATCH] asterisk addon: Update to 11.20.0
by Dirk Wagner 18 Oct '15

18 Oct '15

--- lfs/asterisk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/asterisk b/lfs/asterisk index 154fe77..91dc4fd 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.18.0 +VER = 11.20.0 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 17 +PAK_VER = 18 DEPS = "libsrtp" @@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = 3ddb42b54db200faccd68906df210a40 +$(DL_FILE)_MD5 = d15759b05862250073e2708394ad2f4c asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c -- 2.1.4

2 1

[PATCH] ddns: Update to 009
by Stefan Schantl 18 Oct '15

18 Oct '15

This update contains the latest upstream changes which are a better SSL error handling and support for desec.io. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/ddns b/lfs/ddns index b692d9a..750c728 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 008 +VER = 009 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f8b9441f18c2667d440d5416ec2e0011 +$(DL_FILE)_MD5 = 31f949d9f417ee7f801cf8aac849a92e install : $(TARGET) -- 2.4.3

2 1

[PATCH] automake: Add non detected dependencies of perl modules.
by Stefan Schantl 17 Oct '15

17 Oct '15

automake has non detected dependencies to perl(threads) and perl(Thread::Queue). After updating perl to version 5.20 those modules have been moved into own sub-packages which are not installed because these dependencies are not correctly detected and tracked in the automake package. Manually adding them will solve this problem and provides a working version of automake again. The whole problem also has been filed on the RH bugtracker: https://bugzilla.redhat.com/show_bug.cgi?id=919810 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- automake/automake.nm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/automake/automake.nm b/automake/automake.nm index 59bf3b0..128ba2c 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -5,7 +5,7 @@ name = automake version = 1.13.2 -release = 1 +release = 2 arch = noarch groups = Development/Tools @@ -26,12 +26,17 @@ required_autoconf_version = 2.62 build requires autoconf >= %{required_autoconf_version} - perl + perl(threads) + perl(Thread::Queue) end end packages package %{name} - requires = autoconf >= %{required_autoconf_version} + requires + autoconf >= %{required_autoconf_version} + perl(threads) + perl(Thread::Queue) + end end end -- 2.4.3

1 1

[PATCH] BUG10941: fix single ip-addresses when no subnet given
by Alexander Marx 17 Oct '15

17 Oct '15

Some functions when adding a new route where senseless. Now the ip address is checked and in case of a missing / wrong subnetmask an errormessage is raised. The ip address is preserved. ELSE we convert the subnetmask to cidr notation and calculate the network ip correctly. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/routing.cgi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index c460a74..2c60f67 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,12 +118,16 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { } if ($settings{'ACTION'} eq $Lang::tr{'add'}) { - # Convert subnet masks to CIDR notation. - $settings{'IP'} = &General::iporsubtocidr($settings{'IP'}); -# Validate inputs - if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ + # Validate inputs + if (!&General::validipandmask($settings{'IP'}))){ $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; + }else{ + #set networkip if not already correctly defined + my($ip,$cidr) = split(/\//,$settings{'IP'}); + $cidr = &General::iporsubtocidr($cidr); + my $netip=&General::getnetworkip($ip,$cidr); + $settings{'IP'} = "$netip/$cidr"; } if ($settings{'IP'} =~ /^0\.0\.0\.0/){ -- 1.9.1

1 0

[PATCH] BUG10806: fix wrong customhostgroupcheck
by Alexander Marx 17 Oct '15

17 Oct '15

The function to check for valid hostgroup entries not only checked the target hostgroup but also the source hostgroup if any. This lead to the error. Now the check only affects target hostgroups because it does not matter if a sourcegroup contains mac addresses. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/firewall.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index c207ec7..682c285 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -597,7 +597,7 @@ sub checktarget &General::readhasharray("$confighost", \%customhost); foreach my $grpkey (sort keys %customgrp){ foreach my $hostkey (sort keys %customhost){ - if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){ + if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){ $hint=$Lang::tr{'fwdfw hint mac'}; return $hint; } -- 1.9.1

1 0

[PATCH] plymouth: Update to 0.9.2.
by Stefan Schantl 16 Oct '15

16 Oct '15

Update to the latest minor version of the plymouth 0.9 series. Also enable support for systemd. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- plymouth/plymouth.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index 257aef6..2666928 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -4,7 +4,7 @@ ############################################################################### name = plymouth -version = 0.9.0 +version = 0.9.2 release = 1 groups = System/Base @@ -33,6 +33,7 @@ build libpng-devel libudev-devel pango-devel + systemd-devel end configure_options += \ -- 2.4.3

3 4

[PATCH] strongswan: Update to 5.3.3
by Stefan Schantl 16 Oct '15

16 Oct '15

This is a minor update to the latest stable version of strongswan. The support and usage of systemd explicitly has been enabled and the dependency to systemd has been updated because the configure script of strongswan is looking for the systemd compat libraries which are provided by systemd 221-2 and later versions. Fixes #10896. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- strongswan/strongswan.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index b386083..dd0a137 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,7 +4,7 @@ ############################################################################### name = strongswan -version = 5.3.2 +version = 5.3.3 release = 1 groups = Networking/VPN @@ -38,8 +38,7 @@ build openssl-devel perl sqlite-devel - systemd-devel - systemd-units + systemd-devel >= 221-2 end configure_options += \ @@ -61,6 +60,7 @@ build --enable-eap-identity \ --with-capabilities=libcap \ --enable-swanctl \ + --enable-systemd \ --enable-kernel-libipsec if "%{DISTRO_ARCH}" == "i686" -- 2.4.3

2 6

[PATCH] BUG10806: fix wrong customhostgroupcheck
by Alexander Marx 16 Oct '15

16 Oct '15

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/firewall.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index c207ec7..682c285 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -597,7 +597,7 @@ sub checktarget &General::readhasharray("$confighost", \%customhost); foreach my $grpkey (sort keys %customgrp){ foreach my $hostkey (sort keys %customhost){ - if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){ + if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){ $hint=$Lang::tr{'fwdfw hint mac'}; return $hint; } -- 1.9.1

3 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2015