* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c80303cd452f8d6b41a4039e357d30b0ece19843
@ 2014-04-21 12:02 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-04-21 12:02 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 183291 bytes --]
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 c80303cd452f8d6b41a4039e357d30b0ece19843 (commit)
via c5e3d520e92aee074f1713f8ba98ee4296341ad3 (commit)
via b18b011b840ced8db756d75b7bd0e40c940e11b6 (commit)
via fab1f85783abd330657d6c0d331848e50347ca4c (commit)
via eae92b2bafe3a94a3c6c616f8ff02c6fa013e97a (commit)
via a78d662c7ae4cd0c12d3a69069afc6bb04e147e5 (commit)
via d22294fa7e70fa6eb907239ba00c2a0c7ae1863d (commit)
via cc81c4305319798f6c47a90acf8a84cdb7a281c8 (commit)
via 2dd3aa93f443ae2d29d92e3c6256329c8fb5ff46 (commit)
via 766c2f601dc6015a04855420f338eebcd4e815e3 (commit)
via 28e003e4861004579d1a271ac4255c62303c7b6a (commit)
via aa5f4b65685421555cf09eccb068890926512abd (commit)
via dd73ef846e9b75c52da993044c0bbba67dc8f7f6 (commit)
from 1d3c37402c4684e682aabe904f443b93b6dc4310 (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 c80303cd452f8d6b41a4039e357d30b0ece19843
Merge: 1d3c374 c5e3d52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 21 14:02:17 2014 +0200
Merge remote-tracking branch 'ms/modem-status' into next
Conflicts:
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
commit c5e3d520e92aee074f1713f8ba98ee4296341ad3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 16 01:26:28 2014 +0200
Add modem status page.
On this page, much useful information is displayed about
the hardware and the status of an LTE/3G or other kinds
of modems that respond to AT commands.
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/header.pl | 4 +
config/cfgroot/modem-lib.pl | 276 +++++++++++++++++++++
config/firewall/firewall-lib.pl | 3 +
config/firewall/rules.pl | 122 ++++++---
config/menu/20-status.menu | 5 +
config/menu/50-firewall.menu | 6 +-
config/rootfiles/common/apache2 | 1 +
config/rootfiles/common/configroot | 1 +
config/rootfiles/common/perl-Device-Modem | 18 ++
config/rootfiles/common/perl-Device-SerialPort | 10 +
config/rootfiles/core/{76 => 77}/exclude | 0
.../rootfiles/core/{76 => 77}/filelists/Net_SSLeay | 0
config/rootfiles/core/{76 => 77}/filelists/apache2 | 0
.../core/{76 => 77}/filelists/armv5tel/binutils | 0
.../core/{76 => 77}/filelists/armv5tel/dracut | 0
.../core/{76 => 77}/filelists/armv5tel/gcc | 0
.../core/{76 => 77}/filelists/armv5tel/glibc | 0
.../core/{76 => 77}/filelists/armv5tel/initscripts | 0
.../{76 => 77}/filelists/armv5tel/linux-kirkwood | 0
.../core/{76 => 77}/filelists/armv5tel/linux-multi | 0
.../core/{76 => 77}/filelists/armv5tel/linux-rpi | 0
.../core/{76 => 77}/filelists/armv5tel/lm_sensors | 0
.../{76 => 77}/filelists/armv5tel/rpi-firmware | 0
.../core/{76 => 77}/filelists/armv5tel/u-boot | 0
.../core/{76 => 77}/filelists/armv5tel/util-linux | 0
config/rootfiles/core/{76 => 77}/filelists/beep | 0
.../core/{76 => 77}/filelists/bridge-utils | 0
.../rootfiles/core/{76 => 77}/filelists/coreutils | 0
.../rootfiles/core/{76 => 77}/filelists/cyrus-sasl | 0
.../rootfiles/core/{76 => 77}/filelists/dosfstools | 0
.../core/{76 => 77}/filelists/dvb-firmwares | 0
.../rootfiles/core/{76 => 77}/filelists/e2fsprogs | 0
config/rootfiles/core/{76 => 77}/filelists/files | 0
.../rootfiles/core/{76 => 77}/filelists/fireinfo | 0
.../rootfiles/core/{76 => 77}/filelists/firewall | 0
.../core/{76 => 77}/filelists/i586/binutils | 0
.../core/{76 => 77}/filelists/i586/dracut | 0
.../rootfiles/core/{76 => 77}/filelists/i586/gcc | 0
.../rootfiles/core/{76 => 77}/filelists/i586/glibc | 0
.../rootfiles/core/{76 => 77}/filelists/i586/grub | 0
.../core/{76 => 77}/filelists/i586/initscripts | 0
.../rootfiles/core/{76 => 77}/filelists/i586/linux | 0
.../core/{76 => 77}/filelists/i586/lm_sensors | 0
.../{76 => 77}/filelists/i586/strongswan-padlock | 0
.../core/{76 => 77}/filelists/i586/util-linux | 0
.../rootfiles/core/{76 => 77}/filelists/iptables | 0
config/rootfiles/core/{76 => 77}/filelists/iw | 0
config/rootfiles/core/{76 => 77}/filelists/jquery | 0
config/rootfiles/core/{76 => 77}/filelists/kmod | 0
config/rootfiles/core/{76 => 77}/filelists/libnl | 0
config/rootfiles/core/{76 => 77}/filelists/libusbx | 0
config/rootfiles/core/{76 => 77}/filelists/libxml2 | 0
.../core/{76 => 77}/filelists/linux-firmware | 0
config/rootfiles/core/{76 => 77}/filelists/lzo | 0
.../rootfiles/core/{76 => 77}/filelists/misc-progs | 0
.../rootfiles/core/{76 => 77}/filelists/mysql-libs | 0
.../rootfiles/core/{76 => 77}/filelists/net-tools | 0
config/rootfiles/core/{76 => 77}/filelists/ntp | 0
config/rootfiles/core/{76 => 77}/filelists/openssh | 0
config/rootfiles/core/{76 => 77}/filelists/openssl | 0
.../core/{76 => 77}/filelists/openssl-compat | 0
config/rootfiles/core/{76 => 77}/filelists/openvpn | 0
config/rootfiles/core/{76 => 77}/filelists/pakfire | 0
config/rootfiles/core/{76 => 77}/filelists/paxctl | 0
config/rootfiles/core/{76 => 77}/filelists/php | 0
.../rootfiles/core/{76 => 77}/filelists/rng-tools | 0
config/rootfiles/core/{76 => 77}/filelists/setup | 0
.../rootfiles/core/{76 => 77}/filelists/strongswan | 0
config/rootfiles/core/{76 => 77}/filelists/tzdata | 0
config/rootfiles/core/{76 => 77}/filelists/udev | 0
.../core/{76 => 77}/filelists/usb_modeswitch | 0
.../core/{76 => 77}/filelists/usb_modeswitch_data | 0
.../rootfiles/core/{76 => 77}/filelists/usbutils | 0
config/rootfiles/core/{76 => 77}/filelists/vim | 0
config/rootfiles/core/{76 => 77}/filelists/wget | 0
.../core/{76 => 77}/filelists/wpa_supplicant | 0
config/rootfiles/core/{76 => 77}/filelists/xz | 0
config/rootfiles/core/{76 => 77}/meta | 0
config/rootfiles/core/{76 => 77}/update.sh | 2 +-
doc/language_issues.de | 5 +-
doc/language_issues.en | 5 +-
doc/language_issues.es | 25 +-
doc/language_issues.fr | 25 +-
doc/language_issues.nl | 25 +-
doc/language_issues.pl | 25 +-
doc/language_issues.ru | 25 +-
doc/language_issues.tr | 25 +-
doc/language_missings | 80 ++++++
html/cgi-bin/firewall.cgi | 10 +-
html/cgi-bin/fwhosts.cgi | 2 +-
html/cgi-bin/media.cgi | 2 +-
html/cgi-bin/modem-status.cgi | 211 ++++++++++++++++
html/cgi-bin/pppsetup.cgi | 29 +++
langs/de/cgi-bin/de.pl | 24 +-
langs/en/cgi-bin/en.pl | 20 ++
lfs/configroot | 1 +
lfs/linux | 10 +-
lfs/{GD-Graph => perl-Device-Modem} | 8 +-
lfs/{GD-Graph => perl-Device-SerialPort} | 8 +-
lfs/strongswan | 4 +-
make.sh | 6 +-
src/initscripts/init.d/firewall | 1 -
102 files changed, 953 insertions(+), 71 deletions(-)
create mode 100644 config/cfgroot/modem-lib.pl
create mode 100644 config/rootfiles/common/perl-Device-Modem
create mode 100644 config/rootfiles/common/perl-Device-SerialPort
rename config/rootfiles/core/{76 => 77}/exclude (100%)
rename config/rootfiles/core/{76 => 77}/filelists/Net_SSLeay (100%)
rename config/rootfiles/core/{76 => 77}/filelists/apache2 (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/binutils (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/dracut (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/gcc (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/glibc (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/initscripts (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/linux-kirkwood (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/linux-multi (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/linux-rpi (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/lm_sensors (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/rpi-firmware (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/u-boot (100%)
rename config/rootfiles/core/{76 => 77}/filelists/armv5tel/util-linux (100%)
rename config/rootfiles/core/{76 => 77}/filelists/beep (100%)
rename config/rootfiles/core/{76 => 77}/filelists/bridge-utils (100%)
rename config/rootfiles/core/{76 => 77}/filelists/coreutils (100%)
rename config/rootfiles/core/{76 => 77}/filelists/cyrus-sasl (100%)
rename config/rootfiles/core/{76 => 77}/filelists/dosfstools (100%)
rename config/rootfiles/core/{76 => 77}/filelists/dvb-firmwares (100%)
rename config/rootfiles/core/{76 => 77}/filelists/e2fsprogs (100%)
rename config/rootfiles/core/{76 => 77}/filelists/files (100%)
rename config/rootfiles/core/{76 => 77}/filelists/fireinfo (100%)
rename config/rootfiles/core/{76 => 77}/filelists/firewall (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/binutils (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/dracut (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/gcc (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/glibc (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/grub (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/initscripts (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/linux (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/lm_sensors (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/strongswan-padlock (100%)
rename config/rootfiles/core/{76 => 77}/filelists/i586/util-linux (100%)
rename config/rootfiles/core/{76 => 77}/filelists/iptables (100%)
rename config/rootfiles/core/{76 => 77}/filelists/iw (100%)
rename config/rootfiles/core/{76 => 77}/filelists/jquery (100%)
rename config/rootfiles/core/{76 => 77}/filelists/kmod (100%)
rename config/rootfiles/core/{76 => 77}/filelists/libnl (100%)
rename config/rootfiles/core/{76 => 77}/filelists/libusbx (100%)
rename config/rootfiles/core/{76 => 77}/filelists/libxml2 (100%)
rename config/rootfiles/core/{76 => 77}/filelists/linux-firmware (100%)
rename config/rootfiles/core/{76 => 77}/filelists/lzo (100%)
rename config/rootfiles/core/{76 => 77}/filelists/misc-progs (100%)
rename config/rootfiles/core/{76 => 77}/filelists/mysql-libs (100%)
rename config/rootfiles/core/{76 => 77}/filelists/net-tools (100%)
rename config/rootfiles/core/{76 => 77}/filelists/ntp (100%)
rename config/rootfiles/core/{76 => 77}/filelists/openssh (100%)
rename config/rootfiles/core/{76 => 77}/filelists/openssl (100%)
rename config/rootfiles/core/{76 => 77}/filelists/openssl-compat (100%)
rename config/rootfiles/core/{76 => 77}/filelists/openvpn (100%)
rename config/rootfiles/core/{76 => 77}/filelists/pakfire (100%)
rename config/rootfiles/core/{76 => 77}/filelists/paxctl (100%)
rename config/rootfiles/core/{76 => 77}/filelists/php (100%)
rename config/rootfiles/core/{76 => 77}/filelists/rng-tools (100%)
rename config/rootfiles/core/{76 => 77}/filelists/setup (100%)
rename config/rootfiles/core/{76 => 77}/filelists/strongswan (100%)
rename config/rootfiles/core/{76 => 77}/filelists/tzdata (100%)
rename config/rootfiles/core/{76 => 77}/filelists/udev (100%)
rename config/rootfiles/core/{76 => 77}/filelists/usb_modeswitch (100%)
rename config/rootfiles/core/{76 => 77}/filelists/usb_modeswitch_data (100%)
rename config/rootfiles/core/{76 => 77}/filelists/usbutils (100%)
rename config/rootfiles/core/{76 => 77}/filelists/vim (100%)
rename config/rootfiles/core/{76 => 77}/filelists/wget (100%)
rename config/rootfiles/core/{76 => 77}/filelists/wpa_supplicant (100%)
rename config/rootfiles/core/{76 => 77}/filelists/xz (100%)
rename config/rootfiles/core/{76 => 77}/meta (100%)
rename config/rootfiles/core/{76 => 77}/update.sh (99%)
create mode 100755 html/cgi-bin/modem-status.cgi
copy lfs/{GD-Graph => perl-Device-Modem} (94%)
copy lfs/{GD-Graph => perl-Device-SerialPort} (94%)
Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 39472a8..bbb7e21 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -153,6 +153,10 @@ sub genmenu {
if (&General::RedIsWireless()) {
$menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1;
}
+
+ if ($ethsettings{'RED_TYPE'} eq "PPPOE") {
+ $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
+ }
}
sub showhttpheaders
diff --git a/config/cfgroot/modem-lib.pl b/config/cfgroot/modem-lib.pl
new file mode 100644
index 0000000..51b6d68
--- /dev/null
+++ b/config/cfgroot/modem-lib.pl
@@ -0,0 +1,276 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use Device::Modem;
+
+package Modem;
+
+sub new() {
+ my $class = shift;
+
+ my $port = shift;
+ my $baud = shift;
+
+ my $self = {};
+ bless $self, $class;
+
+ # Initialize the connetion to the modem.
+ $self->_initialize($port, $baud);
+
+ if ($self->_is_working()) {
+ return $self;
+ }
+
+ return undef;
+}
+
+sub DESTROY() {
+ my $self = shift;
+
+ # Close connection to modem.
+ if ($self->{modem}) {
+ $self->{modem}->close();
+ }
+}
+
+sub _initialize() {
+ my ($self, $port, $baud) = @_;
+
+ # Establish connection to the modem.
+ $self->{modem} = new Device::Modem(port => $port);
+ $self->{modem}->connect(baudrate => $baud);
+}
+
+sub _is_working() {
+ my $self = shift;
+
+ # Check if the modem responds to AT commands.
+ $self->{modem}->atsend("AT\r\n");
+
+ my $response = $self->{modem}->answer();
+ return ($response eq "OK");
+}
+
+sub _command() {
+ my $self = shift;
+ my $cmd = shift;
+
+ # Terminate the AT command with newline.
+ $cmd .= "\r\n";
+
+ $self->{modem}->atsend($cmd);
+
+ my $response = $self->{modem}->answer();
+ my @response = split(/\n/, $response);
+
+ # Trim leading and trailing spaces.
+ foreach my $line (@response) {
+ $line =~ s/^\s+|\s+$//g;
+ chomp($line);
+ }
+
+ my $last_element = pop(@response);
+ unless ($last_element eq "OK") {
+ push(@response, $last_element);
+ }
+
+ $response = join("\n", @response);
+
+ return $self->_trim($response);
+}
+
+sub _trim() {
+ my $self = shift;
+ my $input = shift;
+
+ my $first_char = substr($input, 0, 1);
+ if ($first_char eq "+") {
+ my @output = split(/:/, $input);
+ if ($#output == 1) {
+ return $output[1];
+ }
+ }
+
+ return $input;
+}
+
+sub get_vendor() {
+ my $self = shift;
+
+ return $self->_command("AT+GMI");
+}
+
+sub get_model() {
+ my $self = shift;
+
+ return $self->_command("AT+GMM");
+}
+
+sub get_software_version() {
+ my $self = shift;
+
+ return $self->_command("AT+GMR");
+}
+
+sub get_imei() {
+ my $self = shift;
+
+ return $self->_command("AT+GSN");
+}
+
+sub get_capabilities() {
+ my $self = shift;
+
+ my $output = $self->_command("AT+GCAP");
+ return split(/,/, $output);
+}
+
+sub is_sim_unlocked() {
+ my $self = shift;
+
+ # TODO
+ return 1;
+}
+
+sub get_sim_imsi() {
+ my $self = shift;
+
+ if ($self->is_sim_unlocked()) {
+ return $self->_command("AT+CIMI");
+ }
+}
+
+sub get_network_registration() {
+ my $self = shift;
+
+ my @elements;
+ foreach my $i ([0, 1]) {
+ my $output = $self->_command("AT+CREG?");
+
+ @elements = split(/,/, $output);
+ if ($#elements != 2) {
+ # Output in wrong format. Resetting.
+ $self->_command("AT+CREG=0");
+ }
+ }
+
+ if ($elements[0] == 0) {
+ if ($elements[1] == 0) {
+ return "NOT REGISTERED, NOT SEARCHING";
+ } elsif ($elements[1] == 1) {
+ return "REGISTERED TO HOME NETWORK";
+ } elsif ($elements[1] == 2) {
+ return "NOT REGISTERED, SEARCHING";
+ } elsif ($elements[1] == 3) {
+ return "REGISTRATION DENIED";
+ } elsif ($elements[1] == 5) {
+ return "REGISTERED, ROAMING";
+ } else {
+ return "UNKNOWN";
+ }
+ }
+}
+
+sub _get_network_operator() {
+ my $self = shift;
+
+ my $output = $self->_command("AT+COPS?");
+ $output =~ s/\"//g;
+
+ my @elements = split(/,/, $output);
+ if ($#elements == 3) {
+ return @elements;
+ }
+}
+
+sub get_network_operator() {
+ my $self = shift;
+
+ my ($mode, $format, $operator, $act) = $self->_get_network_operator();
+
+ return $operator;
+}
+
+sub get_network_mode() {
+ my $self = shift;
+
+ my ($mode, $format, $operator, $act) = $self->_get_network_operator();
+
+ if ($act == 0) {
+ return "GSM";
+ } elsif ($act == 1) {
+ return "Compact GSM";
+ } elsif ($act == 2) {
+ return "UMTS";
+ } elsif ($act == 3) {
+ return "GSM WITH EGPRS";
+ } elsif ($act == 4) {
+ return "UMTS WITH HSDPA";
+ } elsif ($act == 5) {
+ return "UMTS WITH HSUPA";
+ } elsif ($act == 6) {
+ return "UMTS WITH HSDPA+HSUPA";
+ } elsif ($act == 7) {
+ return "LTE";
+ } else {
+ return "UNKNOWN ($act)";
+ }
+}
+
+sub _get_signal_quality() {
+ my $self = shift;
+
+ my $output = $self->_command("AT+CSQ");
+
+ my @elements = split(/,/, $output);
+ if ($#elements == 1) {
+ return @elements;
+ }
+}
+
+sub get_signal_quality() {
+ my $self = shift;
+
+ my ($rssi, $ber) = $self->_get_signal_quality();
+
+ # 99 equals unknown.
+ unless ($rssi == 99) {
+ my $dbm = ($rssi * 2) - 113;
+ return $dbm;
+ }
+
+ return undef;
+}
+
+sub get_bit_error_rate() {
+ my $self = shift;
+
+ my ($rssi, $ber) = $self->_get_signal_quality();
+
+ # 99 indicates unknown.
+ unless ($ber == 99) {
+ return $ber;
+ }
+
+ return undef;
+}
+
+1;
diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index 9f546a9..c4a19e5 100755
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -520,6 +520,9 @@ sub get_internal_firewall_ip_address
return 0;
}
+ # Convert net mask into correct format for &General::IpInSubnet().
+ $net_mask = &General::iporsubtodec($net_mask);
+
my @addresses = &get_internal_firewall_ip_addresses($use_orange);
foreach my $zone_address (@addresses) {
if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) {
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 92f1c0a..2c314d1 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -47,6 +47,7 @@ my @PROTOCOLS_WITH_PORTS = ("tcp", "udp");
my @VALID_TARGETS = ("ACCEPT", "DROP", "REJECT");
my %fwdfwsettings=();
+my %fwoptions = ();
my %defaultNetworks=();
my %configfwdfw=();;
my %customgrp=();
@@ -63,6 +64,7 @@ my $configgrp = "${General::swroot}/fwhosts/customgroups";
my $netsettings = "${General::swroot}/ethernet/settings";
&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/optionsfw/settings", \%fwoptions);
&General::readhash("$netsettings", \%defaultNetworks);
&General::readhasharray($configfwdfw, \%configfwdfw);
&General::readhasharray($configinput, \%configinputfw);
@@ -71,6 +73,14 @@ my $netsettings = "${General::swroot}/ethernet/settings";
my @log_limit_options = &make_log_limit_options();
+my $POLICY_INPUT_ALLOWED = 0;
+my $POLICY_FORWARD_ALLOWED = ($fwdfwsettings{"POLICY"} eq "MODE2");
+my $POLICY_OUTPUT_ALLOWED = ($fwdfwsettings{"POLICY1"} eq "MODE2");
+
+my $POLICY_INPUT_ACTION = $fwoptions{"FWPOLICY2"};
+my $POLICY_FORWARD_ACTION = $fwoptions{"FWPOLICY"};
+my $POLICY_OUTPUT_ACTION = $fwoptions{"FWPOLICY1"};
+
# MAIN
&main();
@@ -131,20 +141,47 @@ sub flush {
}
sub preparerules {
- if (! -z "${General::swroot}/firewall/config"){
- &buildrules(\%configfwdfw);
- }
if (! -z "${General::swroot}/firewall/input"){
&buildrules(\%configinputfw);
}
if (! -z "${General::swroot}/firewall/outgoing"){
&buildrules(\%configoutgoingfw);
}
+ if (! -z "${General::swroot}/firewall/config"){
+ &buildrules(\%configfwdfw);
+ }
}
sub buildrules {
my $hash = shift;
+ # Search for targets that need to be specially handled when adding
+ # forwarding rules. Additional rules will automatically get inserted
+ # into the INPUT/OUTPUT chains for these targets.
+ my @special_input_targets = ();
+ if (!$POLICY_FORWARD_ALLOWED) {
+ push(@special_input_targets, "ACCEPT");
+ }
+
+ if ($POLICY_INPUT_ACTION eq "DROP") {
+ push(@special_input_targets, "REJECT");
+ } elsif ($POLICY_INPUT_ACTION eq "REJECT") {
+ push(@special_input_targets, "DROP");
+ }
+
+ my @special_output_targets = ();
+ if ($POLICY_OUTPUT_ALLOWED) {
+ push(@special_output_targets, ("DROP", "REJECT"));
+ } else {
+ push(@special_output_targets, "ACCEPT");
+
+ if ($POLICY_OUTPUT_ACTION eq "DROP") {
+ push(@special_output_targets, "REJECT");
+ } elsif ($POLICY_OUTPUT_ACTION eq "REJECT") {
+ push(@special_output_targets, "DROP");
+ }
+ }
+
foreach my $key (sort {$a <=> $b} keys %$hash) {
# Skip disabled rules.
next unless ($$hash{$key}[2] eq 'ON');
@@ -297,11 +334,16 @@ sub buildrules {
# Add time constraint options.
push(@options, @time_options);
- my $firewall_is_in_source_subnet = 0;
+ my $firewall_is_in_source_subnet = 1;
if ($source) {
$firewall_is_in_source_subnet = &firewall_is_in_subnet($source);
}
+ my $firewall_is_in_destination_subnet = 1;
+ if ($destination) {
+ $firewall_is_in_destination_subnet = &firewall_is_in_subnet($destination);
+ }
+
# Process NAT rules.
if ($NAT) {
my $nat_address = &fwlib::get_nat_address($$hash{$key}[29], $source);
@@ -380,14 +422,6 @@ sub buildrules {
}
push(@options, @source_options);
-
- if ($firewall_is_in_source_subnet && ($fwdfwsettings{"POLICY"} eq "MODE1") && ($chain eq $CHAIN_FORWARD)) {
- if ($LOG && !$NAT) {
- run("$IPTABLES -A $CHAIN_INPUT @options @log_limit_options -j LOG --log-prefix '$CHAIN_INPUT '");
- }
- run("$IPTABLES -A $CHAIN_INPUT @options -j $target");
- }
-
push(@options, @destination_options);
# Insert firewall rule.
@@ -395,6 +429,27 @@ sub buildrules {
run("$IPTABLES -A $chain @options @log_limit_options -j LOG --log-prefix '$chain '");
}
run("$IPTABLES -A $chain @options -j $target");
+
+ # Handle forwarding rules and add corresponding rules for firewall access.
+ if ($chain eq $CHAIN_FORWARD) {
+ # If the firewall is part of the destination subnet and access to the destination network
+ # is granted/forbidden for any network that the firewall itself is part of, we grant/forbid access
+ # for the firewall, too.
+ if ($firewall_is_in_destination_subnet && ($target ~~ @special_input_targets)) {
+ if ($LOG && !$NAT) {
+ run("$IPTABLES -A $CHAIN_INPUT @options @log_limit_options -j LOG --log-prefix '$CHAIN_INPUT '");
+ }
+ run("$IPTABLES -A $CHAIN_INPUT @options -j $target");
+ }
+
+ # Likewise.
+ if ($firewall_is_in_source_subnet && ($target ~~ @special_output_targets)) {
+ if ($LOG && !$NAT) {
+ run("$IPTABLES -A $CHAIN_OUTPUT @options @log_limit_options -j LOG --log-prefix '$CHAIN_OUTPUT '");
+ }
+ run("$IPTABLES -A $CHAIN_OUTPUT @options -j $target");
+ }
+ }
}
}
}
@@ -440,29 +495,29 @@ sub time_convert_to_minutes {
}
sub p2pblock {
- my $P2PSTRING = "";
- my $DO;
- open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
- @p2ps = <FILE>;
- close FILE;
- my $CMD = "-m ipp2p";
- foreach my $p2pentry (sort @p2ps) {
- my @p2pline = split( /\;/, $p2pentry );
- if ( $fwdfwsettings{'POLICY'} eq 'MODE1' ) {
- $DO = "ACCEPT";
- if ("$p2pline[2]" eq "on") {
- $P2PSTRING = "$P2PSTRING --$p2pline[1]";
- }
- }else {
- $DO = "RETURN";
- if ("$p2pline[2]" eq "off") {
- $P2PSTRING = "$P2PSTRING --$p2pline[1]";
- }
- }
+ my $search_action;
+ my $target;
+
+ if ($fwdfwsettings{"POLICY"} eq "MODE1") {
+ $search_action = "on";
+ $target = "ACCEPT";
+ } else {
+ $search_action = "off";
+ $target = "DROP";
}
- if($P2PSTRING) {
- run("$IPTABLES -A FORWARDFW $CMD $P2PSTRING -j $DO");
+ open(FILE, "<$p2pfile") or die "Unable to read $p2pfile";
+ my @protocols = ();
+ foreach my $p2pentry (<FILE>) {
+ my @p2pline = split(/\;/, $p2pentry);
+ next unless ($p2pline[2] eq $search_action);
+
+ push(@protocols, "--$p2pline[1]");
+ }
+ close(FILE);
+
+ if (@protocols) {
+ run("$IPTABLES -A FORWARDFW -m ipp2p @protocols -j $target");
}
}
@@ -675,4 +730,3 @@ sub firewall_is_in_subnet {
return 0;
}
-
diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 8899310..b159ed6 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -70,6 +70,11 @@
'title' => "$Lang::tr{'qos graphs'}",
'enabled' => 1,
};
+ $substatus->{'74.modem-status'} = {'caption' => $Lang::tr{'modem status'},
+ 'uri' => '/cgi-bin/modem-status.cgi',
+ 'title' => $Lang::tr{'modem status'},
+ 'enabled' => 0,
+ };
$substatus->{'75.atm-status'} = {'caption' => 'Atm-status',
'uri' => '/cgi-bin/atm-status.cgi',
'title' => 'Atm-status',
diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index ce6fd9d..e872e64 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,7 +1,7 @@
- $subfirewall->{'10.forward'} = {
- 'caption' => $Lang::tr{'fwdfw menu'},
+ $subfirewall->{'10.firewall'} = {
+ 'caption' => $Lang::tr{'firewall rules'},
'uri' => '/cgi-bin/firewall.cgi',
- 'title' => "$Lang::tr{'fwdfw menu'}",
+ 'title' => "$Lang::tr{'firewall rules'}",
'enabled' => 1,
};
$subfirewall->{'20.fwhost'} = {
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 2dd14cc..474e7a7 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1415,6 +1415,7 @@ srv/web/ipfire/cgi-bin/mac.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/modem.cgi
+srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index b5de989..6afe6cd 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -116,6 +116,7 @@ var/ipfire/menu.d/70-log.menu
var/ipfire/modem
#var/ipfire/modem/defaults
#var/ipfire/modem/settings
+var/ipfire/modem-lib.pl
var/ipfire/net-traffic
#var/ipfire/net-traffic/net-traffic-admin.pl
#var/ipfire/net-traffic/net-traffic-lib.pl
diff --git a/config/rootfiles/common/perl-Device-Modem b/config/rootfiles/common/perl-Device-Modem
new file mode 100644
index 0000000..9e8da1c
--- /dev/null
+++ b/config/rootfiles/common/perl-Device-Modem
@@ -0,0 +1,18 @@
+#usr/lib/perl5/site_perl/5.12.3/Device
+#usr/lib/perl5/site_perl/5.12.3/Device/Modem
+usr/lib/perl5/site_perl/5.12.3/Device/Modem.pm
+#usr/lib/perl5/site_perl/5.12.3/Device/Modem/FAQ.pod
+#usr/lib/perl5/site_perl/5.12.3/Device/Modem/Log
+usr/lib/perl5/site_perl/5.12.3/Device/Modem/Log/File.pm
+usr/lib/perl5/site_perl/5.12.3/Device/Modem/Log/Syslog.pm
+#usr/lib/perl5/site_perl/5.12.3/Device/Modem/Protocol
+usr/lib/perl5/site_perl/5.12.3/Device/Modem/Protocol/Xmodem.pm
+usr/lib/perl5/site_perl/5.12.3/Device/Modem/UsRobotics.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/Modem
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/Modem/.packlist
+#usr/share/man/man3/Device::Modem.3
+#usr/share/man/man3/Device::Modem::FAQ.3
+#usr/share/man/man3/Device::Modem::Log::File.3
+#usr/share/man/man3/Device::Modem::Log::Syslog.3
+#usr/share/man/man3/Device::Modem::Protocol::Xmodem.3
+#usr/share/man/man3/Device::Modem::UsRobotics.3
diff --git a/config/rootfiles/common/perl-Device-SerialPort b/config/rootfiles/common/perl-Device-SerialPort
new file mode 100644
index 0000000..dccc425
--- /dev/null
+++ b/config/rootfiles/common/perl-Device-SerialPort
@@ -0,0 +1,10 @@
+#usr/bin/modemtest
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Device
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Device/SerialPort.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/SerialPort
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/SerialPort/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/SerialPort/SerialPort.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Device/SerialPort/SerialPort.so
+#usr/share/man/man1/modemtest.1
+#usr/share/man/man3/Device::SerialPort.3
diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude
deleted file mode 100644
index 18e9b4d..0000000
--- a/config/rootfiles/core/76/exclude
+++ /dev/null
@@ -1,20 +0,0 @@
-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/76/filelists/Net_SSLeay b/config/rootfiles/core/76/filelists/Net_SSLeay
deleted file mode 120000
index 13fe056..0000000
--- a/config/rootfiles/core/76/filelists/Net_SSLeay
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/Net_SSLeay
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/apache2 b/config/rootfiles/core/76/filelists/apache2
deleted file mode 120000
index eef95ef..0000000
--- a/config/rootfiles/core/76/filelists/apache2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/binutils b/config/rootfiles/core/76/filelists/armv5tel/binutils
deleted file mode 120000
index ac971f9..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/binutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/dracut b/config/rootfiles/core/76/filelists/armv5tel/dracut
deleted file mode 120000
index 861df3f..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/dracut
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/gcc b/config/rootfiles/core/76/filelists/armv5tel/gcc
deleted file mode 120000
index 84f7b93..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/glibc b/config/rootfiles/core/76/filelists/armv5tel/glibc
deleted file mode 120000
index 4c70d72..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/initscripts b/config/rootfiles/core/76/filelists/armv5tel/initscripts
deleted file mode 120000
index af1d762..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/initscripts
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/initscripts
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/76/filelists/armv5tel/linux-kirkwood
deleted file mode 120000
index 7217107..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/linux-kirkwood
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/linux-multi b/config/rootfiles/core/76/filelists/armv5tel/linux-multi
deleted file mode 120000
index 204eb4c..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/linux-multi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/linux-rpi b/config/rootfiles/core/76/filelists/armv5tel/linux-rpi
deleted file mode 120000
index a651a49..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/linux-rpi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/lm_sensors b/config/rootfiles/core/76/filelists/armv5tel/lm_sensors
deleted file mode 120000
index eec84cd..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/lm_sensors
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/76/filelists/armv5tel/rpi-firmware
deleted file mode 120000
index 428fdf8..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/rpi-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/rpi-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/u-boot b/config/rootfiles/core/76/filelists/armv5tel/u-boot
deleted file mode 120000
index 3df31a8..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/u-boot
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/armv5tel/util-linux b/config/rootfiles/core/76/filelists/armv5tel/util-linux
deleted file mode 120000
index 2596908..0000000
--- a/config/rootfiles/core/76/filelists/armv5tel/util-linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/beep b/config/rootfiles/core/76/filelists/beep
deleted file mode 120000
index 6db094e..0000000
--- a/config/rootfiles/core/76/filelists/beep
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/beep
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/bridge-utils b/config/rootfiles/core/76/filelists/bridge-utils
deleted file mode 120000
index 3dee211..0000000
--- a/config/rootfiles/core/76/filelists/bridge-utils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/bridge-utils
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/coreutils b/config/rootfiles/core/76/filelists/coreutils
deleted file mode 120000
index 7351ed2..0000000
--- a/config/rootfiles/core/76/filelists/coreutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/cyrus-sasl b/config/rootfiles/core/76/filelists/cyrus-sasl
deleted file mode 120000
index bb51b4c..0000000
--- a/config/rootfiles/core/76/filelists/cyrus-sasl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/cyrus-sasl
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/dosfstools b/config/rootfiles/core/76/filelists/dosfstools
deleted file mode 120000
index 087ccb0..0000000
--- a/config/rootfiles/core/76/filelists/dosfstools
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dosfstools
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/dvb-firmwares b/config/rootfiles/core/76/filelists/dvb-firmwares
deleted file mode 120000
index 69d0cdc..0000000
--- a/config/rootfiles/core/76/filelists/dvb-firmwares
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dvb-firmwares
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/e2fsprogs b/config/rootfiles/core/76/filelists/e2fsprogs
deleted file mode 120000
index 37b55de..0000000
--- a/config/rootfiles/core/76/filelists/e2fsprogs
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files
deleted file mode 100644
index ea71ac4..0000000
--- a/config/rootfiles/core/76/filelists/files
+++ /dev/null
@@ -1,33 +0,0 @@
-etc/system-release
-etc/issue
-etc/collectd.conf
-etc/rc.d/init.d/network
-etc/sysctl.conf
-run
-srv/web/ipfire/cgi-bin/credits.cgi
-srv/web/ipfire/cgi-bin/gui.cgi
-srv/web/ipfire/cgi-bin/entropy.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/netinternal.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/upnp.cgi
-srv/web/ipfire/cgi-bin/speed.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
-srv/web/ipfire/html/themes/darkdos
-srv/web/ipfire/html/themes/ipfire
-srv/web/ipfire/html/themes/ipfire-legacy
-srv/web/ipfire/html/themes/maniac
-usr/lib/firewall
-usr/local/bin/timezone-transition
-usr/local/bin/setddns.pl
-usr/sbin/updxlrator
-var/ipfire/backup/bin/backup.pl
-var/ipfire/backup/exclude
-var/ipfire/backup/include
-var/ipfire/general-functions.pl
-var/ipfire/header.pl
-var/ipfire/graphs.pl
-var/ipfire/langs
-var/ipfire/menu.d/10-system.menu
diff --git a/config/rootfiles/core/76/filelists/fireinfo b/config/rootfiles/core/76/filelists/fireinfo
deleted file mode 120000
index c461155..0000000
--- a/config/rootfiles/core/76/filelists/fireinfo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/firewall b/config/rootfiles/core/76/filelists/firewall
deleted file mode 100644
index 6eeaeae..0000000
--- a/config/rootfiles/core/76/filelists/firewall
+++ /dev/null
@@ -1,14 +0,0 @@
-etc/rc.d/init.d/firewall
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/p2p-block.cgi
-usr/sbin/convert-dmz
-usr/sbin/convert-outgoingfw
-usr/sbin/convert-portfw
-usr/sbin/convert-xtaccess
-usr/sbin/firewall-policy
-var/ipfire/firewall/p2protocols
-var/ipfire/fwhosts/icmp-types
-var/ipfire/menu.d/50-firewall.menu
-var/ipfire/fwhosts/customservices.default
diff --git a/config/rootfiles/core/76/filelists/i586/binutils b/config/rootfiles/core/76/filelists/i586/binutils
deleted file mode 120000
index 78695d7..0000000
--- a/config/rootfiles/core/76/filelists/i586/binutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/dracut b/config/rootfiles/core/76/filelists/i586/dracut
deleted file mode 120000
index 9a09010..0000000
--- a/config/rootfiles/core/76/filelists/i586/dracut
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/gcc b/config/rootfiles/core/76/filelists/i586/gcc
deleted file mode 120000
index ba328e3..0000000
--- a/config/rootfiles/core/76/filelists/i586/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/glibc b/config/rootfiles/core/76/filelists/i586/glibc
deleted file mode 120000
index 943021f..0000000
--- a/config/rootfiles/core/76/filelists/i586/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/grub b/config/rootfiles/core/76/filelists/i586/grub
deleted file mode 120000
index feb236a..0000000
--- a/config/rootfiles/core/76/filelists/i586/grub
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/initscripts b/config/rootfiles/core/76/filelists/i586/initscripts
deleted file mode 120000
index 12d8770..0000000
--- a/config/rootfiles/core/76/filelists/i586/initscripts
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/initscripts
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/linux b/config/rootfiles/core/76/filelists/i586/linux
deleted file mode 120000
index 693ec4b..0000000
--- a/config/rootfiles/core/76/filelists/i586/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/lm_sensors b/config/rootfiles/core/76/filelists/i586/lm_sensors
deleted file mode 120000
index 17d6c01..0000000
--- a/config/rootfiles/core/76/filelists/i586/lm_sensors
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/strongswan-padlock b/config/rootfiles/core/76/filelists/i586/strongswan-padlock
deleted file mode 120000
index 2412824..0000000
--- a/config/rootfiles/core/76/filelists/i586/strongswan-padlock
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/i586/util-linux b/config/rootfiles/core/76/filelists/i586/util-linux
deleted file mode 120000
index c973106..0000000
--- a/config/rootfiles/core/76/filelists/i586/util-linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/iptables b/config/rootfiles/core/76/filelists/iptables
deleted file mode 120000
index 8caf12b..0000000
--- a/config/rootfiles/core/76/filelists/iptables
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iptables
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/iw b/config/rootfiles/core/76/filelists/iw
deleted file mode 120000
index 7c58a20..0000000
--- a/config/rootfiles/core/76/filelists/iw
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/jquery b/config/rootfiles/core/76/filelists/jquery
deleted file mode 120000
index 65df10c..0000000
--- a/config/rootfiles/core/76/filelists/jquery
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/jquery
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/kmod b/config/rootfiles/core/76/filelists/kmod
deleted file mode 120000
index 0020e19..0000000
--- a/config/rootfiles/core/76/filelists/kmod
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/kmod
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/libnl b/config/rootfiles/core/76/filelists/libnl
deleted file mode 120000
index 7181849..0000000
--- a/config/rootfiles/core/76/filelists/libnl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libnl
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/libusbx b/config/rootfiles/core/76/filelists/libusbx
deleted file mode 120000
index 96c9995..0000000
--- a/config/rootfiles/core/76/filelists/libusbx
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libusbx
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/libxml2 b/config/rootfiles/core/76/filelists/libxml2
deleted file mode 120000
index 242e69f..0000000
--- a/config/rootfiles/core/76/filelists/libxml2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/linux-firmware b/config/rootfiles/core/76/filelists/linux-firmware
deleted file mode 120000
index 4bf91bc..0000000
--- a/config/rootfiles/core/76/filelists/linux-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/linux-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/lzo b/config/rootfiles/core/76/filelists/lzo
deleted file mode 120000
index 8e11e78..0000000
--- a/config/rootfiles/core/76/filelists/lzo
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/lzo
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/misc-progs b/config/rootfiles/core/76/filelists/misc-progs
deleted file mode 120000
index 7223cad..0000000
--- a/config/rootfiles/core/76/filelists/misc-progs
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/mysql-libs b/config/rootfiles/core/76/filelists/mysql-libs
deleted file mode 120000
index c63bc7f..0000000
--- a/config/rootfiles/core/76/filelists/mysql-libs
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/mysql-libs
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/net-tools b/config/rootfiles/core/76/filelists/net-tools
deleted file mode 120000
index bac6b00..0000000
--- a/config/rootfiles/core/76/filelists/net-tools
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/net-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/ntp b/config/rootfiles/core/76/filelists/ntp
deleted file mode 100644
index 6adc47b..0000000
--- a/config/rootfiles/core/76/filelists/ntp
+++ /dev/null
@@ -1,15 +0,0 @@
-etc/ntp.conf
-usr/bin/ntp-keygen
-usr/bin/ntp-wait
-usr/bin/ntpd
-usr/bin/ntpdate
-usr/bin/ntpdc
-usr/bin/ntpq
-usr/bin/ntptime
-usr/bin/ntptrace
-usr/bin/sntp
-usr/bin/tickadj
-var/ipfire/time/counter.conf
-var/ipfire/time/enable
-var/ipfire/time/settime.conf
-var/ipfire/time/settings
diff --git a/config/rootfiles/core/76/filelists/openssh b/config/rootfiles/core/76/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/76/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/openssl b/config/rootfiles/core/76/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/76/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/openssl-compat b/config/rootfiles/core/76/filelists/openssl-compat
deleted file mode 120000
index c9fa421..0000000
--- a/config/rootfiles/core/76/filelists/openssl-compat
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl-compat
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/openvpn b/config/rootfiles/core/76/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/76/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/pakfire b/config/rootfiles/core/76/filelists/pakfire
deleted file mode 100644
index fd324bb..0000000
--- a/config/rootfiles/core/76/filelists/pakfire
+++ /dev/null
@@ -1,4 +0,0 @@
-opt/pakfire/etc/pakfire.conf
-opt/pakfire/lib/functions.pl
-opt/pakfire/lib/functions.sh
-opt/pakfire/pakfire
diff --git a/config/rootfiles/core/76/filelists/paxctl b/config/rootfiles/core/76/filelists/paxctl
deleted file mode 120000
index dda8d9f..0000000
--- a/config/rootfiles/core/76/filelists/paxctl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/paxctl
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/php b/config/rootfiles/core/76/filelists/php
deleted file mode 120000
index 1ae48d7..0000000
--- a/config/rootfiles/core/76/filelists/php
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/rng-tools b/config/rootfiles/core/76/filelists/rng-tools
deleted file mode 120000
index a7853e4..0000000
--- a/config/rootfiles/core/76/filelists/rng-tools
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/rng-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/setup b/config/rootfiles/core/76/filelists/setup
deleted file mode 120000
index 209374b..0000000
--- a/config/rootfiles/core/76/filelists/setup
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/setup
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/strongswan b/config/rootfiles/core/76/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/76/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/tzdata b/config/rootfiles/core/76/filelists/tzdata
deleted file mode 120000
index 5a6e325..0000000
--- a/config/rootfiles/core/76/filelists/tzdata
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/udev b/config/rootfiles/core/76/filelists/udev
deleted file mode 120000
index e967a1c..0000000
--- a/config/rootfiles/core/76/filelists/udev
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/udev
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/usb_modeswitch b/config/rootfiles/core/76/filelists/usb_modeswitch
deleted file mode 120000
index acbab6f..0000000
--- a/config/rootfiles/core/76/filelists/usb_modeswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/usb_modeswitch_data b/config/rootfiles/core/76/filelists/usb_modeswitch_data
deleted file mode 120000
index 4cbce46..0000000
--- a/config/rootfiles/core/76/filelists/usb_modeswitch_data
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/usbutils b/config/rootfiles/core/76/filelists/usbutils
deleted file mode 120000
index 31db5a7..0000000
--- a/config/rootfiles/core/76/filelists/usbutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usbutils
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/vim b/config/rootfiles/core/76/filelists/vim
deleted file mode 120000
index 9861317..0000000
--- a/config/rootfiles/core/76/filelists/vim
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/vim
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/wget b/config/rootfiles/core/76/filelists/wget
deleted file mode 120000
index fcb57df..0000000
--- a/config/rootfiles/core/76/filelists/wget
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/wpa_supplicant b/config/rootfiles/core/76/filelists/wpa_supplicant
deleted file mode 120000
index 1d04c03..0000000
--- a/config/rootfiles/core/76/filelists/wpa_supplicant
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/xz b/config/rootfiles/core/76/filelists/xz
deleted file mode 120000
index 734e926..0000000
--- a/config/rootfiles/core/76/filelists/xz
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/core/76/meta b/config/rootfiles/core/76/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/76/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
deleted file mode 100644
index db8271a..0000000
--- a/config/rootfiles/core/76/update.sh
+++ /dev/null
@@ -1,526 +0,0 @@
-#!/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(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-function add_to_backup ()
-{
- # Add path to ROOTFILES but remove old entries to prevent double
- # files in the tar
- grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
- mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
- echo $1 >> /opt/pakfire/tmp/ROOTFILES
-}
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=76
-for (( i=1; i<=${core}; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-# Do some sanity checks.
-case $(uname -r) in
- *-ipfire-versatile )
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: ERROR cannot update. versatile support is dropped."
- # Report no error to pakfire. So it does not try to install it again.
- exit 0
- ;;
- *-ipfire-xen )
- BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1`
- if [ $BOOTSIZE -lt 28000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: ERROR cannot update because not enough space on boot."
- exit 2
- fi
- ;;
- *-ipfire* )
- # Ok.
- ;;
- * )
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: ERROR cannot update. No IPFire Kernel."
- exit 1
- ;;
-esac
-
-
-#
-#
-KVER="xxxKVERxxx"
-MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
-# Nur den letzten Parameter verwenden
-echo $MOUNT > /dev/null
-MOUNT=$_
-if [ ! $MOUNT == "rw" ]; then
- MOUNT="ro"
-fi
-
-#
-# check if we the backup file already exist
-if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then
- echo Moving backup to backup-old ...
- mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
- /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz
-fi
-echo First we made a backup of all files that was inside of the
-echo update archive. This may take a while ...
-# Add some files that are not in the package to backup
-add_to_backup lib/modules
-add_to_backup etc/udev
-add_to_backup lib/udev
-add_to_backup boot
-add_to_backup etc/sysconfig/lm_sensors
-add_to_backup etc/sysconfig/rc.local
-add_to_backup srv/web/ipfire/html/themes/ipfire
-add_to_backup usr/lib/engines
-add_to_backup etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
-add_to_backup etc/rc.d/init.d/networking/red.up/25-portfw
-add_to_backup etc/rc.d/init.d/networking/red.up/26-xtaccess
-add_to_backup usr/local/bin/setportfw
-add_to_backup usr/local/bin/setdmzholes
-add_to_backup usr/local/bin/setxtaccess
-add_to_backup usr/local/bin/outgoingfwctrl
-add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
-add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
-add_to_backup etc/inittab
-add_to_backup etc/fstab
-add_to_backup usr/share/usb_modeswitch
-add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
-add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
-add_to_backup usr/local/bin/dialctrl.pl
-add_to_backup usr/lib/locale/locale-archive
-
-# Backup the files
-tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
- -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1
-
-# Check diskspace on root
-ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $ROOTSPACE -lt 100000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: ERROR cannot update because not enough free space on root."
- exit 2
-fi
-
-
-echo
-echo Update Kernel to $KVER ...
-#
-# Remove old kernel, configs, initrd, modules ...
-#
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
-rm -rf /lib/modules
-
-# Remove old usb_modeswitch_data
-rm -rf /usr/share/usb_modeswitch
-# Remove old tzdata
-rm -rf /usr/share/zoneinfo
-
-# Remoce old locale-archive
-rm -rf /usr/lib/locale/locale-archive
-
-# Remove dialctrl.pl script
-rm -f \
- /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \
- /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \
- /usr/local/bin/dialctrl.pl
-
-#
-# Remove old udev rules.
-#
-if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then
- cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
-fi
-cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
-rm -rf /etc/udev
-rm -rf /lib/udev
-mkdir -p /etc/udev/rules.d
-if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then
- mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
-fi
-mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
-
-case $(uname -m) in
- i?86 )
- #
- # Backup grub.conf
- #
- cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
- ;;
-esac
-#
-#Stop services
-/etc/init.d/snort stop
-/etc/init.d/squid stop
-/etc/init.d/ipsec stop
-/etc/init.d/apache stop
-
-# Remove the old default theme
-rm -rf /srv/web/ipfire/html/themes/ipfire
-
-# rename /etc/modprobe.d files
-for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do
- mv $i $i.conf
-done
-
-# Move /var/run to /run.
-if [ -L "/run" ]; then
- rm -f /run
-fi
-
-mkdir -p /run
-if mountpoint /var/run; then
- mount --move /var/run /run
- rm -rf /var/run
-fi
-
-ln -svf ../run /var/run
-
-# Creating directories for new firewall.
-mkdir -p /var/ipfire/firewall
-mkdir -p /var/ipfire/fwhosts
-
-# Remove old ntp binaries
-rm -f /usr/sbin/ntp-keygen
-rm -f /usr/sbin/ntp-wait
-rm -f /usr/sbin/ntpq
-rm -f /usr/sbin/ntptime
-rm -f /usr/sbin/ntptrace
-rm -f /usr/sbin/tickadj
-
-# Remove old firewall helper link
-rm -f /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
-
-#
-#Extract files
-tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
-
-# Check diskspace on boot
-BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $BOOTSPACE -lt 1000 ]; then
- case $(uname -r) in
- *-ipfire-kirkwood )
- # Special handling for old kirkwood images.
- # (install only kirkwood kernel)
- rm -rf /boot/*
- tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
- --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
- ;;
- * )
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..."
- /etc/init.d/apache start
- exit 4
- ;;
- esac
-fi
-
-#
-#Reload init to close old linker/glibc
-telinit u
-
-# Regenerate ipsec configuration files.
-/srv/web/ipfire/cgi-bin/vpnmain.cgi
-
-# Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-# Remove old openssl engines
-rm -rf /usr/lib/engines
-
-# Remove old initscripts
-rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
-rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
-rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
-rm -f /etc/rc.d/rcsysinit.d/S90sysctl
-
-# Remove old firewallscripts
-rm -f /usr/local/bin/setportfw
-rm -f /usr/local/bin/setdmzholes
-rm -f /usr/local/bin/setxtaccess
-rm -f /usr/local/bin/outgoingfwctrl
-
-# Remove old CGI files
-rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
-
-# Generate chains for new firewall
-/sbin/iptables -N INPUTFW 2>/dev/null
-/sbin/iptables -N FORWARDFW 2>/dev/null
-/sbin/iptables -N POLICYFWD 2>/dev/null
-/sbin/iptables -N POLICYIN 2>/dev/null
-/sbin/iptables -N POLICYOUT 2>/dev/null
-/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
-/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
-/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null
-
-# Create config files for firewall and fix permissions.
-touch /var/ipfire/firewall/config
-touch /var/ipfire/firewall/input
-touch /var/ipfire/firewall/outgoing
-touch /var/ipfire/firewall/settings
-touch /var/ipfire/fwhosts/customhosts
-touch /var/ipfire/fwhosts/customnetworks
-touch /var/ipfire/fwhosts/customgroups
-touch /var/ipfire/fwhosts/customservices
-touch /var/ipfire/fwhosts/customservicegrp
-
-if [ ! -s "/var/ipfire/fwhosts/customservices" ];then
- cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices
-fi
-
-# Fix ownership.
-chown -R nobody:nobody /var/ipfire/firewall
-chown -R nobody:nobody /var/ipfire/fwhosts
-
-# Convert firewall configuration
-/usr/sbin/convert-xtaccess
-/usr/sbin/convert-outgoingfw
-/usr/sbin/convert-portfw
-/usr/sbin/convert-dmz
-
-# Remove old firewall configuration files
-rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
-
-# In previously released IPFire versions the DROPOUTPUT and DROPINPUT
-# option have two identical lines in the optionsfw/settings file as long as
-# the user hasn't done any changes on the WUI.
-#
-# To prevent from any kind of side effects we are going to solve this issue now.
-
-# Fix doubble enties of DROPOUTPUT when the default settings are still in use
-# (the save button on the WUI page never has been clicked) or convert to the
-# new option name required by the firewall of IPFire 2.15.
-
-optionsfw_file="/var/ipfire/optionsfw/settings"
-
-if [ $(grep -c "DROPOUTPUT" ${optionsfw_file}) -gt 1 ] ; then
-
- # Drop all DROPUTPUT entries.
- sed -e "/DROPOUTPUT/d" -i ${optionsfw_file}
-
- # Add default line for new option.
- echo "DROPOUTGOING=on" >> ${optionsfw_file}
-else
-
- # Convert option name to new format.
- sed -e "s/DROPOUTPUT/DROPOUTGOING/g" -i ${optionsfw_file}
-fi
-
-# Fix doubble enties of DROPINPUT when the default settings are still in use
-# (the save button on the WUI page never has been clicked).
-if [ $(grep -c "DROPINPUT" ${optionsfw_file}) -gt 1 ] ; then
-
- # We only can remove all entries with an defined string.
- sed -e "/DROPINPUT/d" -i ${optionsfw_file}
-
- # Afterwards we have to add the required string with the default
- # value again.
- echo "DROPINPUT=on" >> ${optionsfw_file}
-fi
-
-# Add strings and default values for new options of the firewall.
-echo "DROPFORWARD=on" >> ${optionsfw_file}
-echo "FWPOLICY=DROP" >> ${optionsfw_file}
-echo "FWPOLICY1=DROP" >> ${optionsfw_file}
-echo "FWPOLICY2=DROP" >> ${optionsfw_file}
-echo "DROPSAMBA=off" >> ${optionsfw_file}
-echo "DROPPROXY=off" >> ${optionsfw_file}
-echo "SHOWREMARK=on" >> ${optionsfw_file}
-echo "SHOWCOLORS=on" >> ${optionsfw_file}
-echo "SHOWTABLES=off" >> ${optionsfw_file}
-echo "SHOWDROPDOWN=off" >> ${optionsfw_file}
-echo "DROPWIRELESSINPUT=on" >> ${optionsfw_file}
-echo "DROPWIRELESSFORWARD=on" >> ${optionsfw_file}
-
-unset optionsfw_file
-
-# Convert inittab and fstab
-sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
-sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab
-sed -i -e "s/^proc/#proc/g" /etc/fstab
-sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
-sed -i -e "s/^devpts/#devpts/g" /etc/fstab
-sed -i -e "s|^none\s/var/run|#none /var/run|g" /etc/fstab
-
-# Convert udev persistent network rules
-sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
-
-# Firstsetup was already run
-touch /var/ipfire/main/firstsetup_ok
-
-#
-# Start services
-#
-/etc/init.d/apache start
-/etc/init.d/squid start
-/etc/init.d/snort start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-#
-# Rebuild qosscript if enabled
-#
-if [ -e /var/ipfire/qos/enable ]; then
- /usr/local/bin/qosctrl stop
- /usr/local/bin/qosctrl generate
- /usr/local/bin/qosctrl start
-fi
-
-# Update crontab
-cat <<EOF >> /var/spool/cron/root.orig
-
-# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
-00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
-00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
-EOF
-fcrontab -z &>/dev/null
-
-
-case $(uname -m) in
- i?86 )
- #
- # Modify grub.conf
- #
- echo
- echo Update grub configuration ...
- ROOT=`mount | grep " / " | cut -d" " -f1`
-
- if [ ! -z $ROOT ]; then
- ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
- fi
-
- if [ ! -z $ROOTUUID ]; then
- sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
- else
- sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
- fi
- sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
- sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
-
- if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
- echo "grub use default console ..."
- else
- echo "grub use serial console ..."
- sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
- sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
- sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
- sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf
- fi
-
- #
- # ReInstall grub
- #
- echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
- grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
- ;;
-esac
-#
-# Delete old lm-sensor modullist to force search at next boot
-#
-rm -rf /etc/sysconfig/lm_sensors
-
-
-# Force (re)install pae kernel if pae is supported
-rm -rf /opt/pakfire/db/*/meta-linux-pae
-if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
- ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: WARNING not enough space for pae kernel."
- else
- echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
- echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
- echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae
- fi
-fi
-
-# Force reinstall xen kernel if it was installed
-if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
- echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
- echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
- echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen
- echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
- echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
- echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen
- # Add xvc0 to /etc/securetty
- echo "xvc0" >> /etc/securetty
-fi
-
-#
-# After pakfire has ended run it again and update the lists and do upgrade
-#
-echo '#!/bin/bash' > /tmp/pak_update
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
-echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
-#
-killall -KILL pak_update
-chmod +x /tmp/pak_update
-/tmp/pak_update &
-
-sync
-
-#
-#Finish
-(
- /etc/init.d/fireinfo start
- sendprofile
-) >/dev/null 2>&1 &
-
-# Update Package list for addon installation
-/opt/pakfire/pakfire update -y --force
-
-echo
-echo Please wait until pakfire has ended...
-echo
-#Don't report the exitcode last command
-exit 0
-
diff --git a/config/rootfiles/core/77/exclude b/config/rootfiles/core/77/exclude
new file mode 100644
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/core/77/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/77/filelists/Net_SSLeay b/config/rootfiles/core/77/filelists/Net_SSLeay
new file mode 120000
index 0000000..13fe056
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/Net_SSLeay
@@ -0,0 +1 @@
+../../../common/Net_SSLeay
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/apache2 b/config/rootfiles/core/77/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/binutils b/config/rootfiles/core/77/filelists/armv5tel/binutils
new file mode 120000
index 0000000..ac971f9
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/binutils
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/dracut b/config/rootfiles/core/77/filelists/armv5tel/dracut
new file mode 120000
index 0000000..861df3f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/dracut
@@ -0,0 +1 @@
+../../../../common/armv5tel/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/gcc b/config/rootfiles/core/77/filelists/armv5tel/gcc
new file mode 120000
index 0000000..84f7b93
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/gcc
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/glibc b/config/rootfiles/core/77/filelists/armv5tel/glibc
new file mode 120000
index 0000000..4c70d72
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/initscripts b/config/rootfiles/core/77/filelists/armv5tel/initscripts
new file mode 120000
index 0000000..af1d762
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/initscripts
@@ -0,0 +1 @@
+../../../../common/armv5tel/initscripts
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 0000000..7217107
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-multi b/config/rootfiles/core/77/filelists/armv5tel/linux-multi
new file mode 120000
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-rpi b/config/rootfiles/core/77/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/lm_sensors b/config/rootfiles/core/77/filelists/armv5tel/lm_sensors
new file mode 120000
index 0000000..eec84cd
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/lm_sensors
@@ -0,0 +1 @@
+../../../../common/armv5tel/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware
new file mode 120000
index 0000000..428fdf8
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware
@@ -0,0 +1 @@
+../../../../common/armv5tel/rpi-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/u-boot b/config/rootfiles/core/77/filelists/armv5tel/u-boot
new file mode 120000
index 0000000..3df31a8
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/u-boot
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/armv5tel/util-linux b/config/rootfiles/core/77/filelists/armv5tel/util-linux
new file mode 120000
index 0000000..2596908
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/armv5tel/util-linux
@@ -0,0 +1 @@
+../../../../common/armv5tel/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/beep b/config/rootfiles/core/77/filelists/beep
new file mode 120000
index 0000000..6db094e
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/beep
@@ -0,0 +1 @@
+../../../common/beep
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/bridge-utils b/config/rootfiles/core/77/filelists/bridge-utils
new file mode 120000
index 0000000..3dee211
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/bridge-utils
@@ -0,0 +1 @@
+../../../common/bridge-utils
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/coreutils b/config/rootfiles/core/77/filelists/coreutils
new file mode 120000
index 0000000..7351ed2
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/coreutils
@@ -0,0 +1 @@
+../../../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/cyrus-sasl b/config/rootfiles/core/77/filelists/cyrus-sasl
new file mode 120000
index 0000000..bb51b4c
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/cyrus-sasl
@@ -0,0 +1 @@
+../../../common/cyrus-sasl
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/dosfstools b/config/rootfiles/core/77/filelists/dosfstools
new file mode 120000
index 0000000..087ccb0
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/dosfstools
@@ -0,0 +1 @@
+../../../common/dosfstools
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/dvb-firmwares b/config/rootfiles/core/77/filelists/dvb-firmwares
new file mode 120000
index 0000000..69d0cdc
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/dvb-firmwares
@@ -0,0 +1 @@
+../../../common/dvb-firmwares
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/e2fsprogs b/config/rootfiles/core/77/filelists/e2fsprogs
new file mode 120000
index 0000000..37b55de
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/files b/config/rootfiles/core/77/filelists/files
new file mode 100644
index 0000000..ea71ac4
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/files
@@ -0,0 +1,33 @@
+etc/system-release
+etc/issue
+etc/collectd.conf
+etc/rc.d/init.d/network
+etc/sysctl.conf
+run
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/gui.cgi
+srv/web/ipfire/cgi-bin/entropy.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/netinternal.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/upnp.cgi
+srv/web/ipfire/cgi-bin/speed.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/html/themes/darkdos
+srv/web/ipfire/html/themes/ipfire
+srv/web/ipfire/html/themes/ipfire-legacy
+srv/web/ipfire/html/themes/maniac
+usr/lib/firewall
+usr/local/bin/timezone-transition
+usr/local/bin/setddns.pl
+usr/sbin/updxlrator
+var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/exclude
+var/ipfire/backup/include
+var/ipfire/general-functions.pl
+var/ipfire/header.pl
+var/ipfire/graphs.pl
+var/ipfire/langs
+var/ipfire/menu.d/10-system.menu
diff --git a/config/rootfiles/core/77/filelists/fireinfo b/config/rootfiles/core/77/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/firewall b/config/rootfiles/core/77/filelists/firewall
new file mode 100644
index 0000000..6eeaeae
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/firewall
@@ -0,0 +1,14 @@
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/p2p-block.cgi
+usr/sbin/convert-dmz
+usr/sbin/convert-outgoingfw
+usr/sbin/convert-portfw
+usr/sbin/convert-xtaccess
+usr/sbin/firewall-policy
+var/ipfire/firewall/p2protocols
+var/ipfire/fwhosts/icmp-types
+var/ipfire/menu.d/50-firewall.menu
+var/ipfire/fwhosts/customservices.default
diff --git a/config/rootfiles/core/77/filelists/i586/binutils b/config/rootfiles/core/77/filelists/i586/binutils
new file mode 120000
index 0000000..78695d7
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/binutils
@@ -0,0 +1 @@
+../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/dracut b/config/rootfiles/core/77/filelists/i586/dracut
new file mode 120000
index 0000000..9a09010
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/dracut
@@ -0,0 +1 @@
+../../../../common/i586/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/gcc b/config/rootfiles/core/77/filelists/i586/gcc
new file mode 120000
index 0000000..ba328e3
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/glibc b/config/rootfiles/core/77/filelists/i586/glibc
new file mode 120000
index 0000000..943021f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/grub b/config/rootfiles/core/77/filelists/i586/grub
new file mode 120000
index 0000000..feb236a
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/grub
@@ -0,0 +1 @@
+../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/initscripts b/config/rootfiles/core/77/filelists/i586/initscripts
new file mode 120000
index 0000000..12d8770
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/initscripts
@@ -0,0 +1 @@
+../../../../common/i586/initscripts
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/linux b/config/rootfiles/core/77/filelists/i586/linux
new file mode 120000
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/lm_sensors b/config/rootfiles/core/77/filelists/i586/lm_sensors
new file mode 120000
index 0000000..17d6c01
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/lm_sensors
@@ -0,0 +1 @@
+../../../../common/i586/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/strongswan-padlock b/config/rootfiles/core/77/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/i586/util-linux b/config/rootfiles/core/77/filelists/i586/util-linux
new file mode 120000
index 0000000..c973106
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/i586/util-linux
@@ -0,0 +1 @@
+../../../../common/i586/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/iptables b/config/rootfiles/core/77/filelists/iptables
new file mode 120000
index 0000000..8caf12b
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/iw b/config/rootfiles/core/77/filelists/iw
new file mode 120000
index 0000000..7c58a20
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/iw
@@ -0,0 +1 @@
+../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/jquery b/config/rootfiles/core/77/filelists/jquery
new file mode 120000
index 0000000..65df10c
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/jquery
@@ -0,0 +1 @@
+../../../common/jquery
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/kmod b/config/rootfiles/core/77/filelists/kmod
new file mode 120000
index 0000000..0020e19
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/kmod
@@ -0,0 +1 @@
+../../../common/kmod
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/libnl b/config/rootfiles/core/77/filelists/libnl
new file mode 120000
index 0000000..7181849
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/libnl
@@ -0,0 +1 @@
+../../../common/libnl
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/libusbx b/config/rootfiles/core/77/filelists/libusbx
new file mode 120000
index 0000000..96c9995
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/libusbx
@@ -0,0 +1 @@
+../../../common/libusbx
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/libxml2 b/config/rootfiles/core/77/filelists/libxml2
new file mode 120000
index 0000000..242e69f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/libxml2
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/linux-firmware b/config/rootfiles/core/77/filelists/linux-firmware
new file mode 120000
index 0000000..4bf91bc
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/lzo b/config/rootfiles/core/77/filelists/lzo
new file mode 120000
index 0000000..8e11e78
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/lzo
@@ -0,0 +1 @@
+../../../common/lzo
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/misc-progs b/config/rootfiles/core/77/filelists/misc-progs
new file mode 120000
index 0000000..7223cad
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/mysql-libs b/config/rootfiles/core/77/filelists/mysql-libs
new file mode 120000
index 0000000..c63bc7f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/mysql-libs
@@ -0,0 +1 @@
+../../../common/mysql-libs
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/net-tools b/config/rootfiles/core/77/filelists/net-tools
new file mode 120000
index 0000000..bac6b00
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/net-tools
@@ -0,0 +1 @@
+../../../common/net-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/ntp b/config/rootfiles/core/77/filelists/ntp
new file mode 100644
index 0000000..6adc47b
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/ntp
@@ -0,0 +1,15 @@
+etc/ntp.conf
+usr/bin/ntp-keygen
+usr/bin/ntp-wait
+usr/bin/ntpd
+usr/bin/ntpdate
+usr/bin/ntpdc
+usr/bin/ntpq
+usr/bin/ntptime
+usr/bin/ntptrace
+usr/bin/sntp
+usr/bin/tickadj
+var/ipfire/time/counter.conf
+var/ipfire/time/enable
+var/ipfire/time/settime.conf
+var/ipfire/time/settings
diff --git a/config/rootfiles/core/77/filelists/openssh b/config/rootfiles/core/77/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/openssl b/config/rootfiles/core/77/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/openssl-compat b/config/rootfiles/core/77/filelists/openssl-compat
new file mode 120000
index 0000000..c9fa421
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/openssl-compat
@@ -0,0 +1 @@
+../../../common/openssl-compat
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/openvpn b/config/rootfiles/core/77/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/pakfire b/config/rootfiles/core/77/filelists/pakfire
new file mode 100644
index 0000000..fd324bb
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/pakfire
@@ -0,0 +1,4 @@
+opt/pakfire/etc/pakfire.conf
+opt/pakfire/lib/functions.pl
+opt/pakfire/lib/functions.sh
+opt/pakfire/pakfire
diff --git a/config/rootfiles/core/77/filelists/paxctl b/config/rootfiles/core/77/filelists/paxctl
new file mode 120000
index 0000000..dda8d9f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/paxctl
@@ -0,0 +1 @@
+../../../common/paxctl
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/php b/config/rootfiles/core/77/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/rng-tools b/config/rootfiles/core/77/filelists/rng-tools
new file mode 120000
index 0000000..a7853e4
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/rng-tools
@@ -0,0 +1 @@
+../../../common/rng-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/setup b/config/rootfiles/core/77/filelists/setup
new file mode 120000
index 0000000..209374b
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/strongswan b/config/rootfiles/core/77/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/tzdata b/config/rootfiles/core/77/filelists/tzdata
new file mode 120000
index 0000000..5a6e325
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/udev b/config/rootfiles/core/77/filelists/udev
new file mode 120000
index 0000000..e967a1c
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch b/config/rootfiles/core/77/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch_data b/config/rootfiles/core/77/filelists/usb_modeswitch_data
new file mode 120000
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/usbutils b/config/rootfiles/core/77/filelists/usbutils
new file mode 120000
index 0000000..31db5a7
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/usbutils
@@ -0,0 +1 @@
+../../../common/usbutils
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/vim b/config/rootfiles/core/77/filelists/vim
new file mode 120000
index 0000000..9861317
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/vim
@@ -0,0 +1 @@
+../../../common/vim
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/wget b/config/rootfiles/core/77/filelists/wget
new file mode 120000
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/wpa_supplicant b/config/rootfiles/core/77/filelists/wpa_supplicant
new file mode 120000
index 0000000..1d04c03
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/core/77/filelists/xz b/config/rootfiles/core/77/filelists/xz
new file mode 120000
index 0000000..734e926
--- /dev/null
+++ b/config/rootfiles/core/77/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/core/77/meta b/config/rootfiles/core/77/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/77/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
new file mode 100644
index 0000000..0078abd
--- /dev/null
+++ b/config/rootfiles/core/77/update.sh
@@ -0,0 +1,526 @@
+#!/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(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+function add_to_backup ()
+{
+ # Add path to ROOTFILES but remove old entries to prevent double
+ # files in the tar
+ grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
+ mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
+ echo $1 >> /opt/pakfire/tmp/ROOTFILES
+}
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=77
+for (( i=1; i<=${core}; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire-versatile )
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: ERROR cannot update. versatile support is dropped."
+ # Report no error to pakfire. So it does not try to install it again.
+ exit 0
+ ;;
+ *-ipfire-xen )
+ BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1`
+ if [ $BOOTSIZE -lt 28000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: ERROR cannot update because not enough space on boot."
+ exit 2
+ fi
+ ;;
+ *-ipfire* )
+ # Ok.
+ ;;
+ * )
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: ERROR cannot update. No IPFire Kernel."
+ exit 1
+ ;;
+esac
+
+
+#
+#
+KVER="xxxKVERxxx"
+MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+ MOUNT="ro"
+fi
+
+#
+# check if we the backup file already exist
+if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then
+ echo Moving backup to backup-old ...
+ mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
+ /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz
+fi
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+add_to_backup lib/modules
+add_to_backup etc/udev
+add_to_backup lib/udev
+add_to_backup boot
+add_to_backup etc/sysconfig/lm_sensors
+add_to_backup etc/sysconfig/rc.local
+add_to_backup srv/web/ipfire/html/themes/ipfire
+add_to_backup usr/lib/engines
+add_to_backup etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+add_to_backup etc/rc.d/init.d/networking/red.up/25-portfw
+add_to_backup etc/rc.d/init.d/networking/red.up/26-xtaccess
+add_to_backup usr/local/bin/setportfw
+add_to_backup usr/local/bin/setdmzholes
+add_to_backup usr/local/bin/setxtaccess
+add_to_backup usr/local/bin/outgoingfwctrl
+add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
+add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+add_to_backup etc/inittab
+add_to_backup etc/fstab
+add_to_backup usr/share/usb_modeswitch
+add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
+add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
+add_to_backup usr/local/bin/dialctrl.pl
+add_to_backup usr/lib/locale/locale-archive
+
+# Backup the files
+tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
+ -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: ERROR cannot update because not enough free space on root."
+ exit 2
+fi
+
+
+echo
+echo Update Kernel to $KVER ...
+#
+# Remove old kernel, configs, initrd, modules ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /lib/modules
+
+# Remove old usb_modeswitch_data
+rm -rf /usr/share/usb_modeswitch
+# Remove old tzdata
+rm -rf /usr/share/zoneinfo
+
+# Remoce old locale-archive
+rm -rf /usr/lib/locale/locale-archive
+
+# Remove dialctrl.pl script
+rm -f \
+ /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \
+ /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \
+ /usr/local/bin/dialctrl.pl
+
+#
+# Remove old udev rules.
+#
+if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then
+ cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
+fi
+cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
+rm -rf /etc/udev
+rm -rf /lib/udev
+mkdir -p /etc/udev/rules.d
+if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then
+ mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
+fi
+mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
+
+case $(uname -m) in
+ i?86 )
+ #
+ # Backup grub.conf
+ #
+ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+ ;;
+esac
+#
+#Stop services
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
+# Remove the old default theme
+rm -rf /srv/web/ipfire/html/themes/ipfire
+
+# rename /etc/modprobe.d files
+for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do
+ mv $i $i.conf
+done
+
+# Move /var/run to /run.
+if [ -L "/run" ]; then
+ rm -f /run
+fi
+
+mkdir -p /run
+if mountpoint /var/run; then
+ mount --move /var/run /run
+ rm -rf /var/run
+fi
+
+ln -svf ../run /var/run
+
+# Creating directories for new firewall.
+mkdir -p /var/ipfire/firewall
+mkdir -p /var/ipfire/fwhosts
+
+# Remove old ntp binaries
+rm -f /usr/sbin/ntp-keygen
+rm -f /usr/sbin/ntp-wait
+rm -f /usr/sbin/ntpq
+rm -f /usr/sbin/ntptime
+rm -f /usr/sbin/ntptrace
+rm -f /usr/sbin/tickadj
+
+# Remove old firewall helper link
+rm -f /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
+
+#
+#Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
+
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $BOOTSPACE -lt 1000 ]; then
+ case $(uname -r) in
+ *-ipfire-kirkwood )
+ # Special handling for old kirkwood images.
+ # (install only kirkwood kernel)
+ rm -rf /boot/*
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+ --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+ ;;
+ * )
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..."
+ /etc/init.d/apache start
+ exit 4
+ ;;
+ esac
+fi
+
+#
+#Reload init to close old linker/glibc
+telinit u
+
+# Regenerate ipsec configuration files.
+/srv/web/ipfire/cgi-bin/vpnmain.cgi
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+# Remove old openssl engines
+rm -rf /usr/lib/engines
+
+# Remove old initscripts
+rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
+rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
+rm -f /etc/rc.d/rcsysinit.d/S90sysctl
+
+# Remove old firewallscripts
+rm -f /usr/local/bin/setportfw
+rm -f /usr/local/bin/setdmzholes
+rm -f /usr/local/bin/setxtaccess
+rm -f /usr/local/bin/outgoingfwctrl
+
+# Remove old CGI files
+rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
+
+# Generate chains for new firewall
+/sbin/iptables -N INPUTFW 2>/dev/null
+/sbin/iptables -N FORWARDFW 2>/dev/null
+/sbin/iptables -N POLICYFWD 2>/dev/null
+/sbin/iptables -N POLICYIN 2>/dev/null
+/sbin/iptables -N POLICYOUT 2>/dev/null
+/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
+/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
+/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null
+
+# Create config files for firewall and fix permissions.
+touch /var/ipfire/firewall/config
+touch /var/ipfire/firewall/input
+touch /var/ipfire/firewall/outgoing
+touch /var/ipfire/firewall/settings
+touch /var/ipfire/fwhosts/customhosts
+touch /var/ipfire/fwhosts/customnetworks
+touch /var/ipfire/fwhosts/customgroups
+touch /var/ipfire/fwhosts/customservices
+touch /var/ipfire/fwhosts/customservicegrp
+
+if [ ! -s "/var/ipfire/fwhosts/customservices" ];then
+ cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices
+fi
+
+# Fix ownership.
+chown -R nobody:nobody /var/ipfire/firewall
+chown -R nobody:nobody /var/ipfire/fwhosts
+
+# Convert firewall configuration
+/usr/sbin/convert-xtaccess
+/usr/sbin/convert-outgoingfw
+/usr/sbin/convert-portfw
+/usr/sbin/convert-dmz
+
+# Remove old firewall configuration files
+rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+
+# In previously released IPFire versions the DROPOUTPUT and DROPINPUT
+# option have two identical lines in the optionsfw/settings file as long as
+# the user hasn't done any changes on the WUI.
+#
+# To prevent from any kind of side effects we are going to solve this issue now.
+
+# Fix doubble enties of DROPOUTPUT when the default settings are still in use
+# (the save button on the WUI page never has been clicked) or convert to the
+# new option name required by the firewall of IPFire 2.15.
+
+optionsfw_file="/var/ipfire/optionsfw/settings"
+
+if [ $(grep -c "DROPOUTPUT" ${optionsfw_file}) -gt 1 ] ; then
+
+ # Drop all DROPUTPUT entries.
+ sed -e "/DROPOUTPUT/d" -i ${optionsfw_file}
+
+ # Add default line for new option.
+ echo "DROPOUTGOING=on" >> ${optionsfw_file}
+else
+
+ # Convert option name to new format.
+ sed -e "s/DROPOUTPUT/DROPOUTGOING/g" -i ${optionsfw_file}
+fi
+
+# Fix doubble enties of DROPINPUT when the default settings are still in use
+# (the save button on the WUI page never has been clicked).
+if [ $(grep -c "DROPINPUT" ${optionsfw_file}) -gt 1 ] ; then
+
+ # We only can remove all entries with an defined string.
+ sed -e "/DROPINPUT/d" -i ${optionsfw_file}
+
+ # Afterwards we have to add the required string with the default
+ # value again.
+ echo "DROPINPUT=on" >> ${optionsfw_file}
+fi
+
+# Add strings and default values for new options of the firewall.
+echo "DROPFORWARD=on" >> ${optionsfw_file}
+echo "FWPOLICY=DROP" >> ${optionsfw_file}
+echo "FWPOLICY1=DROP" >> ${optionsfw_file}
+echo "FWPOLICY2=DROP" >> ${optionsfw_file}
+echo "DROPSAMBA=off" >> ${optionsfw_file}
+echo "DROPPROXY=off" >> ${optionsfw_file}
+echo "SHOWREMARK=on" >> ${optionsfw_file}
+echo "SHOWCOLORS=on" >> ${optionsfw_file}
+echo "SHOWTABLES=off" >> ${optionsfw_file}
+echo "SHOWDROPDOWN=off" >> ${optionsfw_file}
+echo "DROPWIRELESSINPUT=on" >> ${optionsfw_file}
+echo "DROPWIRELESSFORWARD=on" >> ${optionsfw_file}
+
+unset optionsfw_file
+
+# Convert inittab and fstab
+sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
+sed -i -e "s/xvc0 9600$/xvc0 9600 --noclear/g" /etc/inittab
+sed -i -e "s/^proc/#proc/g" /etc/fstab
+sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
+sed -i -e "s/^devpts/#devpts/g" /etc/fstab
+sed -i -e "s|^none\s/var/run|#none /var/run|g" /etc/fstab
+
+# Convert udev persistent network rules
+sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
+
+# Firstsetup was already run
+touch /var/ipfire/main/firstsetup_ok
+
+#
+# Start services
+#
+/etc/init.d/apache start
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+# Rebuild qosscript if enabled
+#
+if [ -e /var/ipfire/qos/enable ]; then
+ /usr/local/bin/qosctrl stop
+ /usr/local/bin/qosctrl generate
+ /usr/local/bin/qosctrl start
+fi
+
+# Update crontab
+cat <<EOF >> /var/spool/cron/root.orig
+
+# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
+00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
+00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
+EOF
+fcrontab -z &>/dev/null
+
+
+case $(uname -m) in
+ i?86 )
+ #
+ # Modify grub.conf
+ #
+ echo
+ echo Update grub configuration ...
+ ROOT=`mount | grep " / " | cut -d" " -f1`
+
+ if [ ! -z $ROOT ]; then
+ ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
+ fi
+
+ if [ ! -z $ROOTUUID ]; then
+ sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
+ else
+ sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+ fi
+ sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
+ sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
+
+ if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
+ echo "grub use default console ..."
+ else
+ echo "grub use serial console ..."
+ sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
+ sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
+ sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
+ sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf
+ fi
+
+ #
+ # ReInstall grub
+ #
+ echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
+ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
+ ;;
+esac
+#
+# Delete old lm-sensor modullist to force search at next boot
+#
+rm -rf /etc/sysconfig/lm_sensors
+
+
+# Force (re)install pae kernel if pae is supported
+rm -rf /opt/pakfire/db/*/meta-linux-pae
+if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae
+ fi
+fi
+
+# Force reinstall xen kernel if it was installed
+if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
+ echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen
+ echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
+ echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
+ echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen
+ # Add xvc0 to /etc/securetty
+ echo "xvc0" >> /etc/securetty
+fi
+
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+killall -KILL pak_update
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
+sync
+
+#
+#Finish
+(
+ /etc/init.d/fireinfo start
+ sendprofile
+) >/dev/null 2>&1 &
+
+# Update Package list for addon installation
+/opt/pakfire/pakfire update -y --force
+
+echo
+echo Please wait until pakfire has ended...
+echo
+#Don't report the exitcode last command
+exit 0
+
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 93920ef..8dbfc90 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -4,7 +4,6 @@ WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
-WARNING: translation string unused: MB written
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
@@ -182,6 +181,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -217,6 +217,7 @@ WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
+WARNING: translation string unused: fwdfw menu
WARNING: translation string unused: fwdfw natport used
WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
@@ -379,6 +380,7 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: our donors
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -611,6 +613,7 @@ WARNING: untranslated string: dead peer detection
WARNING: untranslated string: emerging rules
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwhost err hostip
+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 22ee27a..79dafe5 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -4,7 +4,6 @@ WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
-WARNING: translation string unused: MB written
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
@@ -204,6 +203,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -239,6 +239,7 @@ WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
+WARNING: translation string unused: fwdfw menu
WARNING: translation string unused: fwdfw natport used
WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
@@ -405,6 +406,7 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: our donors
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -641,6 +643,7 @@ WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: fwhost err hostip
+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 5e72298..f7649af 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -360,6 +361,7 @@ WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -576,6 +578,7 @@ WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
+WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
@@ -588,6 +591,7 @@ WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd add
WARNING: untranslated string: ccd choose net
WARNING: untranslated string: ccd client options
@@ -720,7 +724,6 @@ WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
-WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
@@ -825,6 +828,9 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -837,6 +843,20 @@ WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
@@ -851,6 +871,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: outgoing firewall p2p allow
WARNING: untranslated string: outgoing firewall p2p deny
WARNING: untranslated string: ovpn crypt options
@@ -890,6 +911,7 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
@@ -949,6 +971,7 @@ WARNING: untranslated string: uplink
WARNING: untranslated string: upload dh key
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter redirect template
+WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 564a6b1..a3084e8 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -360,6 +361,7 @@ WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -587,6 +589,7 @@ WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
+WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
@@ -598,6 +601,7 @@ WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd add
WARNING: untranslated string: ccd choose net
WARNING: untranslated string: ccd client options
@@ -731,7 +735,6 @@ WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
-WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
@@ -836,6 +839,9 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -848,6 +854,20 @@ WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
@@ -864,6 +884,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name
@@ -898,6 +919,7 @@ WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: snort working
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
@@ -960,6 +982,7 @@ WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter file ext block
WARNING: untranslated string: urlfilter mode block
WARNING: untranslated string: urlfilter redirect template
+WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 8e74e43..747f406 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -198,6 +198,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -365,6 +366,7 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: our donors
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -591,6 +593,7 @@ WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
+WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
@@ -599,6 +602,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd iroute2
@@ -678,7 +682,6 @@ WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
-WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
@@ -783,6 +786,9 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -794,11 +800,26 @@ WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name
@@ -818,6 +839,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: support donation
@@ -875,6 +897,7 @@ WARNING: untranslated string: uplink
WARNING: untranslated string: upload dh key
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter redirect template
+WARNING: untranslated string: vendor
WARNING: untranslated string: wlan client
WARNING: untranslated string: wlan client advanced settings
WARNING: untranslated string: wlan client and
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 5e72298..f7649af 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -360,6 +361,7 @@ WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
WARNING: translation string unused: outgoing firewall mode1
WARNING: translation string unused: outgoing firewall mode2
@@ -576,6 +578,7 @@ WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
+WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
@@ -588,6 +591,7 @@ WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd add
WARNING: untranslated string: ccd choose net
WARNING: untranslated string: ccd client options
@@ -720,7 +724,6 @@ WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
-WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
@@ -825,6 +828,9 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -837,6 +843,20 @@ WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
@@ -851,6 +871,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: outgoing firewall p2p allow
WARNING: untranslated string: outgoing firewall p2p deny
WARNING: untranslated string: ovpn crypt options
@@ -890,6 +911,7 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
@@ -949,6 +971,7 @@ WARNING: untranslated string: uplink
WARNING: untranslated string: upload dh key
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter redirect template
+WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index c443cf8..0af9d3c 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -195,6 +195,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -354,6 +355,7 @@ WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -580,6 +582,7 @@ WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: Edit an existing route
WARNING: untranslated string: MB read
+WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
@@ -591,6 +594,7 @@ WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd add
WARNING: untranslated string: ccd choose net
WARNING: untranslated string: ccd client options
@@ -715,7 +719,6 @@ WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
-WARNING: untranslated string: fwdfw menu
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
@@ -820,6 +823,9 @@ WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: incoming traffic in bytes per second
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
@@ -833,6 +839,20 @@ WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
@@ -847,6 +867,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: outgoing traffic in bytes per second
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
@@ -880,6 +901,7 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
@@ -938,6 +960,7 @@ WARNING: untranslated string: uplink
WARNING: untranslated string: upload dh key
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter redirect template
+WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 575d54f..bbb832d 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -4,7 +4,6 @@ WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
WARNING: translation string unused: Level7 rule
WARNING: translation string unused: Local VPN IP
-WARNING: translation string unused: MB written
WARNING: translation string unused: Ping
WARNING: translation string unused: Queuelenght
WARNING: translation string unused: Remote IP
@@ -204,6 +203,7 @@ WARNING: translation string unused: esp keylife
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access
WARNING: translation string unused: external access configuration
WARNING: translation string unused: external access rule added
WARNING: translation string unused: external access rule changed
@@ -239,6 +239,7 @@ WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
+WARNING: translation string unused: fwdfw menu
WARNING: translation string unused: fwdfw natport used
WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
@@ -405,6 +406,7 @@ WARNING: translation string unused: or
WARNING: translation string unused: original
WARNING: translation string unused: our donors
WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
WARNING: translation string unused: outgoing firewall add mac group
WARNING: translation string unused: outgoing firewall edit ip group
@@ -644,6 +646,7 @@ WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
+WARNING: untranslated string: capabilities
WARNING: untranslated string: count
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
@@ -653,7 +656,25 @@ WARNING: untranslated string: fwdfw many
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
+WARNING: untranslated string: imei
+WARNING: untranslated string: imsi
+WARNING: untranslated string: incoming firewall access
+WARNING: untranslated string: model
+WARNING: untranslated string: modem hardware details
+WARNING: untranslated string: modem information
+WARNING: untranslated string: modem network bit error rate
+WARNING: untranslated string: modem network information
+WARNING: untranslated string: modem network mode
+WARNING: untranslated string: modem network operator
+WARNING: untranslated string: modem network registration
+WARNING: untranslated string: modem network signal quality
+WARNING: untranslated string: modem no connection
+WARNING: untranslated string: modem no connection message
+WARNING: untranslated string: modem sim information
+WARNING: untranslated string: modem status
+WARNING: untranslated string: monitor interface
WARNING: untranslated string: not a valid dh key
+WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name
@@ -665,5 +686,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
+WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: upload dh key
+WARNING: untranslated string: vendor
diff --git a/doc/language_missings b/doc/language_missings
index cd37869..6d7bb92 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -25,6 +25,7 @@
< age ssecond
< attention
< bit
+< capabilities
< ccd add
< ccd choose net
< ccd clientip
@@ -300,6 +301,9 @@
< generate dh key
< grouptype
< hardware support
+< imei
+< imsi
+< incoming firewall access
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -315,6 +319,19 @@
< MB written
< minimum
< minute
+< model
+< modem hardware details
+< modem information
+< modem network bit error rate
+< modem network information
+< modem network mode
+< modem network operator
+< modem network registration
+< modem network signal quality
+< modem no connection
+< modem no connection message
+< modem sim information
+< modem status
< most preferred
< no hardware random number generator
< not a valid dh key
@@ -334,6 +351,7 @@
< openvpn subnet is used
< other
< our donors
+< outgoing firewall access
< ovpn crypt options
< ovpn dh
< ovpn dh name
@@ -363,6 +381,7 @@
< show dh
< snat new source ip address
< snort working
+< software version
< ssh
< static routes
< support donation
@@ -432,6 +451,7 @@
< urlfilter file ext block
< urlfilter mode block
< urlfilter redirect template
+< vendor
< visit us at
< vpn keyexchange
< wlanap access point
@@ -506,6 +526,7 @@
< Async logging enabled
< attention
< bit
+< capabilities
< ccd add
< ccd choose net
< ccd clientip
@@ -780,6 +801,9 @@
< generate dh key
< grouptype
< hardware support
+< imei
+< imsi
+< incoming firewall access
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -795,6 +819,19 @@
< MB written
< minimum
< minute
+< model
+< modem hardware details
+< modem information
+< modem network bit error rate
+< modem network information
+< modem network mode
+< modem network operator
+< modem network registration
+< modem network signal quality
+< modem no connection
+< modem no connection message
+< modem sim information
+< modem status
< most preferred
< no hardware random number generator
< not a valid dh key
@@ -812,6 +849,7 @@
< openvpn subnet is used
< other
< our donors
+< outgoing firewall access
< outgoing firewall add ip group
< outgoing firewall add mac group
< outgoing firewall edit ip group
@@ -859,6 +897,7 @@
< Set time on boot
< show dh
< snat new source ip address
+< software version
< ssh
< static routes
< support donation
@@ -925,6 +964,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< vendor
< visit us at
< vpn keyexchange
< wlanap country
@@ -978,6 +1018,7 @@
< age ssecond
< attention
< bit
+< capabilities
< ccd add
< ccd choose net
< ccd clientip
@@ -1244,6 +1285,9 @@
< generate dh key
< grouptype
< hardware support
+< imei
+< imsi
+< incoming firewall access
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -1259,6 +1303,19 @@
< MB written
< minimum
< minute
+< model
+< modem hardware details
+< modem information
+< modem network bit error rate
+< modem network information
+< modem network mode
+< modem network operator
+< modem network registration
+< modem network signal quality
+< modem no connection
+< modem no connection message
+< modem sim information
+< modem status
< most preferred
< no hardware random number generator
< not a valid dh key
@@ -1276,6 +1333,7 @@
< openvpn subnet is used
< other
< our donors
+< outgoing firewall access
< ovpn crypt options
< ovpn dh
< ovpn dh name
@@ -1308,6 +1366,7 @@
< server restart
< show dh
< snat new source ip address
+< software version
< ssh
< static routes
< support donation
@@ -1373,6 +1432,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< vendor
< visit us at
< vpn keyexchange
< wlanap country
@@ -1427,6 +1487,7 @@
< age ssecond
< attention
< bit
+< capabilities
< ccd add
< ccd choose net
< ccd clientip
@@ -1698,6 +1759,9 @@
< grouptype
< hardware support
< hour-graph
+< imei
+< imsi
+< incoming firewall access
< incoming traffic in bytes per second
< integrity
< invalid input for dpd delay
@@ -1714,6 +1778,19 @@
< MB written
< minimum
< minute
+< model
+< modem hardware details
+< modem information
+< modem network bit error rate
+< modem network information
+< modem network mode
+< modem network operator
+< modem network registration
+< modem network signal quality
+< modem no connection
+< modem no connection message
+< modem sim information
+< modem status
< month-graph
< most preferred
< no hardware random number generator
@@ -1732,6 +1809,7 @@
< openvpn subnet is used
< other
< our donors
+< outgoing firewall access
< outgoing traffic in bytes per second
< ovpn crypt options
< ovpn dh
@@ -1761,6 +1839,7 @@
< server restart
< show dh
< snat new source ip address
+< software version
< ssh
< static routes
< support donation
@@ -1826,6 +1905,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< vendor
< visit us at
< vpn keyexchange
< week-graph
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 9af97d1..53c7c1c 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -101,7 +101,7 @@ my @protocols;
&General::readhasharray("$configipsec", \%ipsecconf);
&Header::showhttpheaders();
&Header::getcgihash(\%fwdfwsettings);
-&Header::openpage($Lang::tr{'fwdfw menu'}, 1, '');
+&Header::openpage($Lang::tr{'firewall rules'}, 1, '');
&Header::openbigbox('100%', 'center',$errormessage);
#### JAVA SCRIPT ####
print<<END;
@@ -1284,6 +1284,10 @@ sub get_serviceports
}
}
}
+
+ # Sort protocols alphabetically.
+ @protocols = sort(@protocols);
+
return @protocols;
}
sub getcolor
@@ -2295,8 +2299,8 @@ sub viewtablerule
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
&viewtablenew(\%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'});
- &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'external access'});
- &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'});
+ &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'incoming firewall access'});
+ &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall access'});
}
sub viewtablenew
{
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 53d93ef..e8ddf46 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1846,7 +1846,7 @@ sub viewtablegrp
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
}else{
my ($colip,$colsub) = split("/",$ip);
- $ip="$colip/".&General::subtocidr($colsub) if ($colsub);
+ $ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub);
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
}
if ($delflag > 0 && $ip ne ''){
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index b231bbf..4c94d1c 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -152,7 +152,7 @@ END
for(my $i = 1; $i <= $#iostat1; $i++){
if ( $i eq '1' ){
- print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>$Lang::tr{'MB read'}</b></td><td align='center' class='boldbase'><b>$Lang::{'MB written'}</b></td></tr>";
+ print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>$Lang::tr{'MB read'}</b></td><td align='center' class='boldbase'><b>$Lang::tr{'MB written'}</b></td></tr>";
}else{
print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
}
diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi
new file mode 100755
index 0000000..d278c77
--- /dev/null
+++ b/html/cgi-bin/modem-status.cgi
@@ -0,0 +1,211 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# #
+# 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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+
+# enable only the following on debugging purpose
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+require "${General::swroot}/modem-lib.pl";
+
+my $modem;
+my %ethsettings = {};
+my %pppsettings = {};
+
+&General::readhash("${General::swroot}/ethernet/settings", \%ethsettings);
+
+if ($ethsettings{"RED_TYPE"} eq "PPPOE") {
+ &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);
+
+ # Establish the connection to the modem.
+ my $port = $pppsettings{'MONPORT'};
+ if ($port) {
+ $port = "/dev/$port";
+ $modem = Modem->new($port, $pppsettings{"DTERATE"});
+ }
+}
+
+&Header::showhttpheaders();
+&Header::openpage($Lang::tr{'modem information'}, 1, '');
+&Header::openbigbox('100%', 'left');
+
+if ($modem) {
+ &Header::openbox("100%", "center", $Lang::tr{'modem hardware details'});
+
+ print <<END;
+ <table width="100%">
+ <tbody>
+END
+
+ my $vendor = $modem->get_vendor();
+ if ($vendor) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'vendor'}</td>
+ <td>$vendor</td>
+ </tr>
+END
+ }
+
+ my $model = $modem->get_model();
+ if ($model) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'model'}</td>
+ <td>$model</td>
+ </tr>
+END
+ }
+
+ my $software_version = $modem->get_software_version();
+ if ($software_version) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'software version'}</td>
+ <td>$software_version</td>
+ </tr>
+END
+ }
+
+ my $imei = $modem->get_imei();
+ if ($imei) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'imei'}</td>
+ <td>$imei</td>
+ </tr>
+END
+ }
+
+ my @caps = $modem->get_capabilities();
+ if (@caps) {
+ my $caps_string = join(", ", @caps);
+
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'capabilities'}</td>
+ <td>$caps_string</td>
+ </tr>
+END
+ }
+
+ print <<END;
+ </tbody>
+ </table>
+END
+ &Header::closebox();
+
+
+ &Header::openbox("100%", "center", $Lang::tr{'modem sim information'});
+ print <<END;
+ <table width="100%">
+ <tbody>
+END
+
+ my $imsi = $modem->get_sim_imsi();
+ if ($imsi) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'imsi'}</td>
+ <td>$imsi</td>
+ </tr>
+END
+ }
+
+ print <<END;
+ </tbody>
+ </table>
+END
+ &Header::closebox();
+
+ &Header::openbox("100%", "center", $Lang::tr{'modem network information'});
+ print <<END;
+ <table width="100%">
+ <tbody>
+END
+
+ my $network_registration = $modem->get_network_registration();
+ if ($network_registration) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'modem network registration'}</td>
+ <td>$network_registration</td>
+ </tr>
+END
+ }
+
+ my $network_operator = $modem->get_network_operator();
+ if ($network_operator) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'modem network operator'}</td>
+ <td>$network_operator</td>
+ </tr>
+END
+ }
+
+ my $network_mode = $modem->get_network_mode();
+ if ($network_mode) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'modem network mode'}</td>
+ <td>$network_mode</td>
+ </tr>
+END
+ }
+
+ my $signal_quality = $modem->get_signal_quality();
+ if ($signal_quality) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'modem network signal quality'}</td>
+ <td>$signal_quality dBm</td>
+ </tr>
+END
+ }
+
+ my $bit_error_rate = $modem->get_bit_error_rate();
+ if ($bit_error_rate) {
+ print <<END;
+ <tr>
+ <td width="33%">$Lang::tr{'modem network bit error rate'}</td>
+ <td>$bit_error_rate</td>
+ </tr>
+END
+ }
+ print <<END;
+ </tbody>
+ </table>
+END
+
+ &Header::closebox();
+} else {
+ &Header::openbox("100%", "center", $Lang::tr{'modem no connection'});
+ print "<p>$Lang::tr{'modem no connection message'}</p>";
+ &Header::closebox();
+}
+
+&Header::closebigbox();
+&Header::closepage();
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index edec826..563d0eb 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -73,6 +73,9 @@ 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)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) {
+ $errormessage = $Lang::tr{'invalid input'};
+ goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
@@ -335,6 +338,13 @@ $selected{'COMPORT'}{'rfcomm0'} = '';
$selected{'COMPORT'}{'rfcomm1'} = '';
$selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'";
+$selected{'MONPORT'}{''} = '';
+$selected{'MONPORT'}{'ttyUSB0'} = '';
+$selected{'MONPORT'}{'ttyUSB1'} = '';
+$selected{'MONPORT'}{'ttyUSB2'} = '';
+$selected{'MONPORT'}{'ttyUSB3'} = '';
+$selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'";
+
$selected{'DTERATE'}{'9600'} = '';
$selected{'DTERATE'}{'19200'} = '';
$selected{'DTERATE'}{'38400'} = '';
@@ -583,6 +593,24 @@ END
;
}
print "</select></td> "}
+
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) {
+ print <<END;
+ <tr>
+ <td colspan='3' width='75%'>$Lang::tr{'monitor interface'}:</td>
+ <td width='25%'>
+ <select name="MONPORT" style="width: 165px;">
+ <option value="" $selected{'MONPORT'}{''}>---</option>
+ <option value="ttyUSB0" $selected{'MONPORT'}{'ttyUSB0'}>ttyUSB0</option>
+ <option value="ttyUSB1" $selected{'MONPORT'}{'ttyUSB1'}>ttyUSB1</option>
+ <option value="ttyUSB2" $selected{'MONPORT'}{'ttyUSB2'}>ttyUSB2</option>
+ <option value="ttyUSB3" $selected{'MONPORT'}{'ttyUSB3'}>ttyUSB3</option>
+ </select>
+ </td>
+ </tr>
+END
+ }
+
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
print <<END
<tr>
@@ -926,6 +954,7 @@ sub initprofile
{
$pppsettings{'PROFILENAME'} = $Lang::tr{'unnamed'};
$pppsettings{'COMPORT'} = 'ttyS0';
+ $pppsettings{'MONPORT'} = '';
$pppsettings{'DTERATE'} = 115200;
$pppsettings{'SPEAKER'} = 'off';
$pppsettings{'RECONNECTION'} = 'persistent';
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5605210..720cce1 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -467,6 +467,7 @@
'cant change certificates' => 'Kann Zertifikate nicht ändern.',
'cant enable xtaccess' => 'Die zugehörige Port-Weiterleitungsregel ist deaktiviert, daher können Sie den externen Zugang für diese Regel nicht aktivieren.',
'cant start openssl' => 'Kann OpenSSL nicht starten',
+'capabilities' => 'Unterstützte Features',
'caps all' => 'ALLE',
'capsclosed' => 'GETRENNT',
'capsinactive' => 'INAKTIV',
@@ -935,7 +936,7 @@
'from email server' => 'Von Email Server',
'from email user' => 'Von Email Benutzer',
'from warn email bad' => 'Von Email Adresse ist nicht gültig',
-'fw blue' => 'Firewall-Optionen für das Blaue Interface',
+'fw blue' => 'Firewalloptionen für das Blaue Interface',
'fw default drop' => 'Firewall Policy',
'fw logging' => 'Firewall-Logging',
'fw settings' => 'Firewall-Einstellungen',
@@ -1199,12 +1200,15 @@
'ike integrity' => 'IKE Integrität:',
'ike lifetime' => 'IKE Lebensdauer:',
'ike lifetime should be between 1 and 8 hours' => 'IKE Lebensdauer sollte zwischen 1 und 8 Stunden betragen.',
+'imei' => 'IMEI',
'import' => 'Import',
'importkey' => 'PSK importieren',
+'imsi' => 'IMSI',
'in' => 'Ein',
'inactive' => 'inaktiv',
'include logfiles' => 'mit Logdateien',
'incoming' => 'eingehend',
+'incoming firewall access' => 'Eingehender Firewallzugang',
'incoming traffic in bytes per second' => 'Eingehender Verkehr',
'incorrect password' => 'Fehlerhaftes Passwort',
'info' => 'Info',
@@ -1451,15 +1455,28 @@
'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden',
'missing gz' => 'Nichtverschlüsseltes Archiv wurde nicht gefunden',
'mode' => 'Modus',
+'model' => 'Modell',
'modem' => 'Modem',
'modem configuration' => 'Modem-Konfiguration',
+'modem hardware details' => 'Modem-Hardware',
+'modem information' => 'Modem-Informationen',
+'modem network bit error rate' => 'Bit-Fehlerrate',
+'modem network information' => 'Netzwerkinformationen',
+'modem network mode' => 'Netzwerkmodus',
+'modem network operator' => 'Netzbetreiber',
+'modem network registration' => 'Netzregistrierung',
+'modem network signal quality' => 'Signalqualität',
+'modem no connection' => 'Keine Verbindung',
+'modem no connection message' => 'Es konnte keine Verbindung zum Modem aufgebaut werden.',
'modem on com1' => 'Modem an COM1',
'modem on com2' => 'Modem an COM2',
'modem on com3' => 'Modem an COM3',
'modem on com4' => 'Modem an COM4',
'modem on com5' => 'Modem an COM5',
'modem settings have errors' => 'Modemeinstellungen fehlerhaft',
+'modem sim information' => 'SIM-Informationen',
'modem speaker on' => 'Modemlautsprecher an:',
+'modem status' => 'Modem-Status',
'modify' => 'Ändern',
'modulation' => 'Modulation',
'monday' => 'Montag',
@@ -1586,7 +1603,7 @@
'optional at cmd' => 'zusätzlicher Modembefehl',
'optional data' => '3. Optionale Einstellungen',
'options' => 'Optionen',
-'options fw' => 'Firewall-Optionen',
+'options fw' => 'Firewalloptionen',
'optionsfw portlist hint' => 'Die Liste der Ports muss durch ein Komma getrennt werden (z.B. 137,138). Sie können maximal bis zu 15 Ports pro Protokoll angeben.',
'optionsfw warning' => 'Verändern dieser Optionen bedingt einen Neustart der Firewall',
'or' => 'oder',
@@ -1605,6 +1622,7 @@
'out' => 'Aus',
'outgoing' => 'ausgehend',
'outgoing firewall' => 'Ausgehende Firewall',
+'outgoing firewall access' => 'Ausgehender Firewallzugang',
'outgoing firewall add ip group' => 'IP Adressgruppen hinzufügen',
'outgoing firewall add mac group' => 'MAC Adressgruppen hinzufügen',
'outgoing firewall edit ip group' => 'IP Adressgruppen bearbeiten',
@@ -1929,6 +1947,7 @@
'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für',
'snort working' => 'Snort führt gerade eine Aufgabe aus... Bitte warten Sie, bis diese erfolgreich beendet wurde.',
'socket options' => 'Socket Options',
+'software version' => 'Software-Version',
'sort ascending' => 'Sortiere aufsteigend',
'sort descending' => 'Sortiere absteigend',
'sound' => 'Klang',
@@ -2470,6 +2489,7 @@
'valid root certificate already exists' => 'Ein gültiges Root-Zertifikat existiert bereits.',
'valid till' => 'Gültig bis',
'vci number' => 'VCI-Nummer:',
+'vendor' => 'Hersteller',
'view log' => 'Log anzeigen',
'virtual address' => 'Virtuelle Addresse',
'virtual private networking' => 'Virtuelles Privates Netzwerk',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8f2062f..d41a7ad 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -486,6 +486,7 @@
'cant change certificates' => 'Can\'t change certificates.',
'cant enable xtaccess' => 'The associated port forwarding rule is disabled, therefore you cannot enable external access for this rule.',
'cant start openssl' => 'Can\'t start OpenSSL',
+'capabilities' => 'Capabilities',
'caps all' => 'ALL',
'capsclosed' => 'DISCONNECTED',
'capsinactive' => 'INACTIVE',
@@ -1228,12 +1229,15 @@
'ike integrity' => 'IKE Integrity:',
'ike lifetime' => 'IKE Lifetime:',
'ike lifetime should be between 1 and 8 hours' => 'IKE lifetime should be between 1 and 8 hours.',
+'imei' => 'IMEI',
'import' => 'Import',
'importkey' => 'Import PSK',
+'imsi' => 'IMSI',
'in' => 'In',
'inactive' => 'inactive',
'include logfiles' => 'Include logfiles',
'incoming' => 'incoming',
+'incoming firewall access' => 'Incoming Firewall Access',
'incoming traffic in bytes per second' => 'Incoming Traffic',
'incorrect password' => 'Incorrect password',
'info' => 'Info',
@@ -1481,15 +1485,28 @@
'missing dat' => 'Encrypted archive not found',
'missing gz' => 'Unencrypted archive not found',
'mode' => 'Mode',
+'model' => 'Model',
'modem' => 'Modem',
'modem configuration' => 'Modem configuration',
+'modem hardware details' => 'Modem Hardware',
+'modem information' => 'Modem Information',
+'modem network bit error rate' => 'Bit Error Rate',
+'modem network information' => 'Network Information',
+'modem network mode' => 'Network Mode',
+'modem network operator' => 'Network Operator',
+'modem network registration' => 'Network Registration',
+'modem network signal quality' => 'Signal Quality',
+'modem no connection' => 'No Connection',
+'modem no connection message' => 'No connection to the modem could be established.',
'modem on com1' => 'Modem on COM1',
'modem on com2' => 'Modem on COM2',
'modem on com3' => 'Modem on COM3',
'modem on com4' => 'Modem on COM4',
'modem on com5' => 'Modem on COM5',
'modem settings have errors' => 'Modem settings have errors',
+'modem sim information' => 'SIM Information',
'modem speaker on' => 'Modem speaker on:',
+'modem status' => 'Modem Status',
'modify' => 'Modify',
'modulation' => 'Modulation',
'monday' => 'Monday',
@@ -1636,6 +1653,7 @@
'out' => 'Out',
'outgoing' => 'outgoing',
'outgoing firewall' => 'Outgoing Firewall',
+'outgoing firewall access' => 'Outgoing Firewall Access',
'outgoing firewall add ip group' => 'Add IP Address Group',
'outgoing firewall add mac group' => 'Add MAC Address Group',
'outgoing firewall edit ip group' => 'Edit IP Address Group',
@@ -1966,6 +1984,7 @@
'snort hits' => 'Total of number of Intrusion rules activated for',
'snort working' => 'Snort is working ... Please wait until all operations have completed successfully.',
'socket options' => 'Socket options',
+'software version' => 'Software Version',
'sort ascending' => 'Sort ascending',
'sort descending' => 'Sort descending',
'sound' => 'Sound',
@@ -2511,6 +2530,7 @@
'valid root certificate already exists' => 'A valid root certificate already exists.',
'valid till' => 'Valid till',
'vci number' => 'VCI number:',
+'vendor' => 'Vendor',
'view log' => 'view log',
'virtual address' => 'Virtual Address',
'virtual private networking' => 'Virtual Private Networking',
diff --git a/lfs/configroot b/lfs/configroot
index 3232d38..fcb08b0 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -80,6 +80,7 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/lang.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/countries.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/graphs.pl $(CONFIG_ROOT)/
+ cp $(DIR_SRC)/config/cfgroot/modem-lib.pl $(CONFIG_ROOT)/
cp $(DIR_SRC)/config/cfgroot/advoptions-list $(CONFIG_ROOT)/dhcp/advoptions-list
cp $(DIR_SRC)/config/cfgroot/connscheduler-lib.pl $(CONFIG_ROOT)/connscheduler/lib.pl
cp $(DIR_SRC)/config/cfgroot/connscheduler.conf $(CONFIG_ROOT)/connscheduler
diff --git a/lfs/linux b/lfs/linux
index e5f12d2..948d056 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
include Config
-VER = 3.10.36
+VER = 3.10.37
RPI_PATCHES = linux-3.10.34-grsec-dea8280
-GRS_PATCHES = grsecurity-2.9.1-3.10.36-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.37-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 = 41
+PAK_VER = 42
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 = 721f76050755ec8ec88876ee350a2726
+$(DL_FILE)_MD5 = a08a10ffc31b07d9422af1cd2baa3274
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 522683db031f7033b1b5dfe1b1f30e67
-$(GRS_PATCHES)_MD5 = 85717c4d6643ea52eef443ee7bc873e2
+$(GRS_PATCHES)_MD5 = 7b0f44571974217d79dbcdf5d7e33976
install : $(TARGET)
diff --git a/lfs/perl-Device-Modem b/lfs/perl-Device-Modem
new file mode 100644
index 0000000..f0609b9
--- /dev/null
+++ b/lfs/perl-Device-Modem
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.56
+
+THISAPP = Device-Modem-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a0ec45c3e313bea27ccb476d3b725955
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/perl-Device-SerialPort b/lfs/perl-Device-SerialPort
new file mode 100644
index 0000000..3eebc07
--- /dev/null
+++ b/lfs/perl-Device-SerialPort
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.000002
+
+THISAPP = Device-SerialPort-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f53db3733679adc5d05d06fa530444b6
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index 600a16f..f9f6e78 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.1.2
+VER = 5.1.3
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d45a2e89c624bceaf2e53c9b9cdddf83
+$(DL_FILE)_MD5 = 1d1c108775242743cd8699215b2918c3
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 39a54f4..d280d9c 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="76-rc1" # Core Level (Filename)
-PAKFIRE_CORE="76" # Core Level (PAKFIRE)
+CORE="77-rc1" # Core Level (Filename)
+PAKFIRE_CORE="77" # 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
@@ -514,6 +514,8 @@ buildipfire() {
ipfiremake perl-GD
ipfiremake GD-Graph
ipfiremake GD-TextUtil
+ ipfiremake perl-Device-SerialPort
+ ipfiremake perl-Device-Modem
ipfiremake gnupg
ipfiremake hdparm
ipfiremake sdparm
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 31aa2c9..f0d9c49 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -107,7 +107,6 @@ iptables_init() {
# Block OpenVPN transfer networks
iptables -N OVPNBLOCK
iptables -A INPUT -i tun+ -j OVPNBLOCK
- iptables -A OUTPUT -o tun+ -j OVPNBLOCK
iptables -A FORWARD -i tun+ -j OVPNBLOCK
iptables -A FORWARD -o tun+ -j OVPNBLOCK
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-21 12:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-21 12:02 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c80303cd452f8d6b41a4039e357d30b0ece19843 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox