Commit Graph

3860 Commits

Author SHA1 Message Date
Alexander Marx
0fa8d28e8f Squid-accounting: new Version 1.0.3 (graph updates, movedb update)
New Version. Now the data is correctly moved to hist table when month
has changed.
Also the graphs for old month starts by zero. In old version graphdata
was started by total amount of bytes.
2015-04-21 20:47:31 +02:00
Arne Fitzenreiter
2b4830c5ab kernel: update to 3.14.39 2015-04-21 14:02:47 +02:00
Arne Fitzenreiter
785c919520 remove ipp2p patches.
ipp2p is build by xtables addons now.
2015-04-20 22:57:24 +02:00
Michael Tremer
1245aa72df openssl: Fix build by updating the patches 2015-04-19 11:59:19 +02:00
Matthias Fischer
2805275ecc openssl: Update to 1.0.2a 2015-04-19 11:29:02 +02:00
Michael Tremer
49b70d62a9 Merge remote-tracking branch 'stevee/core-90-geoip' into next 2015-04-18 16:15:17 +02:00
Michael Tremer
d54a2ce452 dnsmasq: Import more patches from upstream 2015-04-18 16:11:29 +02:00
Arne Fitzenreiter
4d9e31ab78 kernel: update to 3.14.38 2015-04-16 20:52:44 +02:00
Stefan Schantl
30654fd82b configroot: Add geoip related files.
Create required empty files and install geoip-functions.pl to
desired destination.
2015-04-16 19:39:11 +02:00
Stefan Schantl
cbc5a4374f Revert "perl-Locale-Country: Update country codes to version 3.33."
This reverts commit bf235e962c.
2015-04-16 10:51:44 +02:00
Stefan Schantl
e6c4f090b6 Merge branch 'next-geoip' into core-90-geoip 2015-04-15 17:10:49 +02:00
Arne Fitzenreiter
d4ee6f0813 Merge remote-tracking branch 'origin/master' into next 2015-04-12 22:53:06 +02:00
Michael Tremer
abd93c4241 collectd: Ignore errors from OpenVPN configuration file 2015-04-12 22:44:50 +02:00
Arne Fitzenreiter
acb759575e hostapd: update to 2.4 2015-04-11 22:03:03 +02:00
Arne Fitzenreiter
f3dce17984 wpa_supplicant: update to 2.4 2015-04-11 22:02:33 +02:00
Arne Fitzenreiter
0fbba54e82 Merge branch 'master' into next
Conflicts:
	lfs/monit
2015-04-11 21:58:09 +02:00
Alexander Marx
462056ad86 vpn-statistic: move collectd converter to the right place
Build of cdrom will fail if the converter script is not moved to the
right place
2015-04-11 08:33:02 +02:00
Michael Tremer
1164cb0d0b pound: Decrease the size of the DH key to 1024 bits
Generating a 2048 bit key takes way too long to be feasible
at build time.
2015-04-10 13:48:47 +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
Alexander Marx
6b7cbc8f33 vpn-statistic: move collectd.vpn to /var/ipfire/ovpn/
collectd.vpn needs to be within /var/ipfire/ovpn so that the
ovpnmain.cgi is able to write the status files from the n2n connections
to the file.
2015-04-09 15:16:32 +02:00
Michael Tremer
b525629a46 haproxy: Provide a better example configuration that works 2015-04-09 14:35:54 +02:00
Michael Tremer
263d0a71a9 dnsmasq: Import latest patches from upstream 2015-04-09 14:35:47 +02:00
Michael Tremer
ecb2d6b954 Merge remote-tracking branch 'earl/tor' into next 2015-04-08 22:47:32 +02:00
Jan Paul Tuecking
b1636efd0b tor: update to 0.2.5.12 2015-04-08 07:45:16 +02:00
Michael Tremer
15847a8001 Merge remote-tracking branch 'earl/tor' into next 2015-04-05 12:38:51 +02:00
Michael Tremer
c6ce1e7ecb dnsmasq: Import latest patches from upstream 2015-04-04 15:23:17 +02:00
Michael Tremer
b0b61056a7 haproxy: Provide a better example configuration that works 2015-04-04 14:38:38 +02:00
Dirk Wagner
29268dee3b mont addon: added missing dir /var/lib/monit to distribution
Conflicts:
	lfs/monit
2015-04-04 14:18:00 +02:00
Michael Tremer
6b6730a95f Merge remote-tracking branch 'glotzi/monit' into next 2015-04-04 14:14:19 +02:00
Michael Tremer
f942231190 Merge remote-tracking branch 'glotzi/asterisk-update' into next 2015-04-04 14:12:53 +02:00
Stefan Schantl
8f548dfe36 Merge branch 'nfs-server-fix' into next 2015-04-03 19:19:34 +02:00
Stefan Schantl
668ea5d311 nfs-server: Fix kernel version check in initscript.
nfsd requires a mounted nfsd filesystem which has been introduced in
the kernel 2.6 tree. To determine the current running kernel, a check
was included in the initscript which works fine until we switched to a kernel
version 3.x.

This commit fixes this check, so the nfs-server will startup again.

Fixes #10760.
2015-04-03 18:59:12 +02:00
Jan Paul Tuecking
79b269802d tor: update to 0.2.5.11 2015-04-03 03:05:24 +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
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
6949953b7f tar: fix toolchain build 2015-03-29 13:35:16 +02:00
Justin Luth
e0b9a600e1 Allow flash-images to compile on Ubuntu: delay to allow automount/dismount 2015-03-28 12:59:35 +01:00
Dirk Wagner
a40a1e25f7 mont addon: added missing dir /var/lib/monit to distribution 2015-03-22 22:33:30 +01:00
Dirk Wagner
9384b26ba9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit 2015-03-22 18:39:26 +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
Arne Fitzenreiter
7f5795c65f apache2: Update to version 2.2.29 2015-03-19 19:18:23 +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