diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index bbb7e21f4..d90086d38 100644 --- a/config/cfgroot/header.pl +++ b/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; } } diff --git a/config/cfgroot/modem-lib.pl b/config/cfgroot/modem-lib.pl index 51b6d68e9..5d43cc176 100644 --- a/config/cfgroot/modem-lib.pl +++ b/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() { diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 127542f9a..34045f2a6 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/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 # diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 8a3e089dd..ea1faff91 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/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_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4f713623f..9ade8729f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/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_POWERSAVE=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y CONFIG_ARCH_SUPPORTS_MSI=y diff --git a/config/rootfiles/common/armv5tel/linux-headers b/config/rootfiles/common/armv5tel/linux-headers index a4da621ed..7fa9a2463 100644 --- a/config/rootfiles/common/armv5tel/linux-headers +++ b/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 diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/common/i586/linux-headers index 8f8123cd8..deaa97f40 100644 --- a/config/rootfiles/common/i586/linux-headers +++ b/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 diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 0fc7c0090..52169a74a 100644 --- a/config/rootfiles/common/libpcap +++ b/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.0.0 +usr/lib/libpcap.so.1.4.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 diff --git a/config/rootfiles/core/77/exclude b/config/rootfiles/core/80/exclude similarity index 100% rename from config/rootfiles/core/77/exclude rename to config/rootfiles/core/80/exclude diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files new file mode 100644 index 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/80/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/77/meta b/config/rootfiles/core/80/meta similarity index 100% rename from config/rootfiles/core/77/meta rename to config/rootfiles/core/80/meta diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh new file mode 100644 index 000000000..f878cfe16 --- /dev/null +++ b/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 . # +# # +############################################################################ +# +. /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 diff --git a/config/rootfiles/core/78/exclude b/config/rootfiles/oldcore/77/exclude similarity index 100% rename from config/rootfiles/core/78/exclude rename to config/rootfiles/oldcore/77/exclude diff --git a/config/rootfiles/core/77/filelists/GeoIP b/config/rootfiles/oldcore/77/filelists/GeoIP similarity index 100% rename from config/rootfiles/core/77/filelists/GeoIP rename to config/rootfiles/oldcore/77/filelists/GeoIP diff --git a/config/rootfiles/core/77/filelists/Net_SSLeay b/config/rootfiles/oldcore/77/filelists/Net_SSLeay similarity index 100% rename from config/rootfiles/core/77/filelists/Net_SSLeay rename to config/rootfiles/oldcore/77/filelists/Net_SSLeay diff --git a/config/rootfiles/core/77/filelists/apache2 b/config/rootfiles/oldcore/77/filelists/apache2 similarity index 100% rename from config/rootfiles/core/77/filelists/apache2 rename to config/rootfiles/oldcore/77/filelists/apache2 diff --git a/config/rootfiles/core/77/filelists/armv5tel/binutils b/config/rootfiles/oldcore/77/filelists/armv5tel/binutils similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/binutils rename to config/rootfiles/oldcore/77/filelists/armv5tel/binutils diff --git a/config/rootfiles/core/77/filelists/armv5tel/dracut b/config/rootfiles/oldcore/77/filelists/armv5tel/dracut similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/dracut rename to config/rootfiles/oldcore/77/filelists/armv5tel/dracut diff --git a/config/rootfiles/core/77/filelists/armv5tel/gcc b/config/rootfiles/oldcore/77/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/77/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/77/filelists/armv5tel/glibc b/config/rootfiles/oldcore/77/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/77/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/77/filelists/armv5tel/initscripts b/config/rootfiles/oldcore/77/filelists/armv5tel/initscripts similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/initscripts rename to config/rootfiles/oldcore/77/filelists/armv5tel/initscripts diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/77/filelists/armv5tel/lm_sensors b/config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/lm_sensors rename to config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors diff --git a/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/rpi-firmware rename to config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware diff --git a/config/rootfiles/core/77/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/77/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/77/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/77/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/77/filelists/armv5tel/util-linux similarity index 100% rename from config/rootfiles/core/77/filelists/armv5tel/util-linux rename to config/rootfiles/oldcore/77/filelists/armv5tel/util-linux diff --git a/config/rootfiles/core/77/filelists/beep b/config/rootfiles/oldcore/77/filelists/beep similarity index 100% rename from config/rootfiles/core/77/filelists/beep rename to config/rootfiles/oldcore/77/filelists/beep diff --git a/config/rootfiles/core/77/filelists/bridge-utils b/config/rootfiles/oldcore/77/filelists/bridge-utils similarity index 100% rename from config/rootfiles/core/77/filelists/bridge-utils rename to config/rootfiles/oldcore/77/filelists/bridge-utils diff --git a/config/rootfiles/core/77/filelists/coreutils b/config/rootfiles/oldcore/77/filelists/coreutils similarity index 100% rename from config/rootfiles/core/77/filelists/coreutils rename to config/rootfiles/oldcore/77/filelists/coreutils diff --git a/config/rootfiles/core/77/filelists/cyrus-sasl b/config/rootfiles/oldcore/77/filelists/cyrus-sasl similarity index 100% rename from config/rootfiles/core/77/filelists/cyrus-sasl rename to config/rootfiles/oldcore/77/filelists/cyrus-sasl diff --git a/config/rootfiles/core/77/filelists/dosfstools b/config/rootfiles/oldcore/77/filelists/dosfstools similarity index 100% rename from config/rootfiles/core/77/filelists/dosfstools rename to config/rootfiles/oldcore/77/filelists/dosfstools diff --git a/config/rootfiles/core/77/filelists/dvb-firmwares b/config/rootfiles/oldcore/77/filelists/dvb-firmwares similarity index 100% rename from config/rootfiles/core/77/filelists/dvb-firmwares rename to config/rootfiles/oldcore/77/filelists/dvb-firmwares diff --git a/config/rootfiles/core/77/filelists/e2fsprogs b/config/rootfiles/oldcore/77/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/77/filelists/e2fsprogs rename to config/rootfiles/oldcore/77/filelists/e2fsprogs diff --git a/config/rootfiles/core/77/filelists/files b/config/rootfiles/oldcore/77/filelists/files similarity index 100% rename from config/rootfiles/core/77/filelists/files rename to config/rootfiles/oldcore/77/filelists/files diff --git a/config/rootfiles/core/77/filelists/fireinfo b/config/rootfiles/oldcore/77/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/77/filelists/fireinfo rename to config/rootfiles/oldcore/77/filelists/fireinfo diff --git a/config/rootfiles/core/77/filelists/firewall b/config/rootfiles/oldcore/77/filelists/firewall similarity index 100% rename from config/rootfiles/core/77/filelists/firewall rename to config/rootfiles/oldcore/77/filelists/firewall diff --git a/config/rootfiles/core/77/filelists/hwdata b/config/rootfiles/oldcore/77/filelists/hwdata similarity index 100% rename from config/rootfiles/core/77/filelists/hwdata rename to config/rootfiles/oldcore/77/filelists/hwdata diff --git a/config/rootfiles/core/77/filelists/i586/binutils b/config/rootfiles/oldcore/77/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/77/filelists/i586/binutils rename to config/rootfiles/oldcore/77/filelists/i586/binutils diff --git a/config/rootfiles/core/77/filelists/i586/dracut b/config/rootfiles/oldcore/77/filelists/i586/dracut similarity index 100% rename from config/rootfiles/core/77/filelists/i586/dracut rename to config/rootfiles/oldcore/77/filelists/i586/dracut diff --git a/config/rootfiles/core/77/filelists/i586/gcc b/config/rootfiles/oldcore/77/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/77/filelists/i586/gcc rename to config/rootfiles/oldcore/77/filelists/i586/gcc diff --git a/config/rootfiles/core/77/filelists/i586/glibc b/config/rootfiles/oldcore/77/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/77/filelists/i586/glibc rename to config/rootfiles/oldcore/77/filelists/i586/glibc diff --git a/config/rootfiles/core/77/filelists/i586/grub b/config/rootfiles/oldcore/77/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/77/filelists/i586/grub rename to config/rootfiles/oldcore/77/filelists/i586/grub diff --git a/config/rootfiles/core/77/filelists/i586/initscripts b/config/rootfiles/oldcore/77/filelists/i586/initscripts similarity index 100% rename from config/rootfiles/core/77/filelists/i586/initscripts rename to config/rootfiles/oldcore/77/filelists/i586/initscripts diff --git a/config/rootfiles/core/77/filelists/i586/linux b/config/rootfiles/oldcore/77/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/77/filelists/i586/linux rename to config/rootfiles/oldcore/77/filelists/i586/linux diff --git a/config/rootfiles/core/77/filelists/i586/lm_sensors b/config/rootfiles/oldcore/77/filelists/i586/lm_sensors similarity index 100% rename from config/rootfiles/core/77/filelists/i586/lm_sensors rename to config/rootfiles/oldcore/77/filelists/i586/lm_sensors diff --git a/config/rootfiles/core/77/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/77/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/77/filelists/i586/util-linux b/config/rootfiles/oldcore/77/filelists/i586/util-linux similarity index 100% rename from config/rootfiles/core/77/filelists/i586/util-linux rename to config/rootfiles/oldcore/77/filelists/i586/util-linux diff --git a/config/rootfiles/core/77/filelists/iptables b/config/rootfiles/oldcore/77/filelists/iptables similarity index 100% rename from config/rootfiles/core/77/filelists/iptables rename to config/rootfiles/oldcore/77/filelists/iptables diff --git a/config/rootfiles/core/77/filelists/iw b/config/rootfiles/oldcore/77/filelists/iw similarity index 100% rename from config/rootfiles/core/77/filelists/iw rename to config/rootfiles/oldcore/77/filelists/iw diff --git a/config/rootfiles/core/77/filelists/jquery b/config/rootfiles/oldcore/77/filelists/jquery similarity index 100% rename from config/rootfiles/core/77/filelists/jquery rename to config/rootfiles/oldcore/77/filelists/jquery diff --git a/config/rootfiles/core/77/filelists/kmod b/config/rootfiles/oldcore/77/filelists/kmod similarity index 100% rename from config/rootfiles/core/77/filelists/kmod rename to config/rootfiles/oldcore/77/filelists/kmod diff --git a/config/rootfiles/core/77/filelists/libnl b/config/rootfiles/oldcore/77/filelists/libnl similarity index 100% rename from config/rootfiles/core/77/filelists/libnl rename to config/rootfiles/oldcore/77/filelists/libnl diff --git a/config/rootfiles/core/77/filelists/libusbx b/config/rootfiles/oldcore/77/filelists/libusbx similarity index 100% rename from config/rootfiles/core/77/filelists/libusbx rename to config/rootfiles/oldcore/77/filelists/libusbx diff --git a/config/rootfiles/core/77/filelists/libxml2 b/config/rootfiles/oldcore/77/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/77/filelists/libxml2 rename to config/rootfiles/oldcore/77/filelists/libxml2 diff --git a/config/rootfiles/core/77/filelists/linux-firmware b/config/rootfiles/oldcore/77/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/77/filelists/linux-firmware rename to config/rootfiles/oldcore/77/filelists/linux-firmware diff --git a/config/rootfiles/core/77/filelists/lzo b/config/rootfiles/oldcore/77/filelists/lzo similarity index 100% rename from config/rootfiles/core/77/filelists/lzo rename to config/rootfiles/oldcore/77/filelists/lzo diff --git a/config/rootfiles/core/77/filelists/misc-progs b/config/rootfiles/oldcore/77/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/77/filelists/misc-progs rename to config/rootfiles/oldcore/77/filelists/misc-progs diff --git a/config/rootfiles/core/77/filelists/mysql-libs b/config/rootfiles/oldcore/77/filelists/mysql-libs similarity index 100% rename from config/rootfiles/core/77/filelists/mysql-libs rename to config/rootfiles/oldcore/77/filelists/mysql-libs diff --git a/config/rootfiles/core/77/filelists/net-tools b/config/rootfiles/oldcore/77/filelists/net-tools similarity index 100% rename from config/rootfiles/core/77/filelists/net-tools rename to config/rootfiles/oldcore/77/filelists/net-tools diff --git a/config/rootfiles/core/77/filelists/ntp b/config/rootfiles/oldcore/77/filelists/ntp similarity index 100% rename from config/rootfiles/core/77/filelists/ntp rename to config/rootfiles/oldcore/77/filelists/ntp diff --git a/config/rootfiles/core/77/filelists/openssh b/config/rootfiles/oldcore/77/filelists/openssh similarity index 100% rename from config/rootfiles/core/77/filelists/openssh rename to config/rootfiles/oldcore/77/filelists/openssh diff --git a/config/rootfiles/core/77/filelists/openssl b/config/rootfiles/oldcore/77/filelists/openssl similarity index 100% rename from config/rootfiles/core/77/filelists/openssl rename to config/rootfiles/oldcore/77/filelists/openssl diff --git a/config/rootfiles/core/77/filelists/openssl-compat b/config/rootfiles/oldcore/77/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/77/filelists/openssl-compat rename to config/rootfiles/oldcore/77/filelists/openssl-compat diff --git a/config/rootfiles/core/77/filelists/openvpn b/config/rootfiles/oldcore/77/filelists/openvpn similarity index 100% rename from config/rootfiles/core/77/filelists/openvpn rename to config/rootfiles/oldcore/77/filelists/openvpn diff --git a/config/rootfiles/core/77/filelists/pakfire b/config/rootfiles/oldcore/77/filelists/pakfire similarity index 100% rename from config/rootfiles/core/77/filelists/pakfire rename to config/rootfiles/oldcore/77/filelists/pakfire diff --git a/config/rootfiles/core/77/filelists/paxctl b/config/rootfiles/oldcore/77/filelists/paxctl similarity index 100% rename from config/rootfiles/core/77/filelists/paxctl rename to config/rootfiles/oldcore/77/filelists/paxctl diff --git a/config/rootfiles/core/77/filelists/php b/config/rootfiles/oldcore/77/filelists/php similarity index 100% rename from config/rootfiles/core/77/filelists/php rename to config/rootfiles/oldcore/77/filelists/php diff --git a/config/rootfiles/core/77/filelists/rng-tools b/config/rootfiles/oldcore/77/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/77/filelists/rng-tools rename to config/rootfiles/oldcore/77/filelists/rng-tools diff --git a/config/rootfiles/core/77/filelists/setup b/config/rootfiles/oldcore/77/filelists/setup similarity index 100% rename from config/rootfiles/core/77/filelists/setup rename to config/rootfiles/oldcore/77/filelists/setup diff --git a/config/rootfiles/core/77/filelists/strongswan b/config/rootfiles/oldcore/77/filelists/strongswan similarity index 100% rename from config/rootfiles/core/77/filelists/strongswan rename to config/rootfiles/oldcore/77/filelists/strongswan diff --git a/config/rootfiles/core/77/filelists/tzdata b/config/rootfiles/oldcore/77/filelists/tzdata similarity index 100% rename from config/rootfiles/core/77/filelists/tzdata rename to config/rootfiles/oldcore/77/filelists/tzdata diff --git a/config/rootfiles/core/77/filelists/udev b/config/rootfiles/oldcore/77/filelists/udev similarity index 100% rename from config/rootfiles/core/77/filelists/udev rename to config/rootfiles/oldcore/77/filelists/udev diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch b/config/rootfiles/oldcore/77/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/77/filelists/usb_modeswitch rename to config/rootfiles/oldcore/77/filelists/usb_modeswitch diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/77/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/77/filelists/usb_modeswitch_data rename to config/rootfiles/oldcore/77/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/77/filelists/usbutils b/config/rootfiles/oldcore/77/filelists/usbutils similarity index 100% rename from config/rootfiles/core/77/filelists/usbutils rename to config/rootfiles/oldcore/77/filelists/usbutils diff --git a/config/rootfiles/core/77/filelists/vim b/config/rootfiles/oldcore/77/filelists/vim similarity index 100% rename from config/rootfiles/core/77/filelists/vim rename to config/rootfiles/oldcore/77/filelists/vim diff --git a/config/rootfiles/core/77/filelists/wget b/config/rootfiles/oldcore/77/filelists/wget similarity index 100% rename from config/rootfiles/core/77/filelists/wget rename to config/rootfiles/oldcore/77/filelists/wget diff --git a/config/rootfiles/core/77/filelists/wpa_supplicant b/config/rootfiles/oldcore/77/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/77/filelists/wpa_supplicant rename to config/rootfiles/oldcore/77/filelists/wpa_supplicant diff --git a/config/rootfiles/core/77/filelists/xz b/config/rootfiles/oldcore/77/filelists/xz similarity index 100% rename from config/rootfiles/core/77/filelists/xz rename to config/rootfiles/oldcore/77/filelists/xz diff --git a/config/rootfiles/core/78/meta b/config/rootfiles/oldcore/77/meta similarity index 100% rename from config/rootfiles/core/78/meta rename to config/rootfiles/oldcore/77/meta diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/oldcore/77/update.sh similarity index 100% rename from config/rootfiles/core/77/update.sh rename to config/rootfiles/oldcore/77/update.sh diff --git a/config/rootfiles/oldcore/79/exclude b/config/rootfiles/oldcore/79/exclude new file mode 100644 index 000000000..18e9b4d24 --- /dev/null +++ b/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 diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/78/filelists/daq b/config/rootfiles/oldcore/79/filelists/daq similarity index 100% rename from config/rootfiles/core/78/filelists/daq rename to config/rootfiles/oldcore/79/filelists/daq diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/oldcore/79/filelists/files similarity index 79% rename from config/rootfiles/core/78/filelists/files rename to config/rootfiles/oldcore/79/filelists/files index 851ce36f9..4a557d2cf 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/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 diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/oldcore/79/filelists/hostname similarity index 100% rename from config/rootfiles/core/78/filelists/hostname rename to config/rootfiles/oldcore/79/filelists/hostname diff --git a/config/rootfiles/core/78/filelists/i586/grub b/config/rootfiles/oldcore/79/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/78/filelists/i586/grub rename to config/rootfiles/oldcore/79/filelists/i586/grub diff --git a/config/rootfiles/core/78/filelists/i586/linux b/config/rootfiles/oldcore/79/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/78/filelists/i586/linux rename to config/rootfiles/oldcore/79/filelists/i586/linux diff --git a/config/rootfiles/core/78/filelists/i586/syslinux b/config/rootfiles/oldcore/79/filelists/i586/syslinux similarity index 100% rename from config/rootfiles/core/78/filelists/i586/syslinux rename to config/rootfiles/oldcore/79/filelists/i586/syslinux diff --git a/config/rootfiles/oldcore/79/filelists/libpcap b/config/rootfiles/oldcore/79/filelists/libpcap new file mode 120000 index 000000000..c7f9f52a8 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/openssh b/config/rootfiles/oldcore/79/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/openssl b/config/rootfiles/oldcore/79/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/openvpn b/config/rootfiles/oldcore/79/filelists/openvpn similarity index 100% rename from config/rootfiles/core/78/filelists/openvpn rename to config/rootfiles/oldcore/79/filelists/openvpn diff --git a/config/rootfiles/oldcore/79/filelists/perl-Device-Modem b/config/rootfiles/oldcore/79/filelists/perl-Device-Modem new file mode 120000 index 000000000..ea70f08a0 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort b/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort new file mode 120000 index 000000000..2eb1527c9 --- /dev/null +++ b/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/ppp b/config/rootfiles/oldcore/79/filelists/ppp similarity index 100% rename from config/rootfiles/core/78/filelists/ppp rename to config/rootfiles/oldcore/79/filelists/ppp diff --git a/config/rootfiles/core/78/filelists/snort b/config/rootfiles/oldcore/79/filelists/snort similarity index 100% rename from config/rootfiles/core/78/filelists/snort rename to config/rootfiles/oldcore/79/filelists/snort diff --git a/config/rootfiles/core/78/filelists/squid b/config/rootfiles/oldcore/79/filelists/squid similarity index 100% rename from config/rootfiles/core/78/filelists/squid rename to config/rootfiles/oldcore/79/filelists/squid diff --git a/config/rootfiles/core/78/filelists/sudo b/config/rootfiles/oldcore/79/filelists/sudo similarity index 100% rename from config/rootfiles/core/78/filelists/sudo rename to config/rootfiles/oldcore/79/filelists/sudo diff --git a/config/rootfiles/core/78/filelists/vnstat b/config/rootfiles/oldcore/79/filelists/vnstat similarity index 100% rename from config/rootfiles/core/78/filelists/vnstat rename to config/rootfiles/oldcore/79/filelists/vnstat diff --git a/config/rootfiles/oldcore/79/meta b/config/rootfiles/oldcore/79/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/oldcore/79/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/oldcore/79/update.sh similarity index 99% rename from config/rootfiles/core/78/update.sh rename to config/rootfiles/oldcore/79/update.sh index f3e059352..2085d4332 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/oldcore/79/update.sh @@ -35,7 +35,7 @@ function add_to_backup () # # Remove old core updates from pakfire cache to save space... -core=78 +core=79 for (( i=1; i<=${core}; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire diff --git a/config/samba/default.shares b/config/samba/default.shares index aa21965f9..ee297fe3f 100644 --- a/config/samba/default.shares +++ b/config/samba/default.shares @@ -1,18 +1,9 @@ -[Temp] -path = /tmp -comment = Temp -browseable = yes +[Share1] +path = /mnt/share1 +comment = Shared Folder +browsable = yes writeable = yes -create mask = 0777 -directory mask = 0777 -guest ok = yes -force user = samba -[P2P] -path = /var/ipfire/samba/p2p -comment = P2P -browseable = yes -writeable = yes -create mask = 0777 -directory mask = 0777 +create mask = 0644 +directory mask = 0755 guest ok = yes force user = samba diff --git a/doc/language_issues.de b/doc/language_issues.de index 2140296c7..9d1e0adce 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -459,12 +459,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -491,6 +495,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -620,7 +625,6 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.en b/doc/language_issues.en index 3a0a4c704..55ee3e28c 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -486,12 +486,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -521,6 +525,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -651,7 +656,6 @@ WARNING: untranslated string: downlink WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index 7b59a5e6c..6bbdc18e1 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2446583c0..13a3c8802 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -431,12 +431,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -466,6 +470,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8dd0a3c94..aff38ca0e 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -485,12 +485,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -520,6 +524,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7b59a5e6c..6bbdc18e1 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2d12fc604..e553af7d1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -425,12 +425,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -460,6 +464,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7ce95e02a..5d3dbc817 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -484,12 +484,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -519,6 +523,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_missings b/doc/language_missings index 7ae53f8a2..a20a8d77b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -344,6 +344,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -863,6 +864,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1366,6 +1368,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1860,6 +1863,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < month-graph < most preferred < MTU settings diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi old mode 100755 new mode 100644 index d278c7720..2d33a3d5e --- a/html/cgi-bin/modem-status.cgi +++ b/html/cgi-bin/modem-status.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 IPFire Team # # # # 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 # diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 921009fc7..45c2f6c67 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1530,6 +1530,17 @@ END exit(0); } +### +### Download tls-auth key +### +}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download tls-auth key'}) { + if ( -f "${General::swroot}/ovpn/certs/ta.key" ) { + print "Content-Type: application/octet-stream\r\n"; + print "Content-Disposition: filename=ta.key\r\n\r\n"; + print `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + exit(0); + } + ### ### Form for generating a root certificate ### @@ -2369,6 +2380,28 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { exit(0); } +### +### Display tls-auth key +### +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show tls-auth key'}) { + + if (! -e "${General::swroot}/ovpn/certs/ta.key") { + $errormessage = $Lang::tr{'not present'}; + } else { + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'ovpn'}, 1, ''); + &Header::openbigbox('100%', 'LEFT', '', ''); + &Header::openbox('100%', 'LEFT', "$Lang::tr{'ta key'}:"); + my $output = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + $output = &Header::cleanhtml($output,"y"); + print "
$output
\n"; + &Header::closebox(); + print "
$Lang::tr{'back'}
"; + &Header::closebigbox(); + &Header::closepage(); + exit(0); + } + ### ### Display Certificate Revoke List ### @@ -3155,7 +3188,6 @@ my $complzoactive; my $mssfixactive; my $authactive; my $n2nfragment; -my $authactive; my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]); my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); my @n2nproto = split(/-/, $n2nproto2[1]); @@ -5215,6 +5247,8 @@ END ; &Header::closebox(); } + + # CA/key listing &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}"); print < @@ -5227,7 +5261,10 @@ END ; my $col1="bgcolor='$color{'color22'}'"; my $col2="bgcolor='$color{'color20'}'"; + # DH parameter line my $col3="bgcolor='$color{'color22'}'"; + # ta.key line + my $col4="bgcolor='$color{'color20'}'"; if (-f "${General::swroot}/ovpn/ca/cacert.pem") { my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/cacert.pem`; @@ -5239,15 +5276,16 @@ END $Lang::tr{'root certificate'} $casubject -
+ -
-
+
+
-
-   + +   + END ; } else { @@ -5256,7 +5294,8 @@ END $Lang::tr{'root certificate'}: $Lang::tr{'not present'} -   +   + END ; } @@ -5272,15 +5311,16 @@ END $Lang::tr{'host certificate'} $hostsubject -
+ -
-
+
+
-
-   + +   + END ; } else { @@ -5289,7 +5329,8 @@ END $Lang::tr{'host certificate'}: $Lang::tr{'not present'} -   +   + END ; } @@ -5297,7 +5338,7 @@ END # Adding DH parameter to chart if (-f "${General::swroot}/ovpn/ca/dh1024.pem") { my $dhsubject = `/usr/bin/openssl dhparam -text -in ${General::swroot}/ovpn/ca/dh1024.pem`; - $dhsubject =~ /PKCS#3 (.*)[\n]/; + $dhsubject =~ / (.*)[\n]/; $dhsubject = $1; @@ -5305,15 +5346,14 @@ END $Lang::tr{'dh parameter'} $dhsubject -
+ -
-
- - -
-   + +
+
+   + END ; } else { @@ -5322,7 +5362,42 @@ END $Lang::tr{'dh parameter'}: $Lang::tr{'not present'} -   +   + +END + ; + } + + # Adding ta.key to chart + if (-f "${General::swroot}/ovpn/certs/ta.key") { + my $tasubject = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + $tasubject =~ /# (.*)[\n]/; + $tasubject = $1; + print < + $Lang::tr{'ta key'} + $tasubject +
+ + +
+
+ + +
+   + +END + ; + } else { + # Nothing + print < + $Lang::tr{'ta key'}: + $Lang::tr{'not present'} +   + END ; } @@ -5385,6 +5460,9 @@ END
+ + + diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 7bceb80ee..33f521e75 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # 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 # @@ -70,10 +70,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -333,19 +333,49 @@ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; $selected{'COMPORT'}{'ttyACM3'} = ''; +$selected{'COMPORT'}{'ttyACM4'} = ''; +$selected{'COMPORT'}{'ttyACM5'} = ''; +$selected{'COMPORT'}{'ttyACM6'} = ''; +$selected{'COMPORT'}{'ttyACM7'} = ''; +$selected{'COMPORT'}{'ttyACM8'} = ''; +$selected{'COMPORT'}{'ttyACM9'} = ''; $selected{'COMPORT'}{'ttyUSB0'} = ''; $selected{'COMPORT'}{'ttyUSB1'} = ''; $selected{'COMPORT'}{'ttyUSB2'} = ''; $selected{'COMPORT'}{'ttyUSB3'} = ''; +$selected{'COMPORT'}{'ttyUSB4'} = ''; +$selected{'COMPORT'}{'ttyUSB5'} = ''; +$selected{'COMPORT'}{'ttyUSB6'} = ''; +$selected{'COMPORT'}{'ttyUSB7'} = ''; +$selected{'COMPORT'}{'ttyUSB8'} = ''; +$selected{'COMPORT'}{'ttyUSB9'} = ''; $selected{'COMPORT'}{'rfcomm0'} = ''; $selected{'COMPORT'}{'rfcomm1'} = ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'MONPORT'}{''} = ''; +$selected{'MONPORT'}{'ttyACM0'} = ''; +$selected{'MONPORT'}{'ttyACM1'} = ''; +$selected{'MONPORT'}{'ttyACM2'} = ''; +$selected{'MONPORT'}{'ttyACM3'} = ''; +$selected{'MONPORT'}{'ttyACM4'} = ''; +$selected{'MONPORT'}{'ttyACM5'} = ''; +$selected{'MONPORT'}{'ttyACM6'} = ''; +$selected{'MONPORT'}{'ttyACM7'} = ''; +$selected{'MONPORT'}{'ttyACM8'} = ''; +$selected{'MONPORT'}{'ttyACM9'} = ''; $selected{'MONPORT'}{'ttyUSB0'} = ''; $selected{'MONPORT'}{'ttyUSB1'} = ''; $selected{'MONPORT'}{'ttyUSB2'} = ''; $selected{'MONPORT'}{'ttyUSB3'} = ''; +$selected{'MONPORT'}{'ttyUSB4'} = ''; +$selected{'MONPORT'}{'ttyUSB5'} = ''; +$selected{'MONPORT'}{'ttyUSB6'} = ''; +$selected{'MONPORT'}{'ttyUSB7'} = ''; +$selected{'MONPORT'}{'ttyUSB8'} = ''; +$selected{'MONPORT'}{'ttyUSB9'} = ''; +$selected{'MONPORT'}{'rfcomm0'} = ''; +$selected{'MONPORT'}{'rfcomm1'} = ''; $selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -582,16 +612,28 @@ END + + + + + + END ; if ($pppsettings{'TYPE'} ne 'serial' ) { print <$Lang::tr{'usb modem on acm0'} - - - + + + + + + + + + + END ; } @@ -608,6 +650,24 @@ END + + + + + + + + + + + + + + + + + + diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 70e5726c9..58a51d075 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 IPFire Team # # # # 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 # @@ -88,10 +88,7 @@ sub display_vnstat if ( $testdata =~ 'enough') { print"No data for $device !
"; } else { - # Falls back to textoutput if there was no % value because vnstati hang in this case - if (!($testdata =~ 'nan%')) { - system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); - } + system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); # Hour graph system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); # Day graph @@ -102,15 +99,9 @@ sub display_vnstat system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png"); # Generate HTML-Table with the graphs - print "
$Lang::tr{'upload ca certificate'}
$Lang::tr{'ca name'}:
"; - if ($testdata =~ 'nan%') { - print ""; - } else { - print""; - } print < + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5df9ba839..ae4d69491 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -518,7 +518,7 @@ 'ccd used' => 'Genutzte Adressen', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', -'certificate authorities' => 'Zertifizierungsstellen (CAs)', +'certificate authorities' => 'Zertifizierungsstellen und -Schlüssel', 'certificate does not have a valid ca associated with it' => 'Mit dem Zertifikat ist keine gültige CA verbunden.', 'certificate file move failed' => 'Verschieben der Zertifikatsdatei fehlgeschlagen', 'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.', @@ -554,7 +554,7 @@ 'connection' => 'Verbindung', 'connection closed' => 'Nicht Verbunden...', 'connection debugging' => 'Verbindungs-Debugging', -'connection status and controlc' => 'Verbindungsstatus und -kontrolle', +'connection status and controlc' => 'Verbindungsstatus und -Kontrolle', 'connection tracking' => 'iptables-Verbindungsverfolgung', 'connection type' => 'Verbindungstyp', 'connection type is invalid' => 'Verbindungstyp ist ungültig', @@ -769,12 +769,13 @@ 'downlink std class' => 'Downloadstandardklasse', 'download' => 'herunterladen', 'download ca certificate' => 'CA-Zertifikat herunterladen', -'download certificate' => 'Zertifikate herunterladen', +'download certificate' => 'Datei herunterladen', 'download dh parameter' => 'Diffie-Hellman-Parameter herunterladen', 'download host certificate' => 'Host-Zertifikat herunterladen', 'download new ruleset' => 'Neuen Regelsatz herunterladen', 'download pkcs12 file' => 'PKCS12-Datei herunterladen', 'download root certificate' => 'Root-Zertifikat herunterladen', +'download tls-auth key' => 'tls-auth Key herunterladen', 'dpd action' => 'Aktion für Dead Peer Detection', 'dpd delay' => 'Verzögerung', 'dpd timeout' => 'Zeitüberschreitung', @@ -1492,6 +1493,7 @@ 'modify' => 'Ändern', 'modulation' => 'Modulation', 'monday' => 'Montag', +'monitor interface' => 'Monitor-Schnittstelle', 'month' => 'Monat', 'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', @@ -1665,7 +1667,7 @@ 'ovpn device' => 'OpenVPN-Gerät', 'ovpn dh' => 'Diffie-Hellman-Parameter-Länge', 'ovpn dh new key' => 'Neuen Diffie-Hellman Parameter erstellen', -'ovpn dh parameters' => 'Diffie-Hellman-Parameter-Optionen', +'ovpn dh parameters' => 'Diffie-Hellman-Parameter Optionen', 'ovpn dh upload' => 'Neuen Diffie-Hellman-Parameter hochladen', 'ovpn dl' => 'OVPN-Konfiguration downloaden', 'ovpn engines' => 'Krypto Engine', @@ -1934,7 +1936,7 @@ 'shares' => 'Freigaben', 'show ajax speedmeter in footer' => 'Ajax Speed Anzeige', 'show ca certificate' => 'CA Zertifikat anzeigen', -'show certificate' => 'Zertifikat anzeigen', +'show certificate' => 'Datei anzeigen', 'show crl' => 'Certificate Revocation List anzeigen', 'show dh' => 'Diffie-Hellman-Parameter anzeigen', 'show host certificate' => 'Host-Zertifikat anzeigen', @@ -2077,6 +2079,7 @@ 'time server' => 'Zeitserver', 'timeout must be a number' => 'Wartezeit muss eine Zahl sein.', 'title' => 'Titel', +'ta key' => 'TLS-Authentifizierungsschlüssel', 'to' => 'Bis', 'to email adr' => 'An Email Adresse', 'to install an update' => 'Um ein Update zu installieren, laden Sie zuerst die folgende .tgz.gpg Datei hoch:', @@ -2484,10 +2487,6 @@ 'urlfilter weekly' => 'wöchentlich', 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients', 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz', -'usb modem on acm0' => 'USB Modem an ACM0', -'usb modem on acm1' => 'USB Modem an ACM1', -'usb modem on acm2' => 'USB Modem an ACM2', -'usb modem on acm3' => 'USB Modem an ACM3', 'use' => 'Einsatz', 'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:', 'use dov' => 'DOV (Data Over Voice) benutzen:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e0686f3aa..b1cfa8310 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -536,7 +536,7 @@ 'ccd used' => 'Used addresses', 'cert' => 'Certificate', 'certificate' => 'Certificate', -'certificate authorities' => 'Certificate Authorities', +'certificate authorities' => 'Certificate Authorities and -Keys', 'certificate does not have a valid ca associated with it' => 'Certificate does not have a valid CA associated with it.', 'certificate file move failed' => 'Certificate file move failed', 'cfg restart' => 'A reboot is suggested after restoring a configuration archive.', @@ -574,7 +574,7 @@ 'connection' => 'Connection', 'connection closed' => 'Not connected...', 'connection debugging' => 'Connection debugging', -'connection status and controlc' => 'Connection status and control', +'connection status and controlc' => 'Connection Status and -Control', 'connection tracking' => 'iptables Connection Tracking', 'connection type' => 'Connection Type', 'connection type is invalid' => 'Connection type is invalid.', @@ -795,12 +795,13 @@ 'downlink std class' => 'downlink standard class', 'download' => 'download', 'download ca certificate' => 'Download CA certificate', -'download certificate' => 'Download certificate', +'download certificate' => 'Download file', 'download dh parameter' => 'Download Diffie-Hellman parameters', 'download host certificate' => 'Download host certificate', 'download new ruleset' => 'Download new ruleset', 'download pkcs12 file' => 'Download PKCS12 file', 'download root certificate' => 'Download root certificate', +'download tls-auth key' => 'Download tls-auth key', 'dpd action' => 'Action', 'dpd delay' => 'Delay', 'dpd timeout' => 'Timeout', @@ -1171,7 +1172,7 @@ 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient.', 'genkey' => 'Generate PSK', 'genre' => 'Genre', -'global settings' => 'Global settings', +'global settings' => 'Global Settings', 'gpl i accept these terms and conditions' => 'I accept these terms and conditions', 'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', @@ -1522,6 +1523,7 @@ 'modify' => 'Modify', 'modulation' => 'Modulation', 'monday' => 'Monday', +'monitor interface' => 'Monitor Interface', 'month' => 'Month', 'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', @@ -1968,7 +1970,7 @@ 'show ajax speedmeter in footer' => 'Show Ajax speedmeter', 'show areas' => 'show areas', 'show ca certificate' => 'Show CA certificate', -'show certificate' => 'Show certificate', +'show certificate' => 'Show file', 'show crl' => 'Show certificate revocation list', 'show dh' => 'Show Diffie-Hellman parameters', 'show host certificate' => 'Show host certificate', @@ -1976,6 +1978,7 @@ 'show lines' => 'Show lines', 'show root certificate' => 'Show root certificate', 'show share options' => 'Show shares options', +'show tls-auth key' => 'Show tls-auth key', 'shuffle' => 'Shuffle', 'shutdown' => 'Shutdown', 'shutdown ask' => 'Shutdown?', @@ -2087,6 +2090,7 @@ 'system log viewer' => 'System Log Viewer', 'system logs' => 'System Logs', 'system status information' => 'System Status Information', +'ta key' => 'TLS-Authentification-Key', 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', 'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.', @@ -2524,10 +2528,6 @@ 'urlfilter weekly' => 'weekly', 'urlfilter whitelist always allowed' => 'Allow custom whitelist for banned clients', 'urlfilter wrong filetype' => 'File has not the extension .tar.gz', -'usb modem on acm0' => 'USB Modem on ACM0', -'usb modem on acm1' => 'USB Modem on ACM1', -'usb modem on acm2' => 'USB Modem on ACM2', -'usb modem on acm3' => 'USB Modem on ACM3', 'use' => 'Use', 'use a pre-shared key' => 'Use a pre-shared key:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ae5bf14a6..2be3d36e4 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -2051,10 +2051,6 @@ 'urlfilter weekly' => 'semanalmente', 'urlfilter whitelist always allowed' => 'Permitir lista blanca personalizada para clientes censurados', 'urlfilter wrong filetype' => 'El archivo no tiene la extension .tar.gz', -'usb modem on acm0' => 'Modem USB en ACM0', -'usb modem on acm1' => 'Modem USB en ACM1', -'usb modem on acm2' => 'Modem USB en ACM2', -'usb modem on acm3' => 'Modem USB en ACM3', 'use' => 'Usar', 'use a pre-shared key' => 'Usar llave pre-compartida', 'use dov' => 'Usar datos sobre voz (DOV)', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 84e15a82b..f4e9518ff 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2065,10 +2065,6 @@ 'urlfilter weekly' => 'hebdomadairement', 'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis', 'urlfilter wrong filetype' => 'Le fichier n\'a pas l\'extension .tar.gz', -'usb modem on acm0' => 'Modem USB sur ACM0', -'usb modem on acm1' => 'Modem USB sur ACM1', -'usb modem on acm2' => 'Modem USB sur ACM2', -'usb modem on acm3' => 'Modem USB sur ACM3', 'use' => 'Utiliser', 'use a pre-shared key' => 'Utiliser une clé pré-partagée :', 'use dov' => 'Utilisez DOV (Data Over Voice):', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 767f93b95..b9e4c6f76 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -2481,10 +2481,6 @@ 'urlfilter weekly' => 'wekelijks', 'urlfilter whitelist always allowed' => 'Toestaan gebruik van eigen witte lijst voor verboden clients', 'urlfilter wrong filetype' => 'Bestand heeft niet de extensie .tar.gz', -'usb modem on acm0' => 'USB Modem op ACM0', -'usb modem on acm1' => 'USB Modem op ACM1', -'usb modem on acm2' => 'USB Modem op ACM2', -'usb modem on acm3' => 'USB Modem op ACM3', 'use' => 'Gebruik', 'use a pre-shared key' => 'Gebruik een pre-shared sleutel:', 'use dov' => 'Gebruik data over voice (DOV):', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 103e5262e..a79eed0e9 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -2074,10 +2074,6 @@ 'urlfilter weekly' => 'co tydzień', 'urlfilter whitelist always allowed' => 'Zezwolenie na białą listę dla zablokowanych klientów', 'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz', -'usb modem on acm0' => 'Modem USB na ACM0', -'usb modem on acm1' => 'Modem USB na ACM1', -'usb modem on acm2' => 'Modem USB na ACM2', -'usb modem on acm3' => 'Modem USB na ACM3', 'use' => 'Użyj', 'use a pre-shared key' => 'Użyj klucza współdzielonego:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2b680b066..e3aaab4fb 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -2069,10 +2069,6 @@ 'urlfilter weekly' => 'Еженедельно', 'urlfilter whitelist always allowed' => 'Разрешить пользовательский белый список для забаненых клиентов', 'urlfilter wrong filetype' => 'File has not the extension .tar.gz', -'usb modem on acm0' => 'USB Модем на ACM0', -'usb modem on acm1' => 'USB Модем на ACM1', -'usb modem on acm2' => 'USB Модем на ACM2', -'usb modem on acm3' => 'USB Модем на ACM3', 'use' => 'Use', 'use a pre-shared key' => 'Use a pre-shared key:', 'use dov' => 'Use data over voice (DOV):', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9eb5a4325..619f3f249 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -2484,10 +2484,6 @@ 'urlfilter weekly' => 'Haftalık', 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini', 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok', -'usb modem on acm0' => 'ACM0 üzerindeki USB Modem', -'usb modem on acm1' => 'ACM1 üzerindeki USB Modem', -'usb modem on acm2' => 'ACM2 üzerindeki USB Modem', -'usb modem on acm3' => 'ACM3 üzerindeki USB Modem', 'use' => 'Kullan', 'use a pre-shared key' => 'Ön paylaşımlı anahtar kullan:', 'use dov' => 'Ses üzerinden veri kullan (DOV):', diff --git a/lfs/libpcap b/lfs/libpcap index c6fdc2ef0..0f118a428 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -24,7 +24,7 @@ include Config -VER = 1.0.0 +VER = 1.4.0 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +CFLAGS += -fno-strict-aliasing + ############################################################################### # Top-level Rules ############################################################################### @@ -40,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d +$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c install : $(TARGET) @@ -70,15 +72,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make - cd $(DIR_APP) && make shared + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-shared-so - ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0 - ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1 - ln -svf libpcap.so.1 /usr/lib/libpcap.so - cd $(DIR_APP) && cp -vf pcap-int.h /usr/include @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index a86dab692..45e9ce661 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.41 +VER = 3.10.43 RPI_PATCHES = linux-3.10.38-grsec-1b49b45 -GRS_PATCHES = grsecurity-2.9.1-3.10.41-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.43-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 46 +PAK_VER = 49 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 08631db3e6b4328b0315f59ef3fa7b0a +$(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 = de48891a35952a3c6de5beea694f7557 +$(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b install : $(TARGET) @@ -160,6 +160,9 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch + # Moschip 7830 link detection + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch + ifeq "$(KCFG)" "-kirkwood" # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood diff --git a/lfs/openssl b/lfs/openssl index f842bb979..12cea68b2 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.1g +VER = 1.0.1h THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = de62b43dfcd858e66a74bee1c834e959 +$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf install : $(TARGET) diff --git a/make.sh b/make.sh index c17007653..162128def 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="78" # Core Level (Filename) -PAKFIRE_CORE="78" # Core Level (PAKFIRE) +CORE="80" # Core Level (Filename) +PAKFIRE_CORE="79" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds index d75a2e96c..faa765055 100644 --- a/src/initscripts/init.d/leds +++ b/src/initscripts/init.d/leds @@ -17,9 +17,11 @@ fi # Load ethernet settings eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) -if [ "${RED_DEV}" == "" ]; then - RED_DEV=ppp0 -fi +case "${RED_TYPE}" in + PPPOE) + RED_DEV="ppp0" + ;; +esac # setup_netdev_trigger LED DEVICE MODE setup_netdev_trigger () diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index b6d01009a..6cf8771ea 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -64,7 +64,7 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /bin/udevadm trigger + /bin/udevadm trigger --action=add # Now wait for udevd to process the uevents we triggered /bin/udevadm settle diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index db7a6cc72..309e006c9 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -542,7 +542,7 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal"); - replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 "); + replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,115200n8 panic=10 "); /*inittab*/ replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); diff --git a/src/install+setup/setup/misc.c b/src/install+setup/setup/misc.c index ae4f7800f..58e9bb275 100644 --- a/src/install+setup/setup/misc.c +++ b/src/install+setup/setup/misc.c @@ -27,7 +27,7 @@ int writehostsfiles(void) FILE *file, *hosts; struct keyvalue *kv; char hostname[STRING_SIZE]; - char domainname[STRING_SIZE] = ""; + char domainname[STRING_SIZE] = "localdomain"; char commandstring[STRING_SIZE]; char buffer[STRING_SIZE]; diff --git a/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch new file mode 100644 index 000000000..2114ae83b --- /dev/null +++ b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch @@ -0,0 +1,71 @@ +From 4e9792dc8ab29175295c79c35f9f6fbd2d453b35 Mon Sep 17 00:00:00 2001 +From: Octavian Purdila +Date: Mon, 23 Dec 2013 19:06:31 +0200 +Subject: [PATCH] usbnet: mcs7830: rework link state detection + +Even with the quirks in commit dabdaf0c (mcs7830: Fix link state +detection) there are still spurious link-down events for some chips +where the false link-down events count go over a few hundreds. + +This patch takes a more conservative approach and only looks at +link-down events where the link-down state is not combined with other +states (e.g. half/full speed, pending frames in SRAM or TX status +information valid). In all other cases we assume the link is up. + +Tested on MCS7830CV-DA (USB ID 9710:7830). + +Cc: Ondrej Zary +Cc: Michael Leun +Cc: Ming Lei +Signed-off-by: Octavian Purdila +Signed-off-by: David S. Miller +--- + drivers/net/usb/mcs7830.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 9237c45..8dd48b5 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -117,7 +117,6 @@ enum { + struct mcs7830_data { + u8 multi_filter[8]; + u8 config; +- u8 link_counter; + }; + + static const char driver_name[] = "MOSCHIP usb-ethernet driver"; +@@ -562,26 +561,16 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb) + { + u8 *buf = urb->transfer_buffer; + bool link, link_changed; +- struct mcs7830_data *data = mcs7830_get_data(dev); + + if (urb->actual_length < 16) + return; + +- link = !(buf[1] & 0x20); ++ link = !(buf[1] == 0x20); + link_changed = netif_carrier_ok(dev->net) != link; + if (link_changed) { +- data->link_counter++; +- /* +- track link state 20 times to guard against erroneous +- link state changes reported sometimes by the chip +- */ +- if (data->link_counter > 20) { +- data->link_counter = 0; +- usbnet_link_change(dev, link, 0); +- netdev_dbg(dev->net, "Link Status is: %d\n", link); +- } +- } else +- data->link_counter = 0; ++ usbnet_link_change(dev, link, 0); ++ netdev_dbg(dev->net, "Link Status is: %d\n", link); ++ } + } + + static const struct driver_info moschip_info = { +-- +2.0.0 + 
";
-		system("/usr/bin/vnstat -i $device");
-		print "