Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

config/cfgroot/header.pl

@@ -45,6 +45,7 @@ my %menuhash = ();
 my $menu = \%menuhash;
 %settings = ();
 %ethsettings = ();
+%pppsettings = ();
 @URI = ();
 
 ### Make sure this is an SSL request
@@ -57,6 +58,7 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
 ### Initialize environment
 &General::readhash("${swroot}/main/settings", \%settings);
 &General::readhash("${swroot}/ethernet/settings", \%ethsettings);
+&General::readhash("${swroot}/ppp/settings", \%pppsettings);
 $language = $settings{'LANGUAGE'};
 $hostname = $settings{'HOSTNAME'};
 $hostnameintitle = 0;
@@ -154,7 +156,7 @@ sub genmenu {
         $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1;
     }
 
-    if ($ethsettings{'RED_TYPE'} eq "PPPOE") {
+    if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
     }
 }

config/cfgroot/modem-lib.pl

@@ -33,7 +33,10 @@ sub new() {
 	bless $self, $class;
 
 	# Initialize the connetion to the modem.
-	$self->_initialize($port, $baud);
+	my $ret = $self->_initialize($port, $baud);
+	if ($ret) {
+		return undef;
+	}
 
 	if ($self->_is_working()) {
 		return $self;
@@ -54,9 +57,16 @@ sub DESTROY() {
 sub _initialize() {
 	my ($self, $port, $baud) = @_;
 
+	# Check if the character device actually exists.
+	if (! -c $port) {
+		return 1;
+	}
+
 	# Establish connection to the modem.
 	$self->{modem} = new Device::Modem(port => $port);
 	$self->{modem}->connect(baudrate => $baud);
+
+	return 0;
 }
 
 sub _is_working() {

config/kernel/kernel.config.armv5tel-ipfire-multi

@@ -2552,7 +2552,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_DW is not set
+CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
 
 #

config/kernel/kernel.config.i586-ipfire

@@ -632,8 +632,8 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
-CONFIG_PCIEASPM_POWERSAVE=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y

config/kernel/kernel.config.i586-ipfire-pae

@@ -645,8 +645,8 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_DEFAULT=y
-CONFIG_PCIEASPM_POWERSAVE=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y

config/rootfiles/common/armv5tel/linux-headers

@@ -625,6 +625,7 @@
 #usr/include/linux/unix_diag.h
 #usr/include/linux/usb
 #usr/include/linux/usb/audio.h
+#usr/include/linux/usb/cdc-wdm.h
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h

config/rootfiles/common/i586/linux-headers

@@ -654,6 +654,7 @@
 #usr/include/linux/unix_diag.h
 #usr/include/linux/usb
 #usr/include/linux/usb/audio.h
+#usr/include/linux/usb/cdc-wdm.h
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h

config/rootfiles/common/libpcap

@@ -1,7 +1,9 @@
 #usr/bin/pcap-config
 #usr/include/pcap
+#usr/include/pcap/bluetooth.h
 #usr/include/pcap-bpf.h
 #usr/include/pcap-int.h
+#usr/include/pcap/ipnet.h
 #usr/include/pcap-namedb.h
 #usr/include/pcap.h
 #usr/include/pcap/bpf.h
@@ -9,11 +11,11 @@
 #usr/include/pcap/pcap.h
 #usr/include/pcap/sll.h
 #usr/include/pcap/usb.h
+#usr/include/pcap/vlan.h
 #usr/lib/libpcap.a
 usr/lib/libpcap.so
 usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.0
+usr/lib/libpcap.so.1.4.0
-usr/lib/libpcap.so.1.0.0
 #usr/share/man/man1/pcap-config.1
 #usr/share/man/man3/pcap.3pcap
 #usr/share/man/man3/pcap_activate.3pcap
@@ -39,6 +41,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_findalldevs.3pcap
 #usr/share/man/man3/pcap_fopen_offline.3pcap
 #usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
 #usr/share/man/man3/pcap_freealldevs.3pcap
 #usr/share/man/man3/pcap_freecode.3pcap
 #usr/share/man/man3/pcap_get_selectable_fd.3pcap
@@ -48,6 +51,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_is_swapped.3pcap
 #usr/share/man/man3/pcap_lib_version.3pcap
 #usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
 #usr/share/man/man3/pcap_lookupdev.3pcap
 #usr/share/man/man3/pcap_lookupnet.3pcap
 #usr/share/man/man3/pcap_loop.3pcap
@@ -67,6 +71,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_set_rfmon.3pcap
 #usr/share/man/man3/pcap_set_snaplen.3pcap
 #usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
 #usr/share/man/man3/pcap_setdirection.3pcap
 #usr/share/man/man3/pcap_setfilter.3pcap
 #usr/share/man/man3/pcap_setnonblock.3pcap
@@ -74,6 +79,9 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_stats.3pcap
 #usr/share/man/man3/pcap_statustostr.3pcap
 #usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
 #usr/share/man/man5/pcap-savefile.5
 #usr/share/man/man7/pcap-filter.7
 #usr/share/man/man7/pcap-linktype.7
+#usr/share/man/man7/pcap-tstamp.7

config/rootfiles/core/80/filelists/files

@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

config/rootfiles/core/80/update.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# 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 3 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) 2014 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=80
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0

config/rootfiles/oldcore/79/exclude

@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache

config/rootfiles/oldcore/79/filelists/files

@@ -1,18 +1,24 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/leds
 etc/rc.d/init.d/sshd
+etc/rc.d/init.d/udev
 srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
 srv/web/ipfire/cgi-bin/modem-status.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 usr/bin/squidGuard
+usr/sbin/firewall-policy
 usr/sbin/redirect_wrapper
 usr/sbin/updxlrator
 usr/local/bin/setddns.pl
+var/ipfire/header.pl
 var/ipfire/langs
 var/ipfire/menu.d/20-status.menu
 var/ipfire/menu.d/70-log.menu

config/rootfiles/oldcore/79/filelists/libpcap

@@ -0,0 +1 @@
+../../../common/libpcap

config/rootfiles/oldcore/79/filelists/openssh

@@ -0,0 +1 @@
+../../../common/openssh

config/rootfiles/oldcore/79/filelists/openssl

@@ -0,0 +1 @@
+../../../common/openssl

config/rootfiles/oldcore/79/filelists/perl-Device-Modem

@@ -0,0 +1 @@
+../../../common/perl-Device-Modem

config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort

@@ -0,0 +1 @@
+../../../common/perl-Device-SerialPort