Commit Graph

9600 Commits

Author SHA1 Message Date
Arne Fitzenreiter
28bee14ecc core95: add ipset to updater.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-08 10:04:13 +01:00
Arne Fitzenreiter
c88002c48b ipset: fix build om arm.
Never hardcode KVER-ipfire in any patches because on arm there is no KVER-ipfire kernel.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-07 09:11:27 +01:00
Arne Fitzenreiter
ea2b8089e6 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2015-11-05 21:39:39 +01:00
Michael Tremer
9ce3b858a6 core95: Ship changed mail.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 15:35:46 +00:00
Alexander Marx
4bfec109e7 BUG10965: only write auth.conf if username/password are set
auth.conf was always written, even if no username/password provided.
In this case only the ip or Hostname of the mailserver was written into
auth.conf. Now the file is only filled if username/password are filled.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Timo Eissler <timo.eissler@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 15:34:28 +00:00
Erik Kapfer
63cbd2c1df ipset: New package
Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 11:47:14 +00:00
Michael Tremer
2913185aa4 openvpn: The --up option only takes one single argument
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 11:44:57 +00:00
Michael Tremer
a4e9b9d8e0 openvpn: Apply static routes on client site as well
Fixes: #10968

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-05 11:44:04 +00:00
Arne Fitzenreiter
89f7654673 openvmtools: enable build on x86_64
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-05 11:40:06 +01:00
Michael Tremer
87fb870b5e core95: Ship updated packages
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:20:14 +00:00
Matthias Fischer
b6f571fa88 snort: Update to 2.9.7.6
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:18:56 +00:00
Erik Kapfer
6411f1baa6 lzo: Update to version 2.09
Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:11:07 +00:00
Michael Tremer
b22d8aaf4a openvpn: Embed the certificate and key file into configuration
This will allow to import just the configuration file
into iOS and establish the VPN connection. Also works
with many other OpenVPN clients.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:47 +00:00
Michael Tremer
71af643cda openvpn: Add option to download a client package with PEM files
This patch adds the option to download a client package
that comes with a regular PEM and key file instead of a
PKCS12 file which is easier to use with clients that
don't support PKCS12 (like iOS) opposed to converting
the file manually.

This requires that the connection is created without
using a password for the certificate. Then the certificate
is already stored in an insecure way.

This patch also adds this to the Core Update 95 updater.

Fixes: #10966

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
CC: Alexander Marx <alexander.marx@ipfire.org>
2015-11-04 21:10:41 +00:00
Michael Tremer
3045d6abde openvpn: Apply static routes when N2N connection comes up
Fixes: #10968

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:27 +00:00
Matthias Fischer
93a08fe261 dma: Update to 0.10
Sorry, I borked the PATCH from yesterday...second try:

dma: Update to 0.10
Changes: dns.c, do not treat unreachable DNS server as permanent error
See: 1a1306df01 (diff-8e1267319329e5ee7e6a92fb2aa01c6b)

Deleted unnecessary blank lines in 'mail.cgi'

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-04 21:10:04 +00:00
Arne Fitzenreiter
123205fdbf core95: add upadated backup exclude list.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-01 21:49:22 +01:00
Arne Fitzenreiter
60fcb2410e firewall: fix disable MASQERADE in green only mode.
using MASQERADE_GREEN="off" will not work because "NETWORK_GREEN" is
not correctly defined in green only mode.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-11-01 11:20:56 +01:00
Michael Tremer
843ca290e1 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-10-31 21:44:51 +00:00
Michael Tremer
6feea5f778 credits.cgi: Update credits
Promotes Alexander Marx to the group of Core Developers.

Also lots of reformatting of old HTML code.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-31 21:41:58 +00:00
Lars Schuhmacher
673351d8a2 Fix unnecessary space character in "E-Mail Absender"
Fix unnecessary space character in "E-Mail Absender".

Replaces the space character with a dash as is correct and already used in the other words in that part.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-31 19:44:42 +00:00
Arne Fitzenreiter
12b5c00d3e core95: add kernel to updater.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-31 17:41:25 +01:00
Arne Fitzenreiter
ec72ebbfda core95: add ntp, backup and geoip changes to updater.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-31 17:07:01 +01:00
Arne Fitzenreiter
b209d63dc0 backup: exclude lm_sensors config.
this config is hardware dependend and will autodetected at boot.
fixes #10865

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-31 17:04:47 +01:00
Arne Fitzenreiter
16cb6ae3d0 geo-ip: download initial database in background.
on slow internet connections like gprs the first start hung many minutes.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-31 16:57:16 +01:00
Michael Tremer
c98981ae3d Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-10-29 23:25:45 +00:00
Arne Fitzenreiter
5215a0f2c1 e1000e: update to 3.2.7.1
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-28 19:36:22 +01:00
Arne Fitzenreiter
8d4cae8736 kernel: update to 3.14.56
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-27 17:31:51 +01:00
Arne Fitzenreiter
e0d5c35122 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2015-10-27 17:31:19 +01:00
Arne Fitzenreiter
bd64e2a02a kernel: genksyms fix empty symbol crc.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-27 16:57:24 +01:00
Matthias Fischer
c267b2da2d snort 2.9.7.6: removed unrecognized configure options in lfs file
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-27 14:37:56 +00:00
Matthias Fischer
6e11539dc2 ntp: Update to 4.2.8p4
ntp-Update to 4.2.8p4, regarding "13 low- and medium-severity vulnerabilities".

For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-26 13:08:53 +00:00
Arne Fitzenreiter
a14e8d0256 Merge remote-tracking branch 'origin/master' into next 2015-10-25 09:21:12 +01:00
Arne Fitzenreiter
3a6784c065 ssh: preferre ecdsa cipher again.
Previous we had not configured it so the ssh default order was used.
Now we define it to disable dsa so we had to give the correct order but
in the example cfg rsa is prefered.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-24 12:07:29 +02:00
Arne Fitzenreiter
b4dd976c20 core94: add system menu to update.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-23 19:49:17 +02:00
Arne Fitzenreiter
038169b894 kernel: uppdate to 3.14.55
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-23 11:00:03 +02:00
Arne Fitzenreiter
39ed5389fc Merge remote-tracking branch 'origin/master' into next 2015-10-22 23:38:27 +02:00
Michael Tremer
374e636fee Move email settings from services to system menu
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-22 21:21:34 +01:00
Arne Fitzenreiter
159c9eb9b1 Merge remote-tracking branch 'origin/master' into next 2015-10-22 13:11:17 +02:00
Arne Fitzenreiter
d7b82e7cce openssh: disable dsa key usage.
fixes #10934

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-22 13:08:27 +02:00
Arne Fitzenreiter
4c5c4f3afc Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2015-10-21 21:02:19 +02:00
Arne Fitzenreiter
52daacc5c4 kernel: update to 3.14.54
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-21 18:48:32 +02:00
Michael Tremer
a057a97655 dhcp rfc2136: dhcpd does not seem to support SHA-1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-21 17:34:41 +01:00
Michael Tremer
2b952557f4 core95: Ship DHCP RFC2136 changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-21 13:52:22 +01:00
Michael Tremer
364452506f Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next 2015-10-21 13:50:31 +01:00
Michael Tremer
4e8949e817 core95: Ship changed routing.cgi file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:20:18 +01:00
Alexander Marx
6be114f03a BUG10941: fix single ip-addresses when no subnet given
Some functions when adding a new route where senseless.
Now the ip address is checked and in case of a missing / wrong
subnetmask an errormessage is raised. The ip address is preserved.
ELSE
we convert the subnetmask to cidr notation and calculate the network ip
correctly.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:19:51 +01:00
Michael Tremer
307327a946 core95: Ship changed firewall.cgi file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:19:31 +01:00
Alexander Marx
8b7417c50b BUG10806: fix wrong customhostgroupcheck
The function to check for valid hostgroup entries not only
checked the target hostgroup but also the source hostgroup if any.
This lead to the error.
Now the check only affects target hostgroups because it does not matter if a sourcegroup contains mac addresses.

 Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 19:18:59 +01:00
Michael Tremer
924f5d6f1a core95: Ship changed firewalllogcountry.dat
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-18 18:54:25 +01:00