Commit Graph

7722 Commits

Author SHA1 Message Date
Michael Tremer
ed4b4c19b9 Re-apply: OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected
to the server.

Conflicts:
	html/cgi-bin/index.cgi
	html/cgi-bin/ovpnmain.cgi
2014-05-14 21:46:22 +02:00
Michael Tremer
7e8d006496 core78: Add updated theme functions.pl. 2014-05-14 21:32:04 +02:00
Michael Tremer
6fde3230a8 Merge branch 'master' into next 2014-05-14 21:30:50 +02:00
Michael Tremer
a50dadc229 openvpn: Remove RC2 as a cipher option. 2014-05-14 21:28:45 +02:00
Erik Kapfer
f527e53f54 ovpn_fixes: Fixed some typos and strcture.
Fixes #10462#c21.

Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-14 21:26:42 +02:00
Michael Tremer
b7ca450650 core78: Add OpenVPN changes. 2014-05-14 20:42:41 +02:00
Michael Tremer
cf910b536a daq: Update to version 2.0.2. 2014-05-14 20:39:36 +02:00
Michael Tremer
d3782f77ba core78: Add all recently changes files and packages. 2014-05-14 20:33:33 +02:00
Michael Tremer
28f44b83c3 core78: Don't remove the ipfire theme. 2014-05-14 20:31:12 +02:00
Michael Tremer
172c1f72c4 ppp: Import some more patches from Fedora. 2014-05-14 20:20:36 +02:00
Michael Tremer
0a511b7693 ppp: Try longer to connect via PPPoE (60 seconds). 2014-05-14 20:02:55 +02:00
Arne Fitzenreiter
aab13a8d9d backupiso: change to hybrid image. 2014-05-14 18:59:22 +02:00
Arne Fitzenreiter
2308525f0c start core78. 2014-05-14 18:53:51 +02:00
Michael Tremer
1f99fc9845 openvpn: Fix wrong default port number. 2014-05-13 20:36:58 +02:00
Michael Tremer
dbe2a1cc36 Merge remote-tracking branch 'stevee/snort-update' into next 2014-05-12 19:30:02 +02:00
Michael Tremer
d25b7c32bd Merge remote-tracking branch 'glotzi/nut-update' into next 2014-05-12 13:49:12 +02:00
Michael Tremer
dd58c50c3e proxy.pac: Don't use proxy for direct domain access. 2014-05-12 13:21:24 +02:00
Bernhard Bitsch
7c1b7d3e22 proxy.pac: Only grant direct access for actual subnets.
Fixes #10324.
2014-05-12 13:16:43 +02:00
Michael Tremer
27ecea56ce squid: Update to 3.4.5. 2014-05-12 12:54:48 +02:00
Michael Tremer
c6d9cb76ab openvpn: Update translation.
DH keys are actually called DH parameters.
2014-05-12 12:54:08 +02:00
Stefan Schantl
afe1107dc9 snort: Update to 2.9.6.1. 2014-05-11 19:26:32 +02:00
Michael Tremer
661cd276b6 Merge remote-tracking branch 'ummeegge/openvpn' into next
Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:47:11 +02:00
Michael Tremer
b2e75449a9 Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design."
This reverts commit c2b5d12b34.

Conflicts:
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
2014-05-11 18:34:34 +02:00
Michael Tremer
b9e1738442 Merge remote-tracking branch 'ummeegge/OpenVPN' into next 2014-05-11 18:27:50 +02:00
Erik Kapfer
6d49c4a631 OpenVPN: Update to version 2.3.4 2014-05-11 09:28:53 +02:00
Erik Kapfer
49abe7afb1 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
v.3 New changes #10462 Comment 20:
Updated to core version 77.
Deleted manual name award in DH key upload section, name will be given automatically now.
Added sha512WithRSAEncryption instead of sha1WithRSAEncryption for "Root Certificate".
Added tls-auth support for Roadwarriors.
Added crypto engine support for N2N and Roadwarriors.
2014-05-11 09:24:04 +02:00
Michael Tremer
6e8089a94f theme: Fix spacing of version string in footer. 2014-05-10 14:25:36 +02:00
Ersan Yildirim
03fa5cba13 Update Turkish translation of the installer and setup. 2014-05-09 15:01:17 +02:00
Michael Tremer
03d0b8c7e8 Merge branch 'master' into next
Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
2014-05-09 01:31:43 +02:00
Dirk Wagner
9eb6ff30db nut addon: increased package version. 2014-05-08 21:22:22 +02:00
Arne Fitzenreiter
a257ce6b8d set version to IPFire 2.15-core77. 2014-05-08 17:03:21 +02:00
Arne Fitzenreiter
e8bca747d0 GeoIP: update db 06052014. 2014-05-08 16:47:17 +02:00
Arne Fitzenreiter
2dc0ff2b48 usb-modeswitch: update to 2.1.1 and db 20140327. 2014-05-08 16:37:07 +02:00
Arne Fitzenreiter
dcd8c87594 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x 2014-05-08 16:15:13 +02:00
Arne Fitzenreiter
74fd06be0e kernel: add Marvel uAP module (dreamplug). 2014-05-08 16:13:25 +02:00
Dirk Wagner
3fe41c0159 nut addon: Update to 2.7.2 2014-05-07 21:37:51 +02:00
Alexander Marx
7fa1b16e5d Firewall: Fix slow generation of host table in firewall groups 2014-05-07 12:13:13 +02:00
Alexander Marx
f1dd19724c Firewall: Add ip addres after alias name in dropdown for source and target 2014-05-07 12:00:49 +02:00
Michael Tremer
8fc66b345a core77: Remove dialctrl.pl call from crontab. 2014-05-07 12:00:11 +02:00
Michael Tremer
1349c45777 core77: Only add timezone-transition rules when needed. 2014-05-07 11:54:53 +02:00
Arne Fitzenreiter
6e283deb2d kernel: update to 3.10.39. 2014-05-06 18:30:51 +02:00
Michael Tremer
b7265a9866 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x 2014-05-06 13:21:40 +02:00
Alexander Marx
1be052f995 Firewall: When using custom hosts and not having BLUE or ORANGE, the Ruletable took very long to display every Line
With this commit the page is shown quickly because there's now a check
if ORANGE or BLUE exist before we test if a host might be in that
subnet.
2014-05-06 13:21:32 +02:00
Arne Fitzenreiter
4e631b66be initrd: add some dependency modules and remove wirless cards.
this fix pxe boot on e1000e some other cards.
2014-05-05 13:58:41 +02:00
Ersan Yildirim
b1f6b33992 Update Turkish translation. 2014-05-05 12:00:57 +02:00
Arne Fitzenreiter
921023a33c xen-downloader: update script.
-new legacy kernel package.
-add console variable.
-fix file permissions.
2014-05-04 11:07:05 +02:00
Arne Fitzenreiter
9de3c7f611 installer: make it silence 2nd try. 2014-05-04 11:06:20 +02:00
Arne Fitzenreiter
dc270128f0 installer: remove error outputs at devicesearch. 2014-05-03 15:17:06 +02:00
Arne Fitzenreiter
a254047d2d installer: change modulename iso9660 -> isofs; 2014-05-03 15:12:34 +02:00
Arne Fitzenreiter
59209622e3 backupiso: set version to 2.15. 2014-05-03 15:08:54 +02:00