Michael Tremer
38c6822d3c
installer: Make restoring the backup interactive
2014-10-15 23:38:05 +02:00
Michael Tremer
dadfa436c9
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2014-10-15 22:55:54 +02:00
Michael Tremer
a7006325c0
apache: Disable SSLv3 by default for the IPFire webinterface
2014-10-15 22:55:26 +02:00
Dirk Wagner
5ae99dd2d1
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
2014-10-15 22:38:13 +02:00
Dirk Wagner
e823d54802
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
2014-10-15 22:35:24 +02:00
Arne Fitzenreiter
6c4319a1b8
openssl-compat: update to 0.9.8zc
2014-10-15 21:44:29 +02:00
Michael Tremer
11a1a874e9
Create Core Update 85
2014-10-15 19:48:16 +02:00
Michael Tremer
7d11428465
installer: Allow to start networking without ISO download
2014-10-12 14:30:51 +02:00
Michael Tremer
a3e135c8bd
installer: Enable new partitioning code to be run in unattended mode
...
The first disk of the system will automatically be used and
a standard installation will be done. After that is done, the
system will reboot into the freshly installed system and execute
setup.
2014-10-11 18:59:31 +02:00
Arne Fitzenreiter
32f17a8e4a
Merge branch 'master' into kernel-test
2014-10-11 09:11:10 +02:00
Michael Tremer
746e71a629
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
2014-10-11 07:18:03 +02:00
Arne Fitzenreiter
52dae2ba3f
Merge branch 'next'
2014-10-10 18:13:13 +02:00
Arne Fitzenreiter
e3d5a18d4a
core84: add update-lang-cache.
...
this file is missing on some machines.
2014-10-10 18:11:52 +02:00
Michael Tremer
6272b1b85e
Merge branch 'master' into install-raid
...
Conflicts:
config/rootfiles/common/bash
lfs/bash
2014-10-10 14:52:30 +02:00
Michael Tremer
a21f2f6a76
firewall: Use correct interface for RED
2014-10-07 14:54:12 +02:00
Arne Fitzenreiter
522b5fbf3e
Merge remote-tracking branch 'origin/master' into kernel-test
2014-10-06 10:11:13 +02:00
Arne Fitzenreiter
24d36c80a6
p2pblock: fix flush rules if all p2p's are allowed.
2014-10-05 15:12:44 +02:00
Arne Fitzenreiter
2a5b19c56f
p2pblock: ipp2p must run before CONNTRACK.
...
And can only used for blocking, not for accept conenections bacause connections must already established for detecting protocol types.
2014-10-04 17:39:51 +02:00
Michael Tremer
791c2b45d8
firewall: fix rules.pl for old rules without ratelimiting.
2014-10-04 13:52:15 +02:00
Michael Tremer
243f8ca6e9
squid: Update to 3.4.8
...
Contains some security fixes:
* CVE-2014-6270
http://www.squid-cache.org/Advisories/SQUID-2014_3.txt
* CVE-2014-7141
CVE-2014-7142
http://www.squid-cache.org/Advisories/SQUID-2014_4.txt
2014-10-02 18:21:51 +02:00
Arne Fitzenreiter
34b26caca1
bash: rootfile update.
2014-09-30 23:49:47 +02:00
Michael Tremer
da8c74ee53
parted: Update to 3.1.
2014-09-30 19:28:55 +02:00
Michael Tremer
625c95d2be
core84: Add updated readline
2014-09-29 13:52:16 +02:00
Michael Tremer
c02899be04
readline: Update to 6.3.
2014-09-29 13:51:26 +02:00
Michael Tremer
ce84ace5bf
bash: Update to 4.3.
...
Conflicts:
lfs/bash
2014-09-29 13:49:39 +02:00
Arne Fitzenreiter
ecc92f3c83
Merge branch 'master' into kernel-test
2014-09-29 13:45:06 +02:00
Arne Fitzenreiter
416bf5f3f9
fix merge problem.
2014-09-29 13:44:26 +02:00
Arne Fitzenreiter
cd4aceeb12
Merge branch 'master' into kernel-test
2014-09-29 09:22:42 +02:00
Michael Tremer
9a818c0eb4
core84: Add changed /etc/rc.d/init.d/network
2014-09-28 13:32:17 +02:00
Michael Tremer
b7981215da
core84: Add changed urlfilter.cgi
2014-09-27 20:43:49 +02:00
Michael Tremer
21df0788ab
core84: Add changed files from #10620
2014-09-26 13:03:48 +02:00
Michael Tremer
7e09a94a81
Merge remote-tracking branch 'amarx/BUG10620' into next
2014-09-26 13:03:22 +02:00
Michael Tremer
60bce6ba6a
Merge remote-tracking branch 'amarx/BUG10615' into next
2014-09-26 13:02:28 +02:00
Michael Tremer
2acc3cd9e7
core84: Add changed files from fw-checksubnet branch
2014-09-26 13:00:38 +02:00
Michael Tremer
82f8d118b7
core84: Add changed files from the firewall-dnat branch
2014-09-26 12:58:13 +02:00
Michael Tremer
df6649b0fe
Merge remote-tracking branch 'amarx/firewall-dnat' into next
...
Conflicts:
config/firewall/rules.pl
2014-09-26 12:55:55 +02:00
Alexander Marx
0d0ee70f3b
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1
2014-09-26 12:53:05 +02:00
Michael Tremer
b30890aa06
bash: Import upstream patches for CVE-2014-6271 and CVE-2014-7169
2014-09-26 12:42:27 +02:00
Michael Tremer
b7784e38bd
core84: Add dnsmasq update
2014-09-26 12:25:48 +02:00
Michael Tremer
2a3506f349
Create core update 84
2014-09-26 12:25:30 +02:00
Arne Fitzenreiter
cea3c8cf53
core83: reload init at update because glibc changes.
2014-09-25 20:36:06 +02:00
Michael Tremer
a4c895e569
Merge branch 'master' into next
2014-09-24 20:39:43 +02:00
Michael Tremer
5aa856ce1c
core83: add changed files
2014-09-24 20:38:59 +02:00
Michael Tremer
5f17f9f341
Create core update 83
2014-09-24 20:31:55 +02:00
Alexander Marx
5795fc1b55
vpn-statistic: added new statistic page for OpenVPN Roadwarrior
2014-09-18 16:29:10 +02:00
Michael Tremer
f5fe98fead
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
2014-09-16 20:45:35 +02:00
Dirk Wagner
e05ac9dbd0
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
2014-09-12 23:29:32 +02:00
Alexander Marx
ca4259a758
BUG10620: reload firewall.local in rules.pl, no longer in initscript
2014-09-11 17:13:07 +02:00
Alexander Marx
d2793ea805
BUG10615 part3: adapt rules.pl to use connectionlimit and ratelimit
2014-09-11 15:06:26 +02:00
Arne Fitzenreiter
cce37f04af
openssl-compat: update to 0.9.8zb.
2014-09-09 19:20:54 +02:00
