[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 93eff0dcb853657a9518a06194002ebf31d2e9eb - IPFire-SCM

4 Sep 2019

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  93eff0dcb853657a9518a06194002ebf31d2e9eb (commit)
       via  4f19781d71dabae8ffe30e86e8aca96ab81c6952 (commit)
       via  837158dd9627011a6381c00d0176b6ae54cd917a (commit)
       via  3cefb59f71708a1d0926c3bc5d842e5d75f175fd (commit)
       via  f928cc5a34ef0f9bfa4670cafaf358fbe183e7b2 (commit)
       via  b58281e0569b4f2abf281b9bab8e4cddbf048503 (commit)
       via  bd44f7b7632b5cf78da714ed5e07be8e4e7bc3f9 (commit)
       via  f3158de0b85f76bdba621798fb319145c6345bdb (commit)
      from  8b200f9c7e291e5d27a1bd5c3edde6dd0f4ab59a (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 93eff0dcb853657a9518a06194002ebf31d2e9eb
Author: sfeddersen sfeddersen@ipfire.org
Date:   Tue Sep 3 22:45:48 2019 +0200
BUG12156: fixed wrong permissions in install script
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4f19781d71dabae8ffe30e86e8aca96ab81c6952
Author: sfeddersen sfeddersen@ipfire.org
Date:   Tue Sep 3 22:45:47 2019 +0200
BUG12156: GUI cosmetic to show woi logs cleaner
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 837158dd9627011a6381c00d0176b6ae54cd917a
Author: sfeddersen sfeddersen@ipfire.org
Date:   Tue Sep 3 22:45:46 2019 +0200
BUG12156: increased paket number
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3cefb59f71708a1d0926c3bc5d842e5d75f175fd
Author: sfeddersen sfeddersen@ipfire.org
Date:   Tue Sep 3 22:45:45 2019 +0200
BUG12156: added wio rrd files to backup
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f928cc5a34ef0f9bfa4670cafaf358fbe183e7b2
Author: sfeddersen sfeddersen@ipfire.org
Date:   Tue Sep 3 22:45:44 2019 +0200
BUG12156: changed wio.cgi to fix broken Web GUI
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b58281e0569b4f2abf281b9bab8e4cddbf048503
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Sep 3 15:13:35 2019 +0000
haproxy: Update to 2.0.5
This release brings a couple of new features and this
    patch enables using the PCRE Jit.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bd44f7b7632b5cf78da714ed5e07be8e4e7bc3f9
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 4 14:17:19 2019 +0000
core136: ship usb_modswitch and data
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f3158de0b85f76bdba621798fb319145c6345bdb
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Sep 4 14:15:35 2019 +0000
usb-modeswitch-data: fix rootfile
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/usb_modeswitch_data                    |  2 ++
 .../{oldcore/106 => core/136}/filelists/usb_modeswitch         |  0
 .../{oldcore/106 => core/136}/filelists/usb_modeswitch_data    |  0
 html/cgi-bin/logs.cgi/log.dat                                  |  2 +-
 lfs/haproxy                                                    | 10 +++++-----
 lfs/wio                                                        |  2 +-
 src/paks/wio/install.sh                                        |  1 -
 src/wio/config/backup/includes/wio                             |  1 +
 src/wio/wio.cgi                                                | 10 +++++-----
 9 files changed, 15 insertions(+), 13 deletions(-)
 copy config/rootfiles/{oldcore/106 => core/136}/filelists/usb_modeswitch (100%)
 copy config/rootfiles/{oldcore/106 => core/136}/filelists/usb_modeswitch_data (100%)
Difference in files:

diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index b58851d88..767fae512 100644
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -16,6 +16,8 @@ usr/share/usb_modeswitch/03f0:681d
 usr/share/usb_modeswitch/03f0:911d
 usr/share/usb_modeswitch/03f0:931d
 usr/share/usb_modeswitch/03f0:9a1d
+usr/share/usb_modeswitch/03f0:9d1d
+usr/share/usb_modeswitch/03f0:a31d
 usr/share/usb_modeswitch/0408:1000
 usr/share/usb_modeswitch/0408:ea17
 usr/share/usb_modeswitch/0408:ea25
diff --git a/config/rootfiles/core/136/filelists/usb_modeswitch b/config/rootfiles/core/136/filelists/usb_modeswitch
new file mode 120000
index 000000000..acbab6f33
--- /dev/null
+++ b/config/rootfiles/core/136/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/136/filelists/usb_modeswitch_data b/config/rootfiles/core/136/filelists/usb_modeswitch_data
new file mode 120000
index 000000000..4cbce46cf
--- /dev/null
+++ b/config/rootfiles/core/136/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 061525382..3548d5810 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -50,7 +50,7 @@ $cgiparams{'SECTION'} = 'ipfire';
my %sections = (
         'auth' => '(\w+(pam_unix)[.*]: )',
-		'wio' => '(wio|wio[.*])',
+		'wio' => '(wio:|wio[.*])',
         'captive' => '(Captive:)',
         'clamav' => '(clamd[.*]: |freshclam[.*]: )',
         'collectd' => '(collectd[.*]: )',
diff --git a/lfs/haproxy b/lfs/haproxy
index 8917d30c9..308d96edf 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
include Config
-VER        = 1.8.21
+VER        = 2.0.5
THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 11
+PAK_VER    = 12
DEPS       = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6f86f1272c7daf5ea1d1bae5c9192183
+$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152
install : $(TARGET)
@@ -82,8 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux2628" \
-		USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_REGPARM=1 \
+	cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \
+		USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
    	ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
cd $(DIR_APP) && make install-bin install-man PREFIX=/usr
diff --git a/lfs/wio b/lfs/wio
index 92186efad..3d788efda 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -15,7 +15,7 @@ THISAPP    = wio-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wio
-PAK_VER    = 4
+PAK_VER    = 5
###############################################################################
 # Top-level Rules
diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh
index 5c7705bf1..220378141 100644
--- a/src/paks/wio/install.sh
+++ b/src/paks/wio/install.sh
@@ -26,7 +26,6 @@ extract_files
 restore_backup ${NAME}
chown -R nobody.nobody /var/ipfire/wio
-chown -R nobody.nobody /var/log/rrd/wio
 chown -R nobody.nobody /var/log/wio
 chown root.nobody /usr/local/bin/wioscan
 chown root.nobody /usr/local/bin/wiohelper
diff --git a/src/wio/config/backup/includes/wio b/src/wio/config/backup/includes/wio
index 688b819d9..3c1853646 100644
--- a/src/wio/config/backup/includes/wio
+++ b/src/wio/config/backup/includes/wio
@@ -1,2 +1,3 @@
 /var/ipfire/wio/wio.conf
 /var/log/wio
+/var/log/rrd/wio/
diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
index c51910f4d..1645aa54e 100644
--- a/src/wio/wio.cgi
+++ b/src/wio/wio.cgi
@@ -1504,7 +1504,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
    		$ic = "${_}";
foreach $interface (@devs_net) {
-			next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE'));
+			next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"} eq 'PPPOE');
    			if ( $netsettings{"$ic"."_DEV"} eq $interface ) {
    				if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) {
    					print"<td align='center' height='20'><img src='$imgstatic/$devs_img[$in]' alt='$Lang::tr{$devs_alt[$in]}' title='$Lang::tr{$devs_alt[$in]}' /></td>";
@@ -1558,7 +1558,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
    		}
    	}
-		if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') {
+		if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) {
    		my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print $2}"';
    		my @rednet = split ("/", $redipadr);
    		chomp ($rednet[1]);
@@ -1569,10 +1569,10 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
    			print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>";
    			last SWITCH;
    		}
-			else {
+		}
+		else {
    			print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>";
    			last SWITCH;
-			}
    	}
    }
@@ -1872,7 +1872,7 @@ SWITCH: {
    	}
    }
-			if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') {
+			if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') {
    		my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print $2}"';
    		my @rednet = split ("/", $redipadr);
    		chomp ($rednet[1]);
hooks/post-receive
--
IPFire 2.x development tree

    