Commit Graph

2696 Commits

Author SHA1 Message Date
Michael Tremer
9e7099af47 fireinfo: Update to version 2.1.11 2015-02-15 13:16:08 +01:00
Stefan Schantl
bc9446c65f Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip
Conflicts:
	make.sh
2015-02-14 12:34:31 +01:00
Matthias Fischer
765423cebe Python: Update to 2.7.9 2015-02-12 20:16:09 +01:00
Matthias Fischer
9148fbc468 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-02-12 19:40:54 +01:00
Michael Tremer
dea158f2fc strongswan: Create configuration for better interoperability
Also import some upstream fixes for connection stability.
2015-02-11 15:15:47 +01:00
Michael Tremer
0cf8de0502 Revert "strongswan: Fix for CVE-2014-9221"
This reverts commit c1000c2cd4.

This commit has been merged from master to this branch, but
actually strongswan was already updated to version 5.2.2 which
does not need this fix any more.
2015-02-11 14:59:11 +01:00
Michael Tremer
aa2e56a531 Merge branch 'master' into next 2015-02-11 14:58:10 +01:00
Arne Fitzenreiter
309b7de86e swconfig: supress error on non dtb machines. 2015-02-11 08:07:49 +01:00
Arne Fitzenreiter
30bf8c66d7 kernel: r8169 disable PCIe L23 modes. 2015-02-11 08:03:57 +01:00
Matthias Fischer
ae4149506c Typo in 'de.pl' 2015-02-08 14:03:43 +01:00
Michael Tremer
5ae2227566 installer+setup: Automatically update language lists 2015-02-04 13:31:36 +01:00
Michael Tremer
de0ccf8f8c Merge branch 'master' into next
Conflicts:
	make.sh
2015-02-04 13:24:05 +01:00
Alexander Marx
2c9c92f465 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730 2015-02-03 07:27:03 +01:00
Alexander Marx
8516edcc48 BUG10730: fix permissions of ovpnserver.log 2015-02-03 07:26:34 +01:00
Michael Tremer
db2e0a5bae Merge remote-tracking branch 'amarx/collectd4' into next 2015-02-02 23:56:18 +01:00
Michael Tremer
32e321b248 dnsmasq: Update to development snatpshot 2015-02-02 00:33:04 +01:00
Michael Tremer
976a7b26bf installer+setup: Update translations 2015-02-01 12:57:05 +01:00
Arne Fitzenreiter
9c47987e25 hostapd: undo rename if dual interfaces are not supported. 2015-01-30 17:39:34 +01:00
Arne Fitzenreiter
e21cef2784 kernel: update banana pi, lamobo-r1 and add banana pro dtb. 2015-01-30 00:09:00 +01:00
Arne Fitzenreiter
4165a41e84 kernel: update to 3.14.30. 2015-01-29 07:47:16 +01:00
Michael Tremer
06f451c0be Merge remote-tracking branch 'glotzi/monit' into next 2015-01-28 23:10:47 +01:00
Michael Tremer
fe53fa8dac Merge remote-tracking branch 'ummeegge/lynis' into next
Conflicts:
	make.sh
2015-01-28 22:49:36 +01:00
Michael Tremer
fe875de813 glibc: Backport hotfixes from RHEL 2015-01-27 22:01:24 +01:00
Arne Fitzenreiter
ffeb717f2d add swconfig for lamobo-r1 switch setup. 2015-01-27 20:21:17 +01:00
Arne Fitzenreiter
7726e3a66b kernel: add support for lamobo-r1. 2015-01-27 19:11:57 +01:00
Dirk Wagner
a1f369eb1e Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit 2015-01-27 13:33:01 +01:00
Michael Tremer
f8cdaa1084 installer: Fix selection English as default language 2015-01-22 23:09:43 +01:00
Arne Fitzenreiter
08215cb5d8 collectd: sync after cfg update and ramdisk backup. 2015-01-21 13:19:00 +01:00
Arne Fitzenreiter
893ef99ed4 collectd: fix disable swap plugin if no swap exist. 2015-01-21 13:16:09 +01:00
Arne Fitzenreiter
d595016bfb leds: add mirabox support. 2015-01-18 21:32:15 +01:00
Arne Fitzenreiter
d1b89a12f9 hostapd: create additional AP device if switch has failed. 2015-01-18 21:29:53 +01:00
Michael Tremer
3906cf7e85 Merge remote-tracking branch 'amarx/vpn-statistic1' into next 2015-01-13 17:37:18 +01:00
Michael Tremer
c1000c2cd4 strongswan: Fix for CVE-2014-9221 2015-01-12 13:03:16 +01:00
Erik Kapfer
98a5192ef2 openssl: Disable SSLv2 and SSLv3.
Fixes #10712.
2015-01-12 12:17:43 +01:00
Michael Tremer
5973563f8b Merge remote-tracking branch 'stevee/next-ddns-update' into next 2015-01-11 21:24:17 +01:00
Dirk Wagner
f0dd065425 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
Conflicts:
	config/etc/logrotate.conf
2015-01-06 15:51:29 +01:00
Stefan Schantl
635a44bfad ddns: Add latest patches.
Add patches to fix an authentication problem against spdns.org and
to add changeip as new provider.
2015-01-05 23:13:47 +01:00
Dirk Wagner
f7d7241829 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update 2015-01-05 08:34:31 +01:00
Stefan Schantl
0909c0d150 Automatically download and update GeoIP Databases. 2015-01-04 13:40:34 +01:00
Stefan Schantl
cab02e2a5f Add "GEOIPBLOCK" chains to firewall initscript. 2015-01-04 00:57:23 +01:00
Stefan Schantl
2285f9da22 Add xt_geoip_update script.
This script will download the latest available geoip database, convert
it into a compatible binary format and move it to the correct destination.
2015-01-04 00:55:17 +01:00
Stefan Schantl
ca842e1822 xt_geoip_build: Script to convert GeoIP CSV into compatible binary databases.
This is a cleaned up version of the original build script shipped by the
xtables-addons source code.

The following abilities have been removed:
* IPv6 support
* Big Endian
2015-01-04 00:54:46 +01:00
Arne Fitzenreiter
82bcc200c7 backports: rebuild all usb net modules with backports.
fix missing modules eg. with asix usb adapters.
2015-01-03 15:47:38 +01:00
Michael Tremer
7db3e17a4a installer: Fix crash with small screen resolutions
The installer is showing a help line at the bottom of the
screen which is in some languages rather long. If it is
longer than the width of the screen, the installer used to
crash which is now fixed in this patch.
2015-01-02 14:41:33 +01:00
Michael Tremer
b56472d49b dnsmasq: Import some patches from upstream
These may fix the stability issues described in #10607
2015-01-02 11:49:07 +01:00
Alexander Marx
218d2d75f5 BUG10693: Fix wrong monthnumber in PDF Bill 2015-01-02 10:22:28 +01:00
Michael Tremer
5946f1f9d0 update-bootloader: Search for /boot first and then /
The bootloader is usually installed on the /boot partition
if that exists. Some installations may mount / from a different
device, so we make sure to update the bootloader on the
right device.
2015-01-01 16:36:51 +01:00
Arne Fitzenreiter
91e56a59a4 kernel: add backports 3.18.1-1. 2014-12-31 08:48:56 +01:00
Michael Tremer
66c684fa60 Change default font to that what we use in IPFire 3 2014-12-26 18:00:51 +01:00
Michael Tremer
0d87efae29 setup: Update translations 2014-12-26 17:32:17 +01:00