Commit Graph

2467 Commits

Author SHA1 Message Date
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
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
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
3906cf7e85 Merge remote-tracking branch 'amarx/vpn-statistic1' into next 2015-01-13 17:37:18 +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
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
Michael Tremer
8cc7ba9020 installer: Update translations 2014-12-26 17:31:37 +01:00
Michael Tremer
b097fdd66f installer: Improve changing language at runtime 2014-12-24 00:33:30 +01:00
Dirk Wagner
601f8347cc Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update 2014-12-23 09:02:23 +01:00
Arne Fitzenreiter
56e211f66e u-boot: update to 2014.4. and add BPi support. 2014-12-19 07:12:40 +01:00
Michael Tremer
ff3bae7b89 Add script that automatically updates/installs GRUB2
This script also handles RAID devices
2014-12-18 17:27:47 +01:00
Michael Tremer
bbf2fe8902 fireinfo: Import latest patches 2014-12-15 23:28:35 +01:00
Michael Tremer
405d20bcb3 fireinfo: Import latest patches 2014-12-15 23:27:25 +01:00
Arne Fitzenreiter
e71475c13a kernel: rt5572 patches part2. 2014-12-07 11:04:46 +01:00
Michael Tremer
9a3d6f5ad1 Merge remote-tracking branch 'mfischer/wget' into next
Conflicts:
	make.sh
2014-12-02 23:51:49 +01:00
Michael Tremer
413abba64a Merge remote-tracking branch 'mfischer/screen' into next 2014-12-02 17:26:36 +01:00
Michael Tremer
6ae131ef23 Merge remote-tracking branch 'amarx/BUG10693' into next 2014-12-02 16:52:17 +01:00
Alexander Marx
ddfc0693e9 Squid-Accounting: Bugfix 10693
Fixes problem with last years month in webinterface and bill creation
2014-12-02 08:38:51 +01:00
Matthias Fischer
2a2195807e screen: Update to 4.2.1 2014-11-30 17:09:38 +01:00
Arne Fitzenreiter
b3f5e2b2a9 remove more enused patches. 2014-11-30 01:45:15 +01:00
Arne Fitzenreiter
01e64ad131 kernel: remove obsolete modules and patches. 2014-11-27 07:33:50 +01:00
Michael Tremer
f9921891f4 Merge remote-tracking branch 'origin/seventeen' into seventeen 2014-11-16 11:38:45 +01:00
Michael Tremer
c5a5b13e8e installer: Power off instead of reboot after unattended install 2014-11-16 11:37:47 +01:00
Arne Fitzenreiter
da4529ae51 kernel-pae: update un/install scripts for grub2. 2014-11-16 10:07:33 +01:00
Michael Tremer
a046e8a6ab installer: Only drop to a debug shell after a segmentation fault 2014-11-14 00:03:23 +01:00
Michael Tremer
ade96ba8a5 installer: Fix umounting destination 2014-11-13 23:58:05 +01:00
Matthias Fischer
1f8ea39aca wget: deleted obsolete patch-file 2014-11-11 18:40:52 +01:00
Michael Tremer
b1c1a58994 Merge remote-tracking branch 'origin/seventeen' into seventeen 2014-11-10 17:36:01 +01:00
Arne Fitzenreiter
817317ed9e kernel: update netdev ledtrigger patch. 2014-11-06 20:16:58 +01:00
Arne Fitzenreiter
9b7862db33 Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen 2014-11-06 00:08:55 +01:00
Arne Fitzenreiter
bcd7a75749 kernel: kirkwood: fix legacy boot patch for dreamplug. 2014-11-06 00:08:13 +01:00
Michael Tremer
bb75bc3b14 installer: Improve check for serial console option 2014-11-05 23:43:01 +01:00
Timmothy Wilson
851fba0e8d httpscert: Create certificate with SHA256 hash 2014-11-05 22:08:02 +01:00
Arne Fitzenreiter
c0504c5cc5 part/fsresize: fix on systems without initrd.
/proc/mounts has no correct entry for / on such systems.
Use mount instead.
2014-11-05 19:08:30 +01:00
Michael Tremer
3e1145e1a0 installer: Fix download of the ISO image 2014-11-05 01:34:27 +01:00