From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 58786f762dccb7ab9922ac42a393cf344d0aa8b7 Date: Sat, 14 Jun 2014 22:13:55 +0200 Message-ID: <20140614201355.DF1EB21073@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8956360403194340467==" List-Id: --===============8956360403194340467== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 58786f762dccb7ab9922ac42a393cf344d0aa8b7 (commit) via da6424d983c51391774541c2717278421a1cc659 (commit) via ebaf391b480a4b3da36933f93b2720f34cd92d57 (commit) via 8815d10bc1e9c68fd50983211477f1ce95feda83 (commit) via 0e37b55202738c4eb0e4be042b64ed8e2a161953 (commit) via 7c56112cf4014e2b4c887e48301dfb68df48bd68 (commit) via b3b33f858651308c27b340ed94bf8eb4e82accfc (commit) via d6e6e213415cca408a1bf93692e7643bd58bc066 (commit) via edc08821f1fbeee5c9ae7fc4b4d4bd03f8821351 (commit) via acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661 (commit) via ad09461a43931ae0949ebc151c935230c268ccbb (commit) via a7bbea30d49a1b98f6404d23cb3d218020ef67d8 (commit) via 2734fb7e72015f0615dfdf483f498419e78dea22 (commit) via 8f94a6092cf602d5817332aa4e7d86deb80e67a9 (commit) via fd5ccb2dd5d0d4ee15bcae61c720eede3874bfbf (commit) via c8f503560f9498723b042246c93ee83e26982102 (commit) via a0ad10ca687d308f6b038fc50f7e5b156e8e64b3 (commit) via 3d2415f9242ae312bb4dc1d812e8f4ce0bf9a880 (commit) via 1445c9e062c6a17a8be1f248e9098cf99d787bf2 (commit) via 21e17764249dbd10053811ba581886e3f16d0b66 (commit) via 2511d78887a67436480b6bdfb267c6db412a0492 (commit) via 1f8a6d96707125596c6ee98a3765f7857351f2c5 (commit) via 8dc9629e80007817e2f4295864f474a7f510c938 (commit) via 2b9b518aa87d71a02cb96aa288244c5d0f4cf8a8 (commit) via 5eee2654771c7dbe8571ea376017fed7042bae57 (commit) via 6335e4a6054b2393c1e1d38a0c58ac8014948213 (commit) via d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit) via a65b9c3268ffacc27e703025ffd246e95f906a79 (commit) via f891fd74bdc6e12f0a69a554d4a00ad5c8687803 (commit) via 34a5f039399d782e090be2fa42604de9380ccaec (commit) via 43ea947fb413125d577225f81c138b449c7247f1 (commit) from 0ee45bcff61a57c924cea6642ae3961e7b0675c3 (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 58786f762dccb7ab9922ac42a393cf344d0aa8b7 Merge: 0ee45bc da6424d Author: Arne Fitzenreiter Date: Sat Jun 14 22:13:37 2014 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 4 +- config/cfgroot/modem-lib.pl | 12 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- config/kernel/kernel.config.i586-ipfire | 4 +- config/kernel/kernel.config.i586-ipfire-pae | 4 +- config/rootfiles/common/armv5tel/linux-headers | 1 + config/rootfiles/common/i586/linux-headers | 1 + config/rootfiles/common/libpcap | 12 +- config/rootfiles/core/{78 =3D> 79}/exclude | 0 .../{78 =3D> 79}/filelists/armv5tel/linux-kirkwood | 0 .../core/{78 =3D> 79}/filelists/armv5tel/linux-multi | 0 .../core/{78 =3D> 79}/filelists/armv5tel/linux-rpi | 0 config/rootfiles/core/{78 =3D> 79}/filelists/daq | 0 config/rootfiles/core/{78 =3D> 79}/filelists/files | 6 + .../rootfiles/core/{78 =3D> 79}/filelists/hostname | 0 .../rootfiles/core/{78 =3D> 79}/filelists/i586/grub | 0 .../rootfiles/core/{78 =3D> 79}/filelists/i586/linux | 0 .../core/{78 =3D> 79}/filelists/i586/syslinux | 0 .../{oldcore/28 =3D> core/79}/filelists/libpcap | 0 config/rootfiles/core/{77 =3D> 79}/filelists/openssh | 0 config/rootfiles/core/{77 =3D> 79}/filelists/openssl | 0 config/rootfiles/core/{78 =3D> 79}/filelists/openvpn | 0 .../rootfiles/core/79/filelists/perl-Device-Modem | 1 + .../core/79/filelists/perl-Device-SerialPort | 1 + config/rootfiles/core/{78 =3D> 79}/filelists/ppp | 0 config/rootfiles/core/{78 =3D> 79}/filelists/snort | 0 config/rootfiles/core/{78 =3D> 79}/filelists/squid | 0 config/rootfiles/core/{78 =3D> 79}/filelists/sudo | 0 config/rootfiles/core/{78 =3D> 79}/filelists/vnstat | 0 config/rootfiles/core/{78 =3D> 79}/meta | 0 config/rootfiles/core/{78 =3D> 79}/update.sh | 2 +- config/samba/default.shares | 21 +--- doc/language_issues.de | 6 +- doc/language_issues.en | 6 +- doc/language_issues.es | 5 + doc/language_issues.fr | 5 + doc/language_issues.nl | 5 + doc/language_issues.pl | 5 + doc/language_issues.ru | 5 + doc/language_issues.tr | 5 + doc/language_missings | 4 + html/cgi-bin/modem-status.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 122 +++++++++++++++++--= -- html/cgi-bin/pppsetup.cgi | 74 +++++++++++-- html/cgi-bin/traffic.cgi | 17 +-- langs/de/cgi-bin/de.pl | 17 ++- langs/en/cgi-bin/en.pl | 18 +-- langs/es/cgi-bin/es.pl | 4 - langs/fr/cgi-bin/fr.pl | 4 - langs/nl/cgi-bin/nl.pl | 4 - langs/pl/cgi-bin/pl.pl | 4 - langs/ru/cgi-bin/ru.pl | 4 - langs/tr/cgi-bin/tr.pl | 4 - lfs/libpcap | 17 +-- lfs/linux | 13 ++- lfs/openssl | 4 +- make.sh | 4 +- src/initscripts/init.d/leds | 8 +- src/initscripts/init.d/udev | 2 +- src/install+setup/install/main.c | 2 +- src/install+setup/setup/misc.c | 2 +- ...-3.10.y-usbnet_mcs7830_rework_link_detect.patch | 71 ++++++++++++ 62 files changed, 376 insertions(+), 138 deletions(-) rename config/rootfiles/core/{78 =3D> 79}/exclude (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/armv5tel/linux-kirkwood = (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/armv5tel/linux-multi (10= 0%) rename config/rootfiles/core/{78 =3D> 79}/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/daq (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/files (79%) rename config/rootfiles/core/{78 =3D> 79}/filelists/hostname (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/i586/grub (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/i586/linux (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/i586/syslinux (100%) copy config/rootfiles/{oldcore/28 =3D> core/79}/filelists/libpcap (100%) copy config/rootfiles/core/{77 =3D> 79}/filelists/openssh (100%) copy config/rootfiles/core/{77 =3D> 79}/filelists/openssl (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/openvpn (100%) create mode 120000 config/rootfiles/core/79/filelists/perl-Device-Modem create mode 120000 config/rootfiles/core/79/filelists/perl-Device-SerialPort rename config/rootfiles/core/{78 =3D> 79}/filelists/ppp (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/snort (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/squid (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/sudo (100%) rename config/rootfiles/core/{78 =3D> 79}/filelists/vnstat (100%) rename config/rootfiles/core/{78 =3D> 79}/meta (100%) rename config/rootfiles/core/{78 =3D> 79}/update.sh (99%) mode change 100755 =3D> 100644 html/cgi-bin/modem-status.cgi create mode 100644 src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detec= t.patch Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index bbb7e21..d90086d 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -45,6 +45,7 @@ my %menuhash =3D (); my $menu =3D \%menuhash; %settings =3D (); %ethsettings =3D (); +%pppsettings =3D (); @URI =3D (); =20 ### Make sure this is an SSL request @@ -57,6 +58,7 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { ### Initialize environment &General::readhash("${swroot}/main/settings", \%settings); &General::readhash("${swroot}/ethernet/settings", \%ethsettings); +&General::readhash("${swroot}/ppp/settings", \%pppsettings); $language =3D $settings{'LANGUAGE'}; $hostname =3D $settings{'HOSTNAME'}; $hostnameintitle =3D 0; @@ -154,7 +156,7 @@ sub genmenu { $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} =3D 1; } =20 - if ($ethsettings{'RED_TYPE'} eq "PPPOE") { + if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "= " ) { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} =3D = 1; } } diff --git a/config/cfgroot/modem-lib.pl b/config/cfgroot/modem-lib.pl index 51b6d68..5d43cc1 100644 --- a/config/cfgroot/modem-lib.pl +++ b/config/cfgroot/modem-lib.pl @@ -33,7 +33,10 @@ sub new() { bless $self, $class; =20 # Initialize the connetion to the modem. - $self->_initialize($port, $baud); + my $ret =3D $self->_initialize($port, $baud); + if ($ret) { + return undef; + } =20 if ($self->_is_working()) { return $self; @@ -54,9 +57,16 @@ sub DESTROY() { sub _initialize() { my ($self, $port, $baud) =3D @_; =20 + # Check if the character device actually exists. + if (! -c $port) { + return 1; + } + # Establish connection to the modem. $self->{modem} =3D new Device::Modem(port =3D> $port); $self->{modem}->connect(baudrate =3D> $baud); + + return 0; } =20 sub _is_working() { diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne= l/kernel.config.armv5tel-ipfire-multi index 127542f..34045f2 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -2552,7 +2552,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=3Dy CONFIG_SERIAL_8250_SHARE_IRQ=3Dy # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=3Dy -# CONFIG_SERIAL_8250_DW is not set +CONFIG_SERIAL_8250_DW=3Dy # CONFIG_SERIAL_8250_EM is not set =20 # diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.i586-ipfire index 8a3e089..ea1faff 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -632,8 +632,8 @@ CONFIG_PCIE_ECRC=3Dy CONFIG_PCIEAER_INJECT=3Dm CONFIG_PCIEASPM=3Dy # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=3Dy +CONFIG_PCIEASPM_DEFAULT=3Dy +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=3Dy CONFIG_ARCH_SUPPORTS_MSI=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index 4f71362..9ade872 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -645,8 +645,8 @@ CONFIG_PCIE_ECRC=3Dy CONFIG_PCIEAER_INJECT=3Dm CONFIG_PCIEASPM=3Dy # CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=3Dy +CONFIG_PCIEASPM_DEFAULT=3Dy +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=3Dy CONFIG_ARCH_SUPPORTS_MSI=3Dy diff --git a/config/rootfiles/common/armv5tel/linux-headers b/config/rootfile= s/common/armv5tel/linux-headers index a4da621..7fa9a24 100644 --- a/config/rootfiles/common/armv5tel/linux-headers +++ b/config/rootfiles/common/armv5tel/linux-headers @@ -625,6 +625,7 @@ #usr/include/linux/unix_diag.h #usr/include/linux/usb #usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc-wdm.h #usr/include/linux/usb/cdc.h #usr/include/linux/usb/ch11.h #usr/include/linux/usb/ch9.h diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/co= mmon/i586/linux-headers index 8f8123c..deaa97f 100644 --- a/config/rootfiles/common/i586/linux-headers +++ b/config/rootfiles/common/i586/linux-headers @@ -654,6 +654,7 @@ #usr/include/linux/unix_diag.h #usr/include/linux/usb #usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc-wdm.h #usr/include/linux/usb/cdc.h #usr/include/linux/usb/ch11.h #usr/include/linux/usb/ch9.h diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 0fc7c00..52169a7 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -1,7 +1,9 @@ #usr/bin/pcap-config #usr/include/pcap +#usr/include/pcap/bluetooth.h #usr/include/pcap-bpf.h #usr/include/pcap-int.h +#usr/include/pcap/ipnet.h #usr/include/pcap-namedb.h #usr/include/pcap.h #usr/include/pcap/bpf.h @@ -9,11 +11,11 @@ #usr/include/pcap/pcap.h #usr/include/pcap/sll.h #usr/include/pcap/usb.h +#usr/include/pcap/vlan.h #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.0 -usr/lib/libpcap.so.1.0.0 +usr/lib/libpcap.so.1.4.0 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap @@ -39,6 +41,7 @@ usr/lib/libpcap.so.1.0.0 #usr/share/man/man3/pcap_findalldevs.3pcap #usr/share/man/man3/pcap_fopen_offline.3pcap #usr/share/man/man3/pcap_free_datalinks.3pcap +#usr/share/man/man3/pcap_free_tstamp_types.3pcap #usr/share/man/man3/pcap_freealldevs.3pcap #usr/share/man/man3/pcap_freecode.3pcap #usr/share/man/man3/pcap_get_selectable_fd.3pcap @@ -48,6 +51,7 @@ usr/lib/libpcap.so.1.0.0 #usr/share/man/man3/pcap_is_swapped.3pcap #usr/share/man/man3/pcap_lib_version.3pcap #usr/share/man/man3/pcap_list_datalinks.3pcap +#usr/share/man/man3/pcap_list_tstamp_types.3pcap #usr/share/man/man3/pcap_lookupdev.3pcap #usr/share/man/man3/pcap_lookupnet.3pcap #usr/share/man/man3/pcap_loop.3pcap @@ -67,6 +71,7 @@ usr/lib/libpcap.so.1.0.0 #usr/share/man/man3/pcap_set_rfmon.3pcap #usr/share/man/man3/pcap_set_snaplen.3pcap #usr/share/man/man3/pcap_set_timeout.3pcap +#usr/share/man/man3/pcap_set_tstamp_type.3pcap #usr/share/man/man3/pcap_setdirection.3pcap #usr/share/man/man3/pcap_setfilter.3pcap #usr/share/man/man3/pcap_setnonblock.3pcap @@ -74,6 +79,9 @@ usr/lib/libpcap.so.1.0.0 #usr/share/man/man3/pcap_stats.3pcap #usr/share/man/man3/pcap_statustostr.3pcap #usr/share/man/man3/pcap_strerror.3pcap +#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap +#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap #usr/share/man/man5/pcap-savefile.5 #usr/share/man/man7/pcap-filter.7 #usr/share/man/man7/pcap-linktype.7 +#usr/share/man/man7/pcap-tstamp.7 diff --git a/config/rootfiles/core/78/exclude b/config/rootfiles/core/78/excl= ude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/78/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/78/filelists/armv5tel/linux-kirkwood b/con= fig/rootfiles/core/78/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/78/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/78/filelists/armv5tel/linux-multi b/config= /rootfiles/core/78/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/78/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/78/filelists/armv5tel/linux-rpi b/config/r= ootfiles/core/78/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/78/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/78/filelists/daq b/config/rootfiles/core/7= 8/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/78/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core= /78/filelists/files deleted file mode 100644 index 851ce36..0000000 --- a/config/rootfiles/core/78/filelists/files +++ /dev/null @@ -1,20 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/sshd -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat -srv/web/ipfire/cgi-bin/modem-status.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/html/themes/ipfire/include/functions.pl -usr/bin/squidGuard -usr/sbin/redirect_wrapper -usr/sbin/updxlrator -usr/local/bin/setddns.pl -var/ipfire/langs -var/ipfire/menu.d/20-status.menu -var/ipfire/menu.d/70-log.menu -var/ipfire/modem-lib.pl -var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/c= ore/78/filelists/hostname deleted file mode 120000 index 2a96fdd..0000000 --- a/config/rootfiles/core/78/filelists/hostname +++ /dev/null @@ -1 +0,0 @@ -../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/grub b/config/rootfiles/= core/78/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/78/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/linux b/config/rootfiles= /core/78/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/78/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/i586/syslinux b/config/rootfi= les/core/78/filelists/i586/syslinux deleted file mode 120000 index 74a776d..0000000 --- a/config/rootfiles/core/78/filelists/i586/syslinux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/syslinux \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/openvpn b/config/rootfiles/co= re/78/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/78/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/ppp b/config/rootfiles/core/7= 8/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/78/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/snort b/config/rootfiles/core= /78/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/78/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/squid b/config/rootfiles/core= /78/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/78/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/sudo b/config/rootfiles/core/= 78/filelists/sudo deleted file mode 120000 index 0d3c45e..0000000 --- a/config/rootfiles/core/78/filelists/sudo +++ /dev/null @@ -1 +0,0 @@ -../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/vnstat b/config/rootfiles/cor= e/78/filelists/vnstat deleted file mode 120000 index 2e2e610..0000000 --- a/config/rootfiles/core/78/filelists/vnstat +++ /dev/null @@ -1 +0,0 @@ -../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/78/meta b/config/rootfiles/core/78/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/78/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS=3D"" diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/up= date.sh deleted file mode 100644 index f3e0593..0000000 --- a/config/rootfiles/core/78/update.sh +++ /dev/null @@ -1,299 +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 . = # -# # -############################################################################ -# -. /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=3D78 -for (( i=3D1; i<=3D${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=3D`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 bo= ot." - 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=3D"xxxKVERxxx" -MOUNT=3D`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=3D$_ -if [ ! $MOUNT =3D=3D "rw" ]; then - MOUNT=3D"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 boot - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude=3D'#*' --exclude=3D'/var/ca= che' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=3D`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 - -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 - -# rename /etc/modprobe.d files -for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do - mv $i $i.conf -done - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Check diskspace on boot -BOOTSPACE=3D`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 b= ootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Update ping -rm -f /bin/ping -ln -sf ../usr/bin/ping /bin/ping -chmod 4755 /usr/bin/ping - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Add nobody to group dialout -usermod -a -G dialout nobody - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=3Don" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=3D`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=3D`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=3D$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)" =3D=3D "" ]; 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=3D10 | console=3DttyS0,115200n8 panic=3D10 |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 - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" =3D=3D "" ]; then - ROOTSPACE=3D`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=3D`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")" !=3D "" ]; do' >> /tmp/pak_upda= te -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" !=3D "" ]; do' >> /tmp/pak_upda= te -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 y= ou 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/79/exclude b/config/rootfiles/core/79/excl= ude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/79/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood b/con= fig/rootfiles/core/79/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-multi b/config= /rootfiles/core/79/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-rpi b/config/r= ootfiles/core/79/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/79/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/daq b/config/rootfiles/core/7= 9/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/79/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/core= /79/filelists/files new file mode 100644 index 0000000..4a557d2 --- /dev/null +++ b/config/rootfiles/core/79/filelists/files @@ -0,0 +1,26 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/leds +etc/rc.d/init.d/sshd +etc/rc.d/init.d/udev +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/modem-status.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/traffic.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +usr/bin/squidGuard +usr/sbin/firewall-policy +usr/sbin/redirect_wrapper +usr/sbin/updxlrator +usr/local/bin/setddns.pl +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/70-log.menu +var/ipfire/modem-lib.pl +var/ipfire/ovpn/openssl/ovpn.cnf diff --git a/config/rootfiles/core/79/filelists/hostname b/config/rootfiles/c= ore/79/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/79/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/grub b/config/rootfiles/= core/79/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/linux b/config/rootfiles= /core/79/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/i586/syslinux b/config/rootfi= les/core/79/filelists/i586/syslinux new file mode 120000 index 0000000..74a776d --- /dev/null +++ b/config/rootfiles/core/79/filelists/i586/syslinux @@ -0,0 +1 @@ +../../../../common/i586/syslinux \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/libpcap b/config/rootfiles/co= re/79/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/79/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssh b/config/rootfiles/co= re/79/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssl b/config/rootfiles/co= re/79/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openvpn b/config/rootfiles/co= re/79/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/79/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-Modem b/config/ro= otfiles/core/79/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/core/79/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/perl-Device-SerialPort b/conf= ig/rootfiles/core/79/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/core/79/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/ppp b/config/rootfiles/core/7= 9/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/core/79/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/snort b/config/rootfiles/core= /79/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/79/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/squid b/config/rootfiles/core= /79/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/79/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/sudo b/config/rootfiles/core/= 79/filelists/sudo new file mode 120000 index 0000000..0d3c45e --- /dev/null +++ b/config/rootfiles/core/79/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/vnstat b/config/rootfiles/cor= e/79/filelists/vnstat new file mode 120000 index 0000000..2e2e610 --- /dev/null +++ b/config/rootfiles/core/79/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/79/meta b/config/rootfiles/core/79/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/79/meta @@ -0,0 +1 @@ +DEPS=3D"" diff --git a/config/rootfiles/core/79/update.sh b/config/rootfiles/core/79/up= date.sh new file mode 100644 index 0000000..2085d43 --- /dev/null +++ b/config/rootfiles/core/79/update.sh @@ -0,0 +1,299 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +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=3D79 +for (( i=3D1; i<=3D${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=3D`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 bo= ot." + 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=3D"xxxKVERxxx" +MOUNT=3D`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=3D$_ +if [ ! $MOUNT =3D=3D "rw" ]; then + MOUNT=3D"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 boot + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude=3D'#*' --exclude=3D'/var/ca= che' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=3D`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 + +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 + +# rename /etc/modprobe.d files +for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do + mv $i $i.conf +done + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=3D`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 b= ootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Update ping +rm -f /bin/ping +ln -sf ../usr/bin/ping /bin/ping +chmod 4755 /usr/bin/ping + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Add nobody to group dialout +usermod -a -G dialout nobody + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=3Don" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=3D`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=3D`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=3D$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)" =3D=3D "" ]; 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=3D10 | console=3DttyS0,115200n8 panic=3D10 |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 + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" =3D=3D "" ]; then + ROOTSPACE=3D`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=3D`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")" !=3D "" ]; do' >> /tmp/pak_upda= te +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" !=3D "" ]; do' >> /tmp/pak_upda= te +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 y= ou 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/samba/default.shares b/config/samba/default.shares index aa21965..ee297fe 100644 --- a/config/samba/default.shares +++ b/config/samba/default.shares @@ -1,18 +1,9 @@ -[Temp] -path =3D /tmp -comment =3D Temp -browseable =3D yes +[Share1] +path =3D /mnt/share1 +comment =3D Shared Folder +browsable =3D yes writeable =3D yes -create mask =3D 0777 -directory mask =3D 0777 -guest ok =3D yes -force user =3D samba -[P2P] -path =3D /var/ipfire/samba/p2p -comment =3D P2P -browseable =3D yes -writeable =3D yes -create mask =3D 0777 -directory mask =3D 0777 +create mask =3D 0644 +directory mask =3D 0755 guest ok =3D yes force user =3D samba diff --git a/doc/language_issues.de b/doc/language_issues.de index 2140296..9d1e0ad 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -459,12 +459,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -491,6 +495,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -620,7 +625,6 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.en b/doc/language_issues.en index 3a0a4c7..55ee3e2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -486,12 +486,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -521,6 +525,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -651,7 +656,6 @@ WARNING: untranslated string: downlink WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2446583..13a3c88 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -431,12 +431,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -466,6 +470,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8dd0a3c..aff38ca 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -485,12 +485,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -520,6 +524,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2d12fc6..e553af7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -425,12 +425,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -460,6 +464,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7ce95e0..5d3dbc8 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -484,12 +484,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -519,6 +523,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_missings b/doc/language_missings index 7ae53f8..a20a8d7 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -344,6 +344,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -863,6 +864,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1366,6 +1368,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1860,6 +1863,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < month-graph < most preferred < MTU settings diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi old mode 100755 new mode 100644 index d278c77..2d33a3d --- a/html/cgi-bin/modem-status.cgi +++ b/html/cgi-bin/modem-status.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt = # +# Copyright (C) 2007-2014 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 921009f..45c2f6c 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1531,6 +1531,17 @@ END } =20 ### +### Download tls-auth key +### +}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download tls-auth key'}) { + if ( -f "${General::swroot}/ovpn/certs/ta.key" ) { + print "Content-Type: application/octet-stream\r\n"; + print "Content-Disposition: filename=3Dta.key\r\n\r\n"; + print `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + exit(0); + } + +### ### Form for generating a root certificate ### }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'}= || @@ -2370,6 +2381,28 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { } =20 ### +### Display tls-auth key +### +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show tls-auth key'}) { + + if (! -e "${General::swroot}/ovpn/certs/ta.key") { + $errormessage =3D $Lang::tr{'not present'}; + } else { + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'ovpn'}, 1, ''); + &Header::openbigbox('100%', 'LEFT', '', ''); + &Header::openbox('100%', 'LEFT', "$Lang::tr{'ta key'}:"); + my $output =3D `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + $output =3D &Header::cleanhtml($output,"y"); + print "
$output
\n"; + &Header::closebox(); + print ""; + &Header::closebigbox(); + &Header::closepage(); + exit(0); + } + +### ### Display Certificate Revoke List ### } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show crl'}) { @@ -3155,7 +3188,6 @@ my $complzoactive; my $mssfixactive; my $authactive; my $n2nfragment; -my $authactive; my @n2nmtudisc =3D split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]); my @n2nproto2 =3D split(/ /, (grep { /^proto/ } @firen2nconf)[0]); my @n2nproto =3D split(/-/, $n2nproto2[1]); @@ -5215,6 +5247,8 @@ END ; &Header::closebox(); } + + # CA/key listing &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}"); print < @@ -5227,7 +5261,10 @@ END ; my $col1=3D"bgcolor=3D'$color{'color22'}'"; my $col2=3D"bgcolor=3D'$color{'color20'}'"; + # DH parameter line my $col3=3D"bgcolor=3D'$color{'color22'}'"; + # ta.key line + my $col4=3D"bgcolor=3D'$color{'color20'}'"; =20 if (-f "${General::swroot}/ovpn/ca/cacert.pem") { my $casubject =3D `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn= /ca/cacert.pem`; @@ -5239,15 +5276,16 @@ END $Lang::tr{'root certificate'} $casubject -
+ -
-
+
+
-
-   + +   + END ; } else { @@ -5256,7 +5294,8 @@ END $Lang::tr{'root certificate'}: $Lang::tr{'not present'} -   +   + END ; } @@ -5272,15 +5311,16 @@ END $Lang::tr{'host certificate'} $hostsubject -
+ -
-
+
+
-
-   + +   + END ; } else { @@ -5289,7 +5329,8 @@ END $Lang::tr{'host certificate'}: $Lang::tr{'not present'} -   +   + END ; } @@ -5297,7 +5338,7 @@ END # Adding DH parameter to chart if (-f "${General::swroot}/ovpn/ca/dh1024.pem") { my $dhsubject =3D `/usr/bin/openssl dhparam -text -in ${General::swroot}/o= vpn/ca/dh1024.pem`; - $dhsubject =3D~ /PKCS#3 (.*)[\n]/; + $dhsubject =3D~ / (.*)[\n]/; $dhsubject =3D $1; =20 =20 @@ -5305,15 +5346,14 @@ END $Lang::tr{'dh parameter'} $dhsubject -
+ -
-
- - -
-   + +
+
+   + END ; } else { @@ -5322,7 +5362,42 @@ END $Lang::tr{'dh parameter'}: $Lang::tr{'not present'} -   +   + +END + ; + } + + # Adding ta.key to chart + if (-f "${General::swroot}/ovpn/certs/ta.key") { + my $tasubject =3D `/bin/cat ${General::swroot}/ovpn/certs/ta.key`; + $tasubject =3D~ /# (.*)[\n]/; + $tasubject =3D $1; + print < + $Lang::tr{'ta key'} + $tasubject +
+ + +
+
+ + +
+   + +END + ; + } else { + # Nothing + print < + $Lang::tr{'ta key'}: + $Lang::tr{'not present'} +   + END ; } @@ -5386,6 +5461,9 @@ END
+ + + diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 70e5726..58a51d0 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# Copyright (C) 2007-2014 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -88,10 +88,7 @@ sub display_vnstat if ( $testdata =3D~ 'enough') { print"No data for $device !
"; } else { - # Falls back to textoutput if there was no % value because vnstati hang= in this case - if (!($testdata =3D~ 'nan%')) { - system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/gr= aphs/vnstat-s-$device.png"); - } + system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/gra= phs/vnstat-s-$device.png"); # Hour graph system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/gra= phs/vnstat-h-$device.png"); # Day graph @@ -102,15 +99,9 @@ sub display_vnstat system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/gra= phs/vnstat-t-$device.png"); =20 # Generate HTML-Table with the graphs - print "
$Lang::tr{'upload ca certificate'}
$Lang::tr{'ca name'}: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 7bceb80..33f521e 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2011 IPFire Team = # +# Copyright (C) 2007-2014 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -70,10 +70,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyA= CM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfco= mm0|rfcomm1|isdn1|isdn2)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =3D~ /^(modem|serial)$/ && $pppsettings{'DT= ERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -333,19 +333,49 @@ $selected{'COMPORT'}{'ttyACM0'} =3D ''; $selected{'COMPORT'}{'ttyACM1'} =3D ''; $selected{'COMPORT'}{'ttyACM2'} =3D ''; $selected{'COMPORT'}{'ttyACM3'} =3D ''; +$selected{'COMPORT'}{'ttyACM4'} =3D ''; +$selected{'COMPORT'}{'ttyACM5'} =3D ''; +$selected{'COMPORT'}{'ttyACM6'} =3D ''; +$selected{'COMPORT'}{'ttyACM7'} =3D ''; +$selected{'COMPORT'}{'ttyACM8'} =3D ''; +$selected{'COMPORT'}{'ttyACM9'} =3D ''; $selected{'COMPORT'}{'ttyUSB0'} =3D ''; $selected{'COMPORT'}{'ttyUSB1'} =3D ''; $selected{'COMPORT'}{'ttyUSB2'} =3D ''; $selected{'COMPORT'}{'ttyUSB3'} =3D ''; +$selected{'COMPORT'}{'ttyUSB4'} =3D ''; +$selected{'COMPORT'}{'ttyUSB5'} =3D ''; +$selected{'COMPORT'}{'ttyUSB6'} =3D ''; +$selected{'COMPORT'}{'ttyUSB7'} =3D ''; +$selected{'COMPORT'}{'ttyUSB8'} =3D ''; +$selected{'COMPORT'}{'ttyUSB9'} =3D ''; $selected{'COMPORT'}{'rfcomm0'} =3D ''; $selected{'COMPORT'}{'rfcomm1'} =3D ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} =3D "selected=3D'selected'"; =20 $selected{'MONPORT'}{''} =3D ''; +$selected{'MONPORT'}{'ttyACM0'} =3D ''; +$selected{'MONPORT'}{'ttyACM1'} =3D ''; +$selected{'MONPORT'}{'ttyACM2'} =3D ''; +$selected{'MONPORT'}{'ttyACM3'} =3D ''; +$selected{'MONPORT'}{'ttyACM4'} =3D ''; +$selected{'MONPORT'}{'ttyACM5'} =3D ''; +$selected{'MONPORT'}{'ttyACM6'} =3D ''; +$selected{'MONPORT'}{'ttyACM7'} =3D ''; +$selected{'MONPORT'}{'ttyACM8'} =3D ''; +$selected{'MONPORT'}{'ttyACM9'} =3D ''; $selected{'MONPORT'}{'ttyUSB0'} =3D ''; $selected{'MONPORT'}{'ttyUSB1'} =3D ''; $selected{'MONPORT'}{'ttyUSB2'} =3D ''; $selected{'MONPORT'}{'ttyUSB3'} =3D ''; +$selected{'MONPORT'}{'ttyUSB4'} =3D ''; +$selected{'MONPORT'}{'ttyUSB5'} =3D ''; +$selected{'MONPORT'}{'ttyUSB6'} =3D ''; +$selected{'MONPORT'}{'ttyUSB7'} =3D ''; +$selected{'MONPORT'}{'ttyUSB8'} =3D ''; +$selected{'MONPORT'}{'ttyUSB9'} =3D ''; +$selected{'MONPORT'}{'rfcomm0'} =3D ''; +$selected{'MONPORT'}{'rfcomm1'} =3D ''; $selected{'MONPORT'}{$pppsettings{'MONPORT'}} =3D "selected=3D'selected'"; =20 $selected{'DTERATE'}{'9600'} =3D ''; @@ -582,16 +612,28 @@ END + + + + + + END ; if ($pppsettings{'TYPE'} ne 'serial' ) { print <$L= ang::tr{'usb modem on acm0'} - - - + + + + + + + + + + END ; } @@ -608,6 +650,24 @@ END + +
"; - if ($testdata =3D~ 'nan%') { - print ""; - } else { - print""; - } print < + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5df9ba8..ae4d694 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -518,7 +518,7 @@ 'ccd used' =3D> 'Genutzte Adressen', 'cert' =3D> 'Zertifikat', 'certificate' =3D> 'Zertifikat', -'certificate authorities' =3D> 'Zertifizierungsstellen (CAs)', +'certificate authorities' =3D> 'Zertifizierungsstellen und -Schl=C3=BCssel', 'certificate does not have a valid ca associated with it' =3D> 'Mit dem Zert= ifikat ist keine g=C3=BCltige CA verbunden.', 'certificate file move failed' =3D> 'Verschieben der Zertifikatsdatei fehlge= schlagen', 'cfg restart' =3D> 'Nach dem Wiederherstellen eines Konfigurationsarchivs wi= rd ein Neustart empfohlen.', @@ -554,7 +554,7 @@ 'connection' =3D> 'Verbindung', 'connection closed' =3D> 'Nicht Verbunden...', 'connection debugging' =3D> 'Verbindungs-Debugging', -'connection status and controlc' =3D> 'Verbindungsstatus und -kontrolle', +'connection status and controlc' =3D> 'Verbindungsstatus und -Kontrolle', 'connection tracking' =3D> 'iptables-Verbindungsverfolgung', 'connection type' =3D> 'Verbindungstyp', 'connection type is invalid' =3D> 'Verbindungstyp ist ung=C3=BCltig', @@ -769,12 +769,13 @@ 'downlink std class' =3D> 'Downloadstandardklasse', 'download' =3D> 'herunterladen', 'download ca certificate' =3D> 'CA-Zertifikat herunterladen', -'download certificate' =3D> 'Zertifikate herunterladen', +'download certificate' =3D> 'Datei herunterladen', 'download dh parameter' =3D> 'Diffie-Hellman-Parameter herunterladen', 'download host certificate' =3D> 'Host-Zertifikat herunterladen', 'download new ruleset' =3D> 'Neuen Regelsatz herunterladen', 'download pkcs12 file' =3D> 'PKCS12-Datei herunterladen', 'download root certificate' =3D> 'Root-Zertifikat herunterladen', +'download tls-auth key' =3D> 'tls-auth Key herunterladen', 'dpd action' =3D> 'Aktion f=C3=BCr Dead Peer Detection', 'dpd delay' =3D> 'Verz=C3=B6gerung', 'dpd timeout' =3D> 'Zeit=C3=BCberschreitung', @@ -1492,6 +1493,7 @@ 'modify' =3D> '=C3=84ndern', 'modulation' =3D> 'Modulation', 'monday' =3D> 'Montag', +'monitor interface' =3D> 'Monitor-Schnittstelle', 'month' =3D> 'Monat', 'month-graph' =3D> 'Monat', 'monthly firewallhits' =3D> 'monatliche Firewalltreffer', @@ -1665,7 +1667,7 @@ 'ovpn device' =3D> 'OpenVPN-Ger=C3=A4t', 'ovpn dh' =3D> 'Diffie-Hellman-Parameter-L=C3=A4nge', 'ovpn dh new key' =3D> 'Neuen Diffie-Hellman Parameter erstellen', -'ovpn dh parameters' =3D> 'Diffie-Hellman-Parameter-Optionen', +'ovpn dh parameters' =3D> 'Diffie-Hellman-Parameter Optionen', 'ovpn dh upload' =3D> 'Neuen Diffie-Hellman-Parameter hochladen', 'ovpn dl' =3D> 'OVPN-Konfiguration downloaden', 'ovpn engines' =3D> 'Krypto Engine', @@ -1934,7 +1936,7 @@ 'shares' =3D> 'Freigaben', 'show ajax speedmeter in footer' =3D> 'Ajax Speed Anzeige', 'show ca certificate' =3D> 'CA Zertifikat anzeigen', -'show certificate' =3D> 'Zertifikat anzeigen', +'show certificate' =3D> 'Datei anzeigen', 'show crl' =3D> 'Certificate Revocation List anzeigen', 'show dh' =3D> 'Diffie-Hellman-Parameter anzeigen', 'show host certificate' =3D> 'Host-Zertifikat anzeigen', @@ -2077,6 +2079,7 @@ 'time server' =3D> 'Zeitserver', 'timeout must be a number' =3D> 'Wartezeit muss eine Zahl sein.', 'title' =3D> 'Titel', +'ta key' =3D> 'TLS-Authentifizierungsschl=C3=BCssel', 'to' =3D> 'Bis', 'to email adr' =3D> 'An Email Adresse', 'to install an update' =3D> 'Um ein Update zu installieren, laden Sie zuerst= die folgende .tgz.gpg Datei hoch:', @@ -2484,10 +2487,6 @@ 'urlfilter weekly' =3D> 'w=C3=B6chentlich', 'urlfilter whitelist always allowed' =3D> 'Erlaube angepasste Whitelist f=C3= =BCr gesperrte Clients', 'urlfilter wrong filetype' =3D> 'Die Datei hat nicht die Erweiterung .tar.gz= ', -'usb modem on acm0' =3D> 'USB Modem an ACM0', -'usb modem on acm1' =3D> 'USB Modem an ACM1', -'usb modem on acm2' =3D> 'USB Modem an ACM2', -'usb modem on acm3' =3D> 'USB Modem an ACM3', 'use' =3D> 'Einsatz', 'use a pre-shared key' =3D> 'Verwenden Sie einen Pre-Shared Schl=C3=BCssel:', 'use dov' =3D> 'DOV (Data Over Voice) benutzen:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e0686f3..b1cfa83 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -536,7 +536,7 @@ 'ccd used' =3D> 'Used addresses', 'cert' =3D> 'Certificate', 'certificate' =3D> 'Certificate', -'certificate authorities' =3D> 'Certificate Authorities', +'certificate authorities' =3D> 'Certificate Authorities and -Keys', 'certificate does not have a valid ca associated with it' =3D> 'Certificate = does not have a valid CA associated with it.', 'certificate file move failed' =3D> 'Certificate file move failed', 'cfg restart' =3D> 'A reboot is suggested after restoring a configuration ar= chive.', @@ -574,7 +574,7 @@ 'connection' =3D> 'Connection', 'connection closed' =3D> 'Not connected...', 'connection debugging' =3D> 'Connection debugging', -'connection status and controlc' =3D> 'Connection status and control', +'connection status and controlc' =3D> 'Connection Status and -Control', 'connection tracking' =3D> 'iptables Connection Tracking', 'connection type' =3D> 'Connection Type', 'connection type is invalid' =3D> 'Connection type is invalid.', @@ -795,12 +795,13 @@ 'downlink std class' =3D> 'downlink standard class', 'download' =3D> 'download', 'download ca certificate' =3D> 'Download CA certificate', -'download certificate' =3D> 'Download certificate', +'download certificate' =3D> 'Download file', 'download dh parameter' =3D> 'Download Diffie-Hellman parameters', 'download host certificate' =3D> 'Download host certificate', 'download new ruleset' =3D> 'Download new ruleset', 'download pkcs12 file' =3D> 'Download PKCS12 file', 'download root certificate' =3D> 'Download root certificate', +'download tls-auth key' =3D> 'Download tls-auth key', 'dpd action' =3D> 'Action', 'dpd delay' =3D> 'Delay', 'dpd timeout' =3D> 'Timeout', @@ -1171,7 +1172,7 @@ 'generating the root and host certificates may take a long time. it can take= up to several minutes on older hardware. please be patient' =3D> 'Generating= the root and host certificates may take a long time. It can take up to seve= ral minutes on older hardware. Please be patient.', 'genkey' =3D> 'Generate PSK', 'genre' =3D> 'Genre', -'global settings' =3D> 'Global settings', +'global settings' =3D> 'Global Settings', 'gpl i accept these terms and conditions' =3D> 'I accept these terms and con= ditions', 'gpl license agreement' =3D> 'License Agreement', 'gpl please read carefully the general public license and accept it below' = =3D> 'Please read carefully the General Public License and accept it below', @@ -1522,6 +1523,7 @@ 'modify' =3D> 'Modify', 'modulation' =3D> 'Modulation', 'monday' =3D> 'Monday', +'monitor interface' =3D> 'Monitor Interface', 'month' =3D> 'Month', 'month-graph' =3D> 'Month', 'monthly firewallhits' =3D> 'monthly firewallhits', @@ -1968,7 +1970,7 @@ 'show ajax speedmeter in footer' =3D> 'Show Ajax speedmeter', 'show areas' =3D> 'show areas', 'show ca certificate' =3D> 'Show CA certificate', -'show certificate' =3D> 'Show certificate', +'show certificate' =3D> 'Show file', 'show crl' =3D> 'Show certificate revocation list', 'show dh' =3D> 'Show Diffie-Hellman parameters', 'show host certificate' =3D> 'Show host certificate', @@ -1976,6 +1978,7 @@ 'show lines' =3D> 'Show lines', 'show root certificate' =3D> 'Show root certificate', 'show share options' =3D> 'Show shares options', +'show tls-auth key' =3D> 'Show tls-auth key', 'shuffle' =3D> 'Shuffle', 'shutdown' =3D> 'Shutdown', 'shutdown ask' =3D> 'Shutdown?', @@ -2087,6 +2090,7 @@ 'system log viewer' =3D> 'System Log Viewer', 'system logs' =3D> 'System Logs', 'system status information' =3D> 'System Status Information', +'ta key' =3D> 'TLS-Authentification-Key', 'telephone not set' =3D> 'Telephone not set.', 'template' =3D> 'Preset', 'template warning' =3D> 'You have two options to set up Qos. The First, you = press the save button and generate the classes and rules on your own. The sec= ond, you press the preset button and classes and rules will be set up by a te= mplate.', @@ -2524,10 +2528,6 @@ 'urlfilter weekly' =3D> 'weekly', 'urlfilter whitelist always allowed' =3D> 'Allow custom whitelist for banned= clients', 'urlfilter wrong filetype' =3D> 'File has not the extension .tar.gz', -'usb modem on acm0' =3D> 'USB Modem on ACM0', -'usb modem on acm1' =3D> 'USB Modem on ACM1', -'usb modem on acm2' =3D> 'USB Modem on ACM2', -'usb modem on acm3' =3D> 'USB Modem on ACM3', 'use' =3D> 'Use', 'use a pre-shared key' =3D> 'Use a pre-shared key:', 'use dov' =3D> 'Use data over voice (DOV):', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ae5bf14..2be3d36 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -2051,10 +2051,6 @@ 'urlfilter weekly' =3D> 'semanalmente', 'urlfilter whitelist always allowed' =3D> 'Permitir lista blanca personaliza= da para clientes censurados', 'urlfilter wrong filetype' =3D> 'El archivo no tiene la extension .tar.gz', -'usb modem on acm0' =3D> 'Modem USB en ACM0', -'usb modem on acm1' =3D> 'Modem USB en ACM1', -'usb modem on acm2' =3D> 'Modem USB en ACM2', -'usb modem on acm3' =3D> 'Modem USB en ACM3', 'use' =3D> 'Usar', 'use a pre-shared key' =3D> 'Usar llave pre-compartida', 'use dov' =3D> 'Usar datos sobre voz (DOV)', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 84e15a8..f4e9518 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2065,10 +2065,6 @@ 'urlfilter weekly' =3D> 'hebdomadairement', 'urlfilter whitelist always allowed' =3D> 'Autoriser une liste blanche perso= nnalis=C3=A9e de clients bannis', 'urlfilter wrong filetype' =3D> 'Le fichier n\'a pas l\'extension .tar.gz', -'usb modem on acm0' =3D> 'Modem USB sur ACM0', -'usb modem on acm1' =3D> 'Modem USB sur ACM1', -'usb modem on acm2' =3D> 'Modem USB sur ACM2', -'usb modem on acm3' =3D> 'Modem USB sur ACM3', 'use' =3D> 'Utiliser', 'use a pre-shared key' =3D> 'Utiliser une cl=C3=A9 pr=C3=A9-partag=C3=A9e :', 'use dov' =3D> 'Utilisez DOV (Data Over Voice):', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 767f93b..b9e4c6f 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -2481,10 +2481,6 @@ 'urlfilter weekly' =3D> 'wekelijks', 'urlfilter whitelist always allowed' =3D> 'Toestaan gebruik van eigen witte = lijst voor verboden clients', 'urlfilter wrong filetype' =3D> 'Bestand heeft niet de extensie .tar.gz', -'usb modem on acm0' =3D> 'USB Modem op ACM0', -'usb modem on acm1' =3D> 'USB Modem op ACM1', -'usb modem on acm2' =3D> 'USB Modem op ACM2', -'usb modem on acm3' =3D> 'USB Modem op ACM3', 'use' =3D> 'Gebruik', 'use a pre-shared key' =3D> 'Gebruik een pre-shared sleutel:', 'use dov' =3D> 'Gebruik data over voice (DOV):', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 103e526..a79eed0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -2074,10 +2074,6 @@ 'urlfilter weekly' =3D> 'co tydzie=C5=84', 'urlfilter whitelist always allowed' =3D> 'Zezwolenie na bia=C5=82=C4=85 lis= t=C4=99 dla zablokowanych klient=C3=B3w', 'urlfilter wrong filetype' =3D> 'Plik nie posiada rozszerzenia .tar.gz', -'usb modem on acm0' =3D> 'Modem USB na ACM0', -'usb modem on acm1' =3D> 'Modem USB na ACM1', -'usb modem on acm2' =3D> 'Modem USB na ACM2', -'usb modem on acm3' =3D> 'Modem USB na ACM3', 'use' =3D> 'U=C5=BCyj', 'use a pre-shared key' =3D> 'U=C5=BCyj klucza wsp=C3=B3=C5=82dzielonego:', 'use dov' =3D> 'Use data over voice (DOV):', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2b680b0..e3aaab4 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -2069,10 +2069,6 @@ 'urlfilter weekly' =3D> '=D0=95=D0=B6=D0=B5=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB=D1= =8C=D0=BD=D0=BE', 'urlfilter whitelist always allowed' =3D> '=D0=A0=D0=B0=D0=B7=D1=80=D0=B5=D1= =88=D0=B8=D1=82=D1=8C =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82= =D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D0=B9 =D0=B1=D0=B5=D0=BB=D1=8B=D0=B9 =D1= =81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA =D0=B4=D0=BB=D1=8F =D0=B7=D0=B0=D0=B1=D0=B0= =D0=BD=D0=B5=D0=BD=D1=8B=D1=85 =D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0= =B2', 'urlfilter wrong filetype' =3D> 'File has not the extension .tar.gz', -'usb modem on acm0' =3D> 'USB =D0=9C=D0=BE=D0=B4=D0=B5=D0=BC =D0=BD=D0=B0 AC= M0', -'usb modem on acm1' =3D> 'USB =D0=9C=D0=BE=D0=B4=D0=B5=D0=BC =D0=BD=D0=B0 AC= M1', -'usb modem on acm2' =3D> 'USB =D0=9C=D0=BE=D0=B4=D0=B5=D0=BC =D0=BD=D0=B0 AC= M2', -'usb modem on acm3' =3D> 'USB =D0=9C=D0=BE=D0=B4=D0=B5=D0=BC =D0=BD=D0=B0 AC= M3', 'use' =3D> 'Use', 'use a pre-shared key' =3D> 'Use a pre-shared key:', 'use dov' =3D> 'Use data over voice (DOV):', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9eb5a43..619f3f2 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -2484,10 +2484,6 @@ 'urlfilter weekly' =3D> 'Haftal=C4=B1k', 'urlfilter whitelist always allowed' =3D> 'Yasakl=C4=B1 istemciler i=C3=A7in= =C3=B6zel beyaz liste izini', 'urlfilter wrong filetype' =3D> 'Uzant=C4=B1s=C4=B1 .tar.gz olan dosya yok', -'usb modem on acm0' =3D> 'ACM0 =C3=BCzerindeki USB Modem', -'usb modem on acm1' =3D> 'ACM1 =C3=BCzerindeki USB Modem', -'usb modem on acm2' =3D> 'ACM2 =C3=BCzerindeki USB Modem', -'usb modem on acm3' =3D> 'ACM3 =C3=BCzerindeki USB Modem', 'use' =3D> 'Kullan', 'use a pre-shared key' =3D> '=C3=96n payla=C5=9F=C4=B1ml=C4=B1 anahtar kulla= n:', 'use dov' =3D> 'Ses =C3=BCzerinden veri kullan (DOV):', diff --git a/lfs/libpcap b/lfs/libpcap index c6fdc2e..0f118a4 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.0.0 +VER =3D 1.4.0 =20 THISAPP =3D libpcap-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,6 +32,8 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) =20 +CFLAGS +=3D -fno-strict-aliasing + ############################################################################= ### # Top-level Rules ############################################################################= ### @@ -40,7 +42,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 9ad1358c5dec48456405eac197a46d3d +$(DL_FILE)_MD5 =3D 56e88a5aabdd1e04414985ac24f7e76c =20 install : $(TARGET) =20 @@ -70,15 +72,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.= patch - cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-nls - cd $(DIR_APP) && make - cd $(DIR_APP) && make shared + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-shared-so - ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0 - ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1 - ln -svf libpcap.so.1 /usr/lib/libpcap.so=09 - cd $(DIR_APP) && cp -vf pcap-int.h /usr/include @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index a86dab6..45e9ce6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ =20 include Config =20 -VER =3D 3.10.41 +VER =3D 3.10.43 =20 RPI_PATCHES =3D linux-3.10.38-grsec-1b49b45 -GRS_PATCHES =3D grsecurity-2.9.1-3.10.41-ipfire1.patch.xz +GRS_PATCHES =3D grsecurity-2.9.1-3.10.43-ipfire1.patch.xz =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) CFLAGS =3D CXXFLAGS =3D =20 -PAK_VER =3D 46 +PAK_VER =3D 49 DEPS =3D "" =20 VERSUFIX=3Dipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz =3D $(URL_IPFIRE)/rpi-patches-$(RPI_PATC= HES).patch.xz $(GRS_PATCHES) =3D $(URL_IPFIRE)/$(GRS_PATCHES) =20 -$(DL_FILE)_MD5 =3D 08631db3e6b4328b0315f59ef3fa7b0a +$(DL_FILE)_MD5 =3D b76af402bd1848b533f0b6dab41d3220 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 =3D a7408e8bad57b4b2cb677dd5a0bfb7ff -$(GRS_PATCHES)_MD5 =3D de48891a35952a3c6de5beea694f7557 +$(GRS_PATCHES)_MD5 =3D a77f35c2f4cd6d64a50c26ef5513540b =20 install : $(TARGET) =20 @@ -160,6 +160,9 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-d= river-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs783= 0-fix-driver-name.patch =20 + # Moschip 7830 link detection + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.y-usbnet_mc= s7830_rework_link_detect.patch + =20 ifeq "$(KCFG)" "-kirkwood" # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood diff --git a/lfs/openssl b/lfs/openssl index f842bb9..12cea68 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.0.1g +VER =3D 1.0.1h =20 THISAPP =3D openssl-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D de62b43dfcd858e66a74bee1c834e959 +$(DL_FILE)_MD5 =3D 8d6d684a9430d5cc98a62a5d8fbda8cf =20 install : $(TARGET) =20 diff --git a/make.sh b/make.sh index c170076..1c10f32 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME=3D"IPFire" # Software name SNAME=3D"ipfire" # Short name VERSION=3D"2.15" # Version number -CORE=3D"78" # Core Level (Filename) -PAKFIRE_CORE=3D"78" # Core Level (PAKFIRE) +CORE=3D"79" # Core Level (Filename) +PAKFIRE_CORE=3D"79" # Core Level (PAKFIRE) GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN=3D"www.ipfire.org" # Software slogan CONFIG_ROOT=3D/var/ipfire # Configuration rootdir diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds index d75a2e9..faa7650 100644 --- a/src/initscripts/init.d/leds +++ b/src/initscripts/init.d/leds @@ -17,9 +17,11 @@ fi # Load ethernet settings eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) =20 -if [ "${RED_DEV}" =3D=3D "" ]; then - RED_DEV=3Dppp0 -fi +case "${RED_TYPE}" in + PPPOE) + RED_DEV=3D"ppp0" + ;; +esac =20 # setup_netdev_trigger LED DEVICE MODE setup_netdev_trigger () diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index b6d0100..6cf8771 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -64,7 +64,7 @@ case "${1}" in =20 # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /bin/udevadm trigger + /bin/udevadm trigger --action=3Dadd =20 # Now wait for udevd to process the uevents we triggered /bin/udevadm settle diff --git a/src/install+setup/install/main.c b/src/install+setup/install/mai= n.c index db7a6cc..309e006 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -542,7 +542,7 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage"); replace("/harddisk/boot/grub/grub.conf", "#serial", "serial"); replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal"); - replace("/harddisk/boot/grub/grub.conf", " panic=3D10 ", " console=3DttyS0= ,38400n8 panic=3D10 "); + replace("/harddisk/boot/grub/grub.conf", " panic=3D10 ", " console=3DttyS0= ,115200n8 panic=3D10 "); =20 /*inittab*/ replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:"); diff --git a/src/install+setup/setup/misc.c b/src/install+setup/setup/misc.c index ae4f780..58e9bb2 100644 --- a/src/install+setup/setup/misc.c +++ b/src/install+setup/setup/misc.c @@ -27,7 +27,7 @@ int writehostsfiles(void) FILE *file, *hosts; struct keyvalue *kv; char hostname[STRING_SIZE]; - char domainname[STRING_SIZE] =3D ""; + char domainname[STRING_SIZE] =3D "localdomain"; char commandstring[STRING_SIZE]; char buffer[STRING_SIZE]; =09 diff --git a/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch= b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch new file mode 100644 index 0000000..2114ae8 --- /dev/null +++ b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch @@ -0,0 +1,71 @@ +From 4e9792dc8ab29175295c79c35f9f6fbd2d453b35 Mon Sep 17 00:00:00 2001 +From: Octavian Purdila +Date: Mon, 23 Dec 2013 19:06:31 +0200 +Subject: [PATCH] usbnet: mcs7830: rework link state detection + +Even with the quirks in commit dabdaf0c (mcs7830: Fix link state +detection) there are still spurious link-down events for some chips +where the false link-down events count go over a few hundreds. + +This patch takes a more conservative approach and only looks at +link-down events where the link-down state is not combined with other +states (e.g. half/full speed, pending frames in SRAM or TX status +information valid). In all other cases we assume the link is up. + +Tested on MCS7830CV-DA (USB ID 9710:7830). + +Cc: Ondrej Zary +Cc: Michael Leun +Cc: Ming Lei +Signed-off-by: Octavian Purdila +Signed-off-by: David S. Miller +--- + drivers/net/usb/mcs7830.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 9237c45..8dd48b5 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -117,7 +117,6 @@ enum { + struct mcs7830_data { + u8 multi_filter[8]; + u8 config; +- u8 link_counter; + }; +=20 + static const char driver_name[] =3D "MOSCHIP usb-ethernet driver"; +@@ -562,26 +561,16 @@ static void mcs7830_status(struct usbnet *dev, struct = urb *urb) + { + u8 *buf =3D urb->transfer_buffer; + bool link, link_changed; +- struct mcs7830_data *data =3D mcs7830_get_data(dev); +=20 + if (urb->actual_length < 16) + return; +=20 +- link =3D !(buf[1] & 0x20); ++ link =3D !(buf[1] =3D=3D 0x20); + link_changed =3D netif_carrier_ok(dev->net) !=3D link; + if (link_changed) { +- data->link_counter++; +- /* +- track link state 20 times to guard against erroneous +- link state changes reported sometimes by the chip +- */ +- if (data->link_counter > 20) { +- data->link_counter =3D 0; +- usbnet_link_change(dev, link, 0); +- netdev_dbg(dev->net, "Link Status is: %d\n", link); +- } +- } else +- data->link_counter =3D 0; ++ usbnet_link_change(dev, link, 0); ++ netdev_dbg(dev->net, "Link Status is: %d\n", link); ++ } + } +=20 + static const struct driver_info moschip_info =3D { +--=20 +2.0.0 + hooks/post-receive -- IPFire 2.x development tree --===============8956360403194340467==-- 
";
-		system("/usr/bin/vnstat -i $device");
-		print "