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
Arne Fitzenreiter
7b0afb50d3
Merge remote-tracking branch 'origin/master' into core82
2014-09-09 17:57:27 +02:00
Arne Fitzenreiter
51d8e33093
xen-image: add xz-aware xen version hint to README.
2014-09-09 17:54:27 +02:00
Michael Tremer
499e7fc33f
general-functions.pl: Fix perl coding error
2014-09-06 18:45:43 +02:00
Michael Tremer
7bfaaa0d35
general-functions.pl: Fix syntax error
2014-09-06 18:45:39 +02:00
Michael Tremer
9f64c06d94
general-functions.pl: Subroutine getnetworkip() accepted multiple arguments
2014-09-06 18:45:35 +02:00
Michael Tremer
c14203248c
general-functions.pl: Fix perl coding error
2014-09-06 18:44:50 +02:00
Arne Fitzenreiter
1aa031ab2a
grub2: add splashimage.
2014-09-06 17:15:05 +02:00
Stefan Schantl
e4d62bc2ab
grub: Use unifont as default.
...
Fixes #10601 .
2014-09-04 18:12:23 +02:00
Stefan Schantl
df62453e9c
Merge branch 'install-raid' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into grub-unifont
...
Conflicts:
config/rootfiles/common/i586/grub
2014-09-04 18:11:00 +02:00
Stefan Schantl
ed8977a1a0
grub: Add unifont.pf2.
...
We directly generate a grub2 compatible font file
from the main unifont font file, by using grub-mkfont.
This binary requires fontconfig as build dependency, so I moved it in
the build hirachy before the grub package.
2014-09-04 18:00:02 +02:00
Michael Tremer
3ef5dd9871
grub: Add splash image
2014-09-04 12:07:10 +02:00
Michael Tremer
61aaa5206f
Add some files that are required by dracut to build the initramfs
2014-09-04 11:35:03 +02:00
Michael Tremer
da05e07629
general-functions.pl: Fix syntax error
2014-09-04 11:13:41 +02:00
Michael Tremer
722b419dea
initscripts: Mount /var/lock after all other FSes have been mounted.
...
For example /var/lock does not exist, yet when mountkernfs is
called.
2014-09-04 11:12:41 +02:00
Michael Tremer
6a2a62cf25
general-functions.pl: Subroutine getnetworkip() accepted multiple arguments
2014-09-03 22:23:04 +02:00
Michael Tremer
b02ba841b3
webif: Find correct language file when locale is in format xx_XX.utf8
2014-08-30 21:10:32 +02:00
Michael Tremer
38a1596273
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
2014-08-30 10:46:11 +02:00
Michael Tremer
6246d21c0b
Rootfile update
2014-08-24 20:37:30 +02:00
Michael Tremer
62845ec556
Merge remote-tracking branch 'origin/next' into install-raid
2014-08-24 16:29:22 +02:00
Michael Tremer
da840da867
Remove template of /etc/fstab
2014-08-24 16:09:54 +02:00
Michael Tremer
d79fbce44e
findutils: Cannot use exec here or the lockfile won't be removed
2014-08-24 15:22:04 +02:00
Michael Tremer
ff6d34ab8b
minidlna: Update to 1.1.3
...
Fixes #10573
2014-08-24 15:14:25 +02:00
Michael Tremer
bfea8d7d2f
findutils: Run updatedb once a week
...
As suggested in bug #10303
2014-08-24 14:46:06 +02:00
Michael Tremer
3a7f46d377
Merge remote-tracking branch 'origin/next' into install-raid
2014-08-24 13:36:39 +02:00
Michael Tremer
a24546794d
Update auto-resize code to work with any partition number
2014-08-24 13:29:18 +02:00
Arne Fitzenreiter
a767496442
Merge remote-tracking branch 'origin/master' into kernel-test
2014-08-23 17:07:26 +02:00
Michael Tremer
da45819dad
Add lvm2 and multipath-tools (for kpartx)
2014-08-23 16:20:48 +02:00
