Arne Fitzenreiter
0fbba54e82
Merge branch 'master' into next
...
Conflicts:
lfs/monit
2015-04-11 21:58:09 +02:00
Arne Fitzenreiter
ad592fb878
backports: rt2x00 supress more queue warnings
2015-04-09 15:34:14 +02:00
Arne Fitzenreiter
9ee54998cb
hostapd: increase EAPOL timeouts
...
Android clients need more time because sleep modes and low wlan interrupt priority.
2015-04-09 15:32:42 +02:00
Michael Tremer
263d0a71a9
dnsmasq: Import latest patches from upstream
2015-04-09 14:35:47 +02:00
Michael Tremer
979c846343
collectd: Fix typo in "derive"
2015-04-09 14:33:54 +02:00
Michael Tremer
c6ce1e7ecb
dnsmasq: Import latest patches from upstream
2015-04-04 15:23:17 +02:00
Michael Tremer
6ecbdec1b7
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-03-31 00:59:59 +02:00
Michael Tremer
df5fbff531
strongswan: Update to 5.3.0
...
Enable support for CCM and CTR
2015-03-31 00:59:28 +02:00
Michael Tremer
b34ba990aa
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-03-31 00:55:47 +02:00
Michael Tremer
23e591db40
strongswan: Update to 5.3.0
...
Enable support for CCM and CTR
2015-03-31 00:55:31 +02:00
Arne Fitzenreiter
0a565414dd
kernel: backports: rt2800usb: suppress more queue warnings
2015-03-29 22:43:56 +02:00
Arne Fitzenreiter
5b3bd19f31
kernel: fix hyperv net driver for legacy hyperv 2008.
2015-03-29 19:46:14 +02:00
Arne Fitzenreiter
a8d9f5cec1
Merge remote-tracking branch 'origin/next' into kernel-test
...
Conflicts:
lfs/openssl-compat
2015-03-29 19:33:04 +02:00
Arne Fitzenreiter
fffb0165b6
kernel: update to 3.14.37
2015-03-29 19:29:55 +02:00
Arne Fitzenreiter
5f7a8b7e1c
openssl: Fix soname version of build
2015-03-20 11:17:25 +01:00
Arne Fitzenreiter
79cfa337b1
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-03-19 19:19:32 +01:00
Arne Fitzenreiter
2acac5421f
cyrus-sasl: Update to version 2.1.26
2015-03-19 19:18:49 +01:00
Michael Tremer
506e4b9671
openssl: Rebase "disable SSLv2, SSLv3" patch
2015-03-19 16:04:35 +01:00
Michael Tremer
498b3cd3a8
openssl: Remove "fix parallel build" patch
2015-03-19 16:03:58 +01:00
Michael Tremer
a0297133a1
openssl: Update weak-ciphers and build patches
2015-03-19 15:54:43 +01:00
Michael Tremer
03d4ff6007
openssl: Remove support for cryptodev
...
The patches won't apply any more and there does not seem
support from upstream for the latest versions of OpenSSL
2015-03-19 15:47:13 +01:00
Michael Tremer
13ed354420
fireinfo: Forbid string "Serial"
2015-03-17 22:23:13 +01:00
Michael Tremer
6f49ea2ea2
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-03-17 20:42:17 +01:00
Michael Tremer
6e9fc7b868
Merge remote-tracking branch 'mfischer/dhcp' into next
2015-03-16 17:53:15 +01:00
Michael Tremer
e5f58910c5
dnsmasq: Import more patches from upstream
2015-03-12 12:59:36 +01:00
Michael Tremer
d0bd5afe1b
openssl: Disable SSLv3 and SSLv2 by default
...
This patch will disable SSLv3 and SSLv2 by default but leaves
the protocol compiled in into the library so that applications
can use it when they still need it (e.g. sslscan).
2015-03-12 12:55:40 +01:00
Michael Tremer
33bfe91f5b
Revert "openssl: Disable SSLv2 and SSLv3."
...
This reverts commit 98a5192ef2 .
2015-03-12 12:55:05 +01:00
Michael Tremer
61c6e9b71d
dnsmasq: Import more patches from upstream
2015-03-10 16:21:58 +01:00
Michael Tremer
6bea9be4f4
clamav: Fix compiling
...
glibc headers were not correctly included
2015-03-05 12:54:22 +01:00
Michael Tremer
8d289021d3
strongswan: Update solution for strongswan bug #816
2015-03-04 23:54:10 +01:00
Michael Tremer
6644c1c7f2
dnsmasq: Import latest git version of dnsmasq
2015-03-04 23:27:27 +01:00
Arne Fitzenreiter
6b69683053
Merge branch 'master' into next
2015-02-22 23:44:39 +01:00
Arne Fitzenreiter
8602108e6c
kernel: fix lamobo-r1 sata power regulator.
2015-02-20 16:13:10 +01:00
Arne Fitzenreiter
f345b2831c
cleanup: remove some unused patches.
2015-02-20 10:09:34 +01:00
Matthias Fischer
c1e9ba671e
dhcp: Update to 4.3.1
2015-02-18 12:47:37 +01:00
Michael Tremer
29e74f0476
fireinfo: Update to version 2.1.11
2015-02-15 13:33:09 +01:00
Michael Tremer
9e7099af47
fireinfo: Update to version 2.1.11
2015-02-15 13:16:08 +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
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
de0ccf8f8c
Merge branch 'master' into next
...
Conflicts:
make.sh
2015-02-04 13:24:05 +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
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
fe53fa8dac
Merge remote-tracking branch 'ummeegge/lynis' into next
...
Conflicts:
make.sh
2015-01-28 22:49:36 +01:00