]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/log
people/dweismueller/ipfire-2.x.git
8 years agoowncloud: updated to version 7.0.11 owncloud-7.0.11
Daniel Weismüller [Wed, 6 Jan 2016 13:56:18 +0000 (14:56 +0100)] 
owncloud: updated to version 7.0.11

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
8 years agoBUG10902: Add statusfile line when editing an ovpn n2n connection
Alexander Marx [Fri, 24 Jul 2015 08:36:12 +0000 (10:36 +0200)] 
BUG10902: Add statusfile line when editing an ovpn n2n connection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: Add changed network-functions.pl to updater
Michael Tremer [Mon, 9 Nov 2015 17:33:50 +0000 (17:33 +0000)] 
core95: Add changed network-functions.pl to updater

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoBUG10940: remove leading zeros in ip address
Alexander Marx [Mon, 9 Nov 2015 11:42:47 +0000 (12:42 +0100)] 
BUG10940: remove leading zeros in ip address

in firewallgroups (hosts) an error was created when using ip adresses
like 192.168.000.008. Now all leading zeros are deleted in
firewallgroups and in the firewall itself when using single ip addresses
as source or target.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: ship settime and timecheck scripts.
Arne Fitzenreiter [Sun, 8 Nov 2015 17:03:53 +0000 (18:03 +0100)] 
core95: ship settime and timecheck scripts.

on some installations this scripts are outdated.
Fixes: #10976
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: exclude ntp config files.
Arne Fitzenreiter [Sun, 8 Nov 2015 14:44:18 +0000 (15:44 +0100)] 
core95: exclude ntp config files.

Fixes: #10974
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: exclude dma config files.
Arne Fitzenreiter [Sun, 8 Nov 2015 14:42:53 +0000 (15:42 +0100)] 
core95: exclude dma config files.

Fixes: #10975
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: add ipset to updater.
Arne Fitzenreiter [Sun, 8 Nov 2015 09:04:13 +0000 (10:04 +0100)] 
core95: add ipset to updater.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoipset: fix build om arm.
Arne Fitzenreiter [Sat, 7 Nov 2015 08:11:27 +0000 (09:11 +0100)] 
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>
8 years agoMerge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Thu, 5 Nov 2015 20:39:39 +0000 (21:39 +0100)] 
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

8 years agocore95: Ship changed mail.cgi
Michael Tremer [Thu, 5 Nov 2015 15:35:46 +0000 (15:35 +0000)] 
core95: Ship changed mail.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoBUG10965: only write auth.conf if username/password are set
Alexander Marx [Sat, 31 Oct 2015 06:34:56 +0000 (07:34 +0100)] 
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>
8 years agoipset: New package
Erik Kapfer [Thu, 5 Nov 2015 05:29:01 +0000 (06:29 +0100)] 
ipset: New package

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoopenvpn: The --up option only takes one single argument
Michael Tremer [Thu, 5 Nov 2015 11:44:57 +0000 (11:44 +0000)] 
openvpn: The --up option only takes one single argument

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoopenvpn: Apply static routes on client site as well
Michael Tremer [Thu, 5 Nov 2015 11:44:04 +0000 (11:44 +0000)] 
openvpn: Apply static routes on client site as well

Fixes: #10968
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoopenvmtools: enable build on x86_64
Arne Fitzenreiter [Thu, 5 Nov 2015 10:40:06 +0000 (11:40 +0100)] 
openvmtools: enable build on x86_64

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: Ship updated packages
Michael Tremer [Wed, 4 Nov 2015 21:18:13 +0000 (21:18 +0000)] 
core95: Ship updated packages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agosnort: Update to 2.9.7.6
Matthias Fischer [Sun, 1 Nov 2015 14:30:01 +0000 (15:30 +0100)] 
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>
8 years agolzo: Update to version 2.09
Erik Kapfer [Tue, 7 Jul 2015 11:13:36 +0000 (13:13 +0200)] 
lzo: Update to version 2.09

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoopenvpn: Embed the certificate and key file into configuration
Michael Tremer [Fri, 30 Oct 2015 15:47:22 +0000 (15:47 +0000)] 
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>
8 years agoopenvpn: Add option to download a client package with PEM files
Michael Tremer [Fri, 30 Oct 2015 15:47:21 +0000 (15:47 +0000)] 
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>
8 years agoopenvpn: Apply static routes when N2N connection comes up
Michael Tremer [Fri, 30 Oct 2015 16:00:28 +0000 (16:00 +0000)] 
openvpn: Apply static routes when N2N connection comes up

Fixes: #10968
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agodma: Update to 0.10
Matthias Fischer [Tue, 3 Nov 2015 17:51:32 +0000 (18:51 +0100)] 
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: https://github.com/corecode/dma/commit/1a1306df018bd62cf1c5feb2e6e664f656bc9554#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>
8 years agocore95: add upadated backup exclude list.
Arne Fitzenreiter [Sun, 1 Nov 2015 20:49:22 +0000 (21:49 +0100)] 
core95: add upadated backup exclude list.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agofirewall: fix disable MASQERADE in green only mode.
Arne Fitzenreiter [Sun, 1 Nov 2015 10:20:56 +0000 (11:20 +0100)] 
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>
8 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Sat, 31 Oct 2015 21:44:51 +0000 (21:44 +0000)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

8 years agocredits.cgi: Update credits
Michael Tremer [Sat, 31 Oct 2015 21:40:47 +0000 (21:40 +0000)] 
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>
8 years agoFix unnecessary space character in "E-Mail Absender"
Lars Schuhmacher [Fri, 30 Oct 2015 22:59:08 +0000 (23:59 +0100)] 
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>
8 years agocore95: add kernel to updater.
Arne Fitzenreiter [Sat, 31 Oct 2015 16:29:14 +0000 (17:29 +0100)] 
core95: add kernel to updater.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: add ntp, backup and geoip changes to updater.
Arne Fitzenreiter [Sat, 31 Oct 2015 16:07:01 +0000 (17:07 +0100)] 
core95: add ntp, backup and geoip changes to updater.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agobackup: exclude lm_sensors config.
Arne Fitzenreiter [Sat, 31 Oct 2015 16:04:47 +0000 (17:04 +0100)] 
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>
8 years agogeo-ip: download initial database in background.
Arne Fitzenreiter [Sat, 31 Oct 2015 15:55:17 +0000 (16:55 +0100)] 
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>
8 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Thu, 29 Oct 2015 23:25:45 +0000 (23:25 +0000)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

8 years agoe1000e: update to 3.2.7.1
Arne Fitzenreiter [Wed, 28 Oct 2015 18:36:22 +0000 (19:36 +0100)] 
e1000e: update to 3.2.7.1

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agokernel: update to 3.14.56
Arne Fitzenreiter [Tue, 27 Oct 2015 16:31:51 +0000 (17:31 +0100)] 
kernel: update to 3.14.56

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoMerge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Tue, 27 Oct 2015 16:31:19 +0000 (17:31 +0100)] 
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

8 years agokernel: genksyms fix empty symbol crc.
Arne Fitzenreiter [Tue, 27 Oct 2015 15:57:24 +0000 (16:57 +0100)] 
kernel: genksyms fix empty symbol crc.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agosnort 2.9.7.6: removed unrecognized configure options in lfs file
Matthias Fischer [Mon, 26 Oct 2015 15:25:24 +0000 (16:25 +0100)] 
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>
8 years agontp: Update to 4.2.8p4
Matthias Fischer [Mon, 26 Oct 2015 11:24:51 +0000 (12:24 +0100)] 
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>
8 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Sun, 25 Oct 2015 08:21:12 +0000 (09:21 +0100)] 
Merge remote-tracking branch 'origin/master' into next

8 years agossh: preferre ecdsa cipher again.
Arne Fitzenreiter [Sat, 24 Oct 2015 10:07:29 +0000 (12:07 +0200)] 
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>
8 years agocore94: add system menu to update.
Arne Fitzenreiter [Fri, 23 Oct 2015 17:49:17 +0000 (19:49 +0200)] 
core94: add system menu to update.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agokernel: uppdate to 3.14.55
Arne Fitzenreiter [Fri, 23 Oct 2015 09:00:03 +0000 (11:00 +0200)] 
kernel: uppdate to 3.14.55

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)] 
Merge remote-tracking branch 'origin/master' into next

8 years agoMove email settings from services to system menu
Michael Tremer [Thu, 22 Oct 2015 20:21:34 +0000 (21:21 +0100)] 
Move email settings from services to system menu

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Thu, 22 Oct 2015 11:11:17 +0000 (13:11 +0200)] 
Merge remote-tracking branch 'origin/master' into next

8 years agoopenssh: disable dsa key usage.
Arne Fitzenreiter [Thu, 22 Oct 2015 11:08:27 +0000 (13:08 +0200)] 
openssh: disable dsa key usage.

fixes #10934

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoMerge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Wed, 21 Oct 2015 19:02:19 +0000 (21:02 +0200)] 
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

8 years agokernel: update to 3.14.54
Arne Fitzenreiter [Wed, 21 Oct 2015 16:48:32 +0000 (18:48 +0200)] 
kernel: update to 3.14.54

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agodhcp rfc2136: dhcpd does not seem to support SHA-1
Michael Tremer [Wed, 21 Oct 2015 16:34:41 +0000 (17:34 +0100)] 
dhcp rfc2136: dhcpd does not seem to support SHA-1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: Ship DHCP RFC2136 changes
Michael Tremer [Wed, 21 Oct 2015 12:52:22 +0000 (13:52 +0100)] 
core95: Ship DHCP RFC2136 changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next
Michael Tremer [Wed, 21 Oct 2015 12:50:07 +0000 (13:50 +0100)] 
Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next

8 years agocore95: Ship changed routing.cgi file
Michael Tremer [Sun, 18 Oct 2015 18:20:18 +0000 (19:20 +0100)] 
core95: Ship changed routing.cgi file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoBUG10941: fix single ip-addresses when no subnet given
Alexander Marx [Sat, 17 Oct 2015 17:27:03 +0000 (19:27 +0200)] 
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>
8 years agocore95: Ship changed firewall.cgi file
Michael Tremer [Sun, 18 Oct 2015 18:19:31 +0000 (19:19 +0100)] 
core95: Ship changed firewall.cgi file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoBUG10806: fix wrong customhostgroupcheck
Alexander Marx [Sat, 17 Oct 2015 16:32:10 +0000 (18:32 +0200)] 
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>
8 years agocore95: Ship changed firewalllogcountry.dat
Michael Tremer [Sun, 18 Oct 2015 17:54:25 +0000 (18:54 +0100)] 
core95: Ship changed firewalllogcountry.dat

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agofirewalllogcountry.dat: Do not show 'Details' button for unkonw location.
Stefan Schantl [Sun, 18 Oct 2015 11:23:32 +0000 (13:23 +0200)] 
firewalllogcountry.dat: Do not show 'Details' button for unkonw location.

The CGI offers the posibility to get more details for a certain locations
by clicking on a button.

This feature cannot be used for the category "unknown". To prevent users
from beeing confused about non show-able details, I added some code to hide
this button for this category.

Fixes #10726.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: Ship changed pppsetup.cgi
Michael Tremer [Sun, 18 Oct 2015 17:52:07 +0000 (18:52 +0100)] 
core95: Ship changed pppsetup.cgi

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agopppsetup.cgi: Fix site layout when no TYPE is specified
Stefan Schantl [Sun, 18 Oct 2015 12:25:50 +0000 (14:25 +0200)] 
pppsetup.cgi: Fix site layout when no TYPE is specified

There was an issue with false generated HTML code, in case
of an empty or unset $pppsettings{'TYPE'} variable which results
in a missplaced website footer.

This patch moves the code for closeing the table and the call of the
closebox() function to the correct place to prevent this display issue.

Fixes #10565.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agomonit addon: Upgrade to 5.14
Dirk Wagner [Sat, 17 Oct 2015 18:55:17 +0000 (20:55 +0200)] 
monit addon: Upgrade to 5.14

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoasterisk addon: Update to 11.20.0
Dirk Wagner [Sat, 17 Oct 2015 18:52:13 +0000 (20:52 +0200)] 
asterisk addon: Update to 11.20.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: Ship ddns update
Michael Tremer [Sat, 17 Oct 2015 00:27:07 +0000 (01:27 +0100)] 
core95: Ship ddns update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoddns: Update to 009
Stefan Schantl [Fri, 16 Oct 2015 23:27:04 +0000 (01:27 +0200)] 
ddns: Update to 009

This update contains the latest upstream changes which are
a better SSL error handling and support for desec.io.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore95: Ship IPsec blocking changes
Michael Tremer [Thu, 15 Oct 2015 21:46:33 +0000 (22:46 +0100)] 
core95: Ship IPsec blocking changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoipsec: Add block rules to avoid conntrack entries
Michael Tremer [Sat, 3 Oct 2015 21:31:53 +0000 (22:31 +0100)] 
ipsec: Add block rules to avoid conntrack entries

If an IPsec VPN connections is not established, there are
rare cases when packets are supposed to be sent through
that said tunnel and incorrectly handled.

Those packets are sent to the default gateway an entry
for this connection is created in the connection tracking
table (usually only happens to UDP). All following packets
are sent the same route even after the tunnel has been
brought up. That leads to SIP phones not being able to
register among other things.

This patch adds firewall rules that these packets are
rejected. That will sent a notification to the client
that the tunnel is not up and avoid the connection to
be added to the connection tracking table.

Apart from a small performance penalty there should
be no other side-effects.

Fixes: #10908
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Cc: tomvend@rymes.com
Cc: daniel.weismueller@ipfire.org
Cc: morlix@morlix.de
Reviewed-by: Timo Eissler <timo.eissler@ipfire.org>
8 years agoIPSec VPN: Add "required" marker for "organization name"
Larsen [Sat, 10 Oct 2015 21:24:16 +0000 (23:24 +0200)] 
IPSec VPN: Add "required" marker for "organization name"

IPSec VPN: Add "required" marker for "organization name"

Fixes https://bugzilla.ipfire.org/show_bug.cgi?id=10846

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoTranslation improvements
Larsen [Sat, 10 Oct 2015 21:07:19 +0000 (23:07 +0200)] 
Translation improvements

Translation improvements

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agotor.cgi: Fix missing country flag icons.
Stefan Schantl [Sat, 10 Oct 2015 16:07:38 +0000 (18:07 +0200)] 
tor.cgi: Fix missing country flag icons.

The CGI now is using the GeoIP::get_flag_icon function provided by the
geoip-functions.pl, which takes care of the changed flag icons shipped
by core update 90.

Fixes #10919.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Tested-by: Jan Paul Tuecking <jan.paul.tuecking@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore94: Adjust update.sh script if run multiple times
Michael Tremer [Thu, 15 Oct 2015 11:02:38 +0000 (12:02 +0100)] 
core94: Adjust update.sh script if run multiple times

Some changes cannot be executed again after the update
was already installed.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoCore94: fix for dma when postfix is installed
Alexander Marx [Thu, 15 Oct 2015 10:18:28 +0000 (12:18 +0200)] 
Core94: fix for dma when postfix is installed

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoCore94: fix update.sh for dma
Alexander Marx [Thu, 15 Oct 2015 10:18:27 +0000 (12:18 +0200)] 
Core94: fix update.sh for dma

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Thu, 15 Oct 2015 10:59:44 +0000 (11:59 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

8 years agosox: Disable parallel build
Arne Fitzenreiter [Sun, 4 Oct 2015 14:01:33 +0000 (16:01 +0200)] 
sox: Disable parallel build

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoprocps: Ship pgrep
Michael Tremer [Sat, 3 Oct 2015 18:53:57 +0000 (19:53 +0100)] 
procps: Ship pgrep

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agostrongswan: Update to 5.3.3
Michael Tremer [Sat, 3 Oct 2015 18:15:36 +0000 (19:15 +0100)] 
strongswan: Update to 5.3.3

ChaCha is disabled since our kernel does not support it yet

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agokrb5: Disable parallel build
Michael Tremer [Fri, 2 Oct 2015 18:00:13 +0000 (19:00 +0100)] 
krb5: Disable parallel build

Builds of this package crash randomly on all architectures
which might be related to the parallel build.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agobackports: add Tevii S482 patch
Arne Fitzenreiter [Thu, 1 Oct 2015 09:14:58 +0000 (11:14 +0200)] 
backports: add Tevii S482 patch

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoRootfile update
Michael Tremer [Mon, 28 Sep 2015 19:14:42 +0000 (20:14 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Mon, 28 Sep 2015 16:42:57 +0000 (18:42 +0200)] 
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

8 years agoMerge remote-tracking branch 'origin/master' into next
Arne Fitzenreiter [Mon, 28 Sep 2015 16:40:32 +0000 (18:40 +0200)] 
Merge remote-tracking branch 'origin/master' into next

8 years agoigb: update to 5.3.3.2
Arne Fitzenreiter [Mon, 28 Sep 2015 16:39:26 +0000 (18:39 +0200)] 
igb: update to 5.3.3.2

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agoe1000e: update to 3.2.4.2
Arne Fitzenreiter [Mon, 28 Sep 2015 16:38:55 +0000 (18:38 +0200)] 
e1000e: update to 3.2.4.2

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore94: restart init after glibc update.
Arne Fitzenreiter [Mon, 28 Sep 2015 14:57:21 +0000 (16:57 +0200)] 
core94: restart init after glibc update.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore95: Ship changed files
Michael Tremer [Mon, 28 Sep 2015 13:35:54 +0000 (14:35 +0100)] 
core95: Ship changed files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge remote-tracking branch 'ms/experimental-vlan-hotplugging' into next
Michael Tremer [Mon, 28 Sep 2015 13:33:49 +0000 (14:33 +0100)] 
Merge remote-tracking branch 'ms/experimental-vlan-hotplugging' into next

8 years agocore95: Ship changed files
Michael Tremer [Mon, 28 Sep 2015 13:25:53 +0000 (14:25 +0100)] 
core95: Ship changed files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoconnections.cgi: Support multiple subnets for IPsec
Michael Tremer [Mon, 28 Sep 2015 13:24:44 +0000 (14:24 +0100)] 
connections.cgi: Support multiple subnets for IPsec

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge remote-tracking branch 'ms/ipsec-subnets' into next
Michael Tremer [Mon, 28 Sep 2015 13:21:18 +0000 (14:21 +0100)] 
Merge remote-tracking branch 'ms/ipsec-subnets' into next

8 years agoStart Core Update 95
Michael Tremer [Mon, 28 Sep 2015 13:08:17 +0000 (14:08 +0100)] 
Start Core Update 95

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoMerge branch 'master' into next
Michael Tremer [Mon, 28 Sep 2015 13:05:26 +0000 (14:05 +0100)] 
Merge branch 'master' into next

8 years agovpnmain.cgi - Replace spaces with tab characters and fix indentation
Lars Schuhmacher [Fri, 25 Sep 2015 21:01:17 +0000 (23:01 +0200)] 
vpnmain.cgi - Replace spaces with tab characters and fix indentation

Replaced spaces with tab characters. Fixed indentation.

This is based on http://patchwork.ipfire.org/patch/88/ so that patch must be applied before.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agoIPsec: Remove GUI option for "Roadwarrior virtual IP"
Lars Schuhmacher [Thu, 24 Sep 2015 22:04:08 +0000 (00:04 +0200)] 
IPsec: Remove GUI option for "Roadwarrior virtual IP"

This setting stems from IPCop (and probably Openswan) and causes a problem.

Fixes bug #10496.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agocore94: Fix dead symlinks in filelist
Michael Tremer [Mon, 28 Sep 2015 10:59:20 +0000 (11:59 +0100)] 
core94: Fix dead symlinks in filelist

The rootfiles have been renamed, but not the symlinks
were not.

Fixes #10931

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
8 years agokernel: update to 3.14.53
Arne Fitzenreiter [Sun, 27 Sep 2015 10:58:22 +0000 (12:58 +0200)] 
kernel: update to 3.14.53

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agobackports: enable build on x86_64.
Arne Fitzenreiter [Sun, 27 Sep 2015 09:23:11 +0000 (11:23 +0200)] 
backports: enable build on x86_64.

backports 4.1.1-1 is not stable so we need to stay on the older version.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore94: fix chrontab modification check for dma.
Arne Fitzenreiter [Sun, 27 Sep 2015 08:56:34 +0000 (10:56 +0200)] 
core94: fix chrontab modification check for dma.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore94: allow rootlogin only if the user has not blocked it before.
Arne Fitzenreiter [Sun, 27 Sep 2015 08:42:38 +0000 (10:42 +0200)] 
core94: allow rootlogin only if the user has not blocked it before.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agocore94: fix sed syntax.
Arne Fitzenreiter [Sun, 27 Sep 2015 08:42:01 +0000 (10:42 +0200)] 
core94: fix sed syntax.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
8 years agofinish core94.
Arne Fitzenreiter [Thu, 24 Sep 2015 17:16:56 +0000 (19:16 +0200)] 
finish core94.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>