Stefan Schantl
8e41b85287
tor: Increase PAK_VER for shipping modified CGI file.
2015-04-22 18:28:58 +02:00
Stefan Schantl
851a984121
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-22 18:25:25 +02:00
Stefan Schantl
b013822b99
Rename Locale::Country to Locale::Codes::Country in various scripts.
...
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
2015-04-22 18:18:38 +02:00
Michael Tremer
07e1b6c0af
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-22 16:08:42 +02:00
Alexander Marx
0a11f8761a
BUG10812: change ovpnserver config if needed
2015-04-22 15:14:06 +02:00
Michael Tremer
a4d24f9052
vpnmain.cgi: Order ciphers by strength
...
strongSwan uses them in the defined order. Hence it makes
much more sense to present them to the user as well in that
order.
2015-04-22 14:45:10 +02:00
Michael Tremer
78039c1585
vpnmain.cgi: Use integrity functions as PRF for AEAD
2015-04-22 14:44:16 +02:00
Michael Tremer
e8b3bb0edc
vpnmain.cgi: Rewrite algorithm generation code
2015-04-22 14:08:41 +02:00
Alexander Marx
92a6d92e82
squid-accounting: fix mistakenly deleted lines from last commit
2015-04-22 13:34:51 +02:00
Michael Tremer
334620ee2b
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-22 13:07:30 +02:00
Michael Tremer
db1078ff11
index.cgi: Hide blue and green if not enabled
...
Those were shown when a blue or orange interface
was assigned which is not the same as enabled.
2015-04-22 13:06:52 +02:00
Alexander Marx
0fa8d28e8f
Squid-accounting: new Version 1.0.3 (graph updates, movedb update)
...
New Version. Now the data is correctly moved to hist table when month
has changed.
Also the graphs for old month starts by zero. In old version graphdata
was started by total amount of bytes.
2015-04-21 20:47:31 +02:00
Michael Tremer
a47376207f
ipsec: Always enable support for IKE fragmentation
2015-04-21 19:36:40 +02:00
Stefan Schantl
a54ec49e18
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-21 19:20:26 +02:00
Stefan Schantl
c4e106d181
Revert "Revert "perl-Locale-Country: Update country codes to version 3.33.""
...
This reverts commit cbc5a4374f
2015-04-21 19:16:26 +02:00
Stefan Schantl
b3c1c8342c
Revert "Revert roofile update for Locale-Country."
...
This reverts commit 91d6b6ef07
2015-04-21 19:16:03 +02:00
Arne Fitzenreiter
2b4830c5ab
kernel: update to 3.14.39
2015-04-21 14:02:47 +02:00
Arne Fitzenreiter
0505af9dc0
rules.pl: fix geoip initialisation.
2015-04-20 23:14:11 +02:00
Arne Fitzenreiter
785c919520
remove ipp2p patches.
...
ipp2p is build by xtables addons now.
2015-04-20 22:57:24 +02:00
Arne Fitzenreiter
2e28ecea3e
functions.network: update dhcp client commandline.
...
this fix trailing space before hostname.
2015-04-20 22:48:46 +02:00
Stefan Schantl
0c89de6716
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2015-04-20 19:03:52 +02:00
Stefan Schantl
fde9c9dd03
ovpnmain.cgi: Update the certificate revocation list when a connection has been deleted.
...
Reference #10554 .
2015-04-19 12:51:44 +02:00
Michael Tremer
1245aa72df
openssl: Fix build by updating the patches
2015-04-19 11:59:19 +02:00
Matthias Fischer
2805275ecc
openssl: Update to 1.0.2a
2015-04-19 11:29:02 +02:00
Stefan Schantl
dc127e0faa
Core 90: Add changed css files.
2015-04-19 01:23:18 +02:00
Stefan Schantl
c98b743c09
firewall.cgi: Dynamically show/hide DNAT and SNAT configure elements.
...
Fixes #10732 .
2015-04-19 01:19:11 +02:00
Stefan Schantl
f51bc66149
Core 90: Add changed ovpnmain.cgi.
2015-04-19 01:15:02 +02:00
Michael Tremer
fb245d5ec1
core90: Add changed vpnmain.cgi
2015-04-18 23:36:20 +02:00
Wolfgang Apolinarski
ab2d15486b
Added clientAuth to EKU of client certificate. Fixed the comment.
2015-04-18 23:32:14 +02:00
Michael Tremer
f14de8277a
xtables-addon: Build all matches and targets
2015-04-18 16:42:22 +02:00
Michael Tremer
0389942c2b
Update translations
2015-04-18 16:16:01 +02:00
Michael Tremer
49b70d62a9
Merge remote-tracking branch 'stevee/core-90-geoip' into next
2015-04-18 16:15:17 +02:00
Michael Tremer
d54a2ce452
dnsmasq: Import more patches from upstream
2015-04-18 16:11:29 +02:00
Stefan Schantl
db5b5de9a9
Core90: Update crontab.
2015-04-16 22:00:51 +02:00
Arne Fitzenreiter
4d9e31ab78
kernel: update to 3.14.38
2015-04-16 20:52:44 +02:00
Stefan Schantl
46d3a4cb16
Core90: Add GeoIP to update.
2015-04-16 20:37:00 +02:00
Stefan Schantl
b8fe6ca756
Roofile updates for GeoIP related files.
2015-04-16 19:40:53 +02:00
Stefan Schantl
30654fd82b
configroot: Add geoip related files.
...
Create required empty files and install geoip-functions.pl to
desired destination.
2015-04-16 19:39:11 +02:00
Stefan Schantl
cbc5a4374f
Revert "perl-Locale-Country: Update country codes to version 3.33."
...
This reverts commit bf235e962c
2015-04-16 10:51:44 +02:00
Stefan Schantl
91d6b6ef07
Revert roofile update for Locale-Country.
...
This reverts commit f2d941436b
2015-04-16 10:51:03 +02:00
Stefan Schantl
e6c4f090b6
Merge branch 'next-geoip' into core-90-geoip
2015-04-15 17:10:49 +02:00
Arne Fitzenreiter
30986dbf03
Merge remote-tracking branch 'origin/master' into next
2015-04-14 20:26:21 +02:00
Michael Tremer
c023275154
Update translations
2015-04-14 20:06:19 +02:00
Michael Tremer
6e8f58bf70
vpn-stats: Use more descriptive menu entry names
2015-04-14 20:05:32 +02:00
Arne Fitzenreiter
65f2c9bb39
Merge remote-tracking branch 'origin/master' into next
2015-04-14 17:59:21 +02:00
Arne Fitzenreiter
0778b991c9
start core90.
2015-04-14 17:07:27 +02:00
Alexander Marx
2f075ff8cf
vpn-statistic: add URI::escape for openvpn names with special chars
2015-04-14 14:00:47 +02:00
Alexander Marx
7dfcaef067
vpn-statistic: add collectd parameters to imported n2n packages
2015-04-14 13:55:40 +02:00
Arne Fitzenreiter
758d959652
Merge remote-tracking branch 'origin/master' into next
2015-04-13 17:11:41 +02:00
Alexander Marx
daf34294f2
vpn-statistic: update old n2n configs in update.sh
2015-04-13 15:46:45 +02:00
