Commit Graph

9514 Commits

Author SHA1 Message Date
Michael Tremer
c6fba315ec connections.cgi: Support multiple subnets for IPsec
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-28 14:24:44 +01:00
Michael Tremer
b1881251d6 Merge remote-tracking branch 'ms/ipsec-subnets' into next 2015-09-28 14:21:18 +01:00
Michael Tremer
4b046d735d Start Core Update 95
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-28 14:08:27 +01:00
Michael Tremer
d86694ad1f Merge branch 'master' into next 2015-09-28 14:05:26 +01:00
Lars Schuhmacher
624615ee07 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>
2015-09-28 14:05:06 +01:00
Lars Schuhmacher
ed1d0fbdbe 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>
2015-09-28 14:04:40 +01:00
Michael Tremer
9dd14089ce 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>
2015-09-28 11:59:20 +01:00
Arne Fitzenreiter
c9f0174979 kernel: update to 3.14.53
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-27 12:58:22 +02:00
Arne Fitzenreiter
1f2bda9ba3 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>
2015-09-27 11:27:40 +02:00
Arne Fitzenreiter
8f1fe7c531 core94: fix chrontab modification check for dma.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-27 10:56:34 +02:00
Arne Fitzenreiter
ccb8e47d0e core94: allow rootlogin only if the user has not blocked it before.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-27 10:42:38 +02:00
Arne Fitzenreiter
d82c564b23 core94: fix sed syntax.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-27 10:42:01 +02:00
Arne Fitzenreiter
02626065a8 finish core94.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-24 19:16:56 +02:00
Michael Tremer
7c8e022c4b firewall: Support multiple subnets per IPsec tunnel
Fixes #10929

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-22 00:26:37 +01:00
Michael Tremer
ed5fee308f core94: Ship changed CGI files
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-21 16:46:21 +01:00
Lars Schuhmacher
e3edceeb7a Mark required input fields with a star
Mark required input fields with a star as nowadays this is
the de-facto default. Before, it was the other way around and
optional fields were marked.

Signed-off-by: Lars Schumacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-21 16:40:41 +01:00
Michael Tremer
b1fb211827 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-09-21 16:12:25 +01:00
Arne Fitzenreiter
1f4fea71a6 make-functions: check working binfmt_misc and add x86_64 helper.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-20 17:06:59 +02:00
Michael Tremer
34ca230867 core94: Ship changed setup package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-20 13:31:58 +01:00
Osmar Gonzalez
0a39488e4a Corrected typo in networking.c
Corrected "Misssing" to "Missing".

Signed-off-by: Osmar Gonzalez <mibs510@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-20 13:31:15 +01:00
Arne Fitzenreiter
01d61d1549 network_functions.pl: fix ip_address_in_network for x86_64
calculation of last address must use only 32bit of inverted netmask.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-20 13:03:34 +02:00
Arne Fitzenreiter
4d4f36ef55 kernel: Update pcengines apu led patch for x86_64
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-20 12:46:12 +02:00
Michael Tremer
83490805a4 core94: Ship updated initscripts
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-19 18:51:38 +01:00
Matthias Fischer
7f263dc736 Fixed some typos in initscript
"Createing= => "Creating"...

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-19 18:50:54 +01:00
Michael Tremer
048c2ff77d core94: Ship updated iproute2 package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-19 18:50:14 +01:00
Matthias Fischer
9b3ffc7457 iproute2: Update to 4.2.0
List of changes can be seen at
http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/log/

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-19 18:49:24 +01:00
Arne Fitzenreiter
6d7aff4a53 qemu: some features need disabled PaX RANDMMAP. 2015-09-18 19:23:56 +02:00
Arne Fitzenreiter
25a9df261e perl-Email-Date-Format: fix rootfile name.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-18 01:21:20 +02:00
Arne Fitzenreiter
b88a7166bc perl-MIME-Lite: fix rootfile name.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-18 01:20:01 +02:00
Arne Fitzenreiter
d2d9172b75 qemu: disable PaX mProtect on more binaries. 2015-09-17 19:17:44 +02:00
Arne Fitzenreiter
e07760a24b binutils: rootfile update.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-17 13:13:19 +02:00
Arne Fitzenreiter
7f16eac4a4 qemu: update to 2.4.0
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-17 12:57:31 +02:00
Arne Fitzenreiter
9890333ecb linux: rootfile update.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-17 12:56:48 +02:00
Arne Fitzenreiter
40baf26143 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-09-16 20:28:53 +02:00
Arne Fitzenreiter
c97dda34de qemu: enabled x86_64 for build and as target.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-16 20:27:52 +02:00
Arne Fitzenreiter
744a04ea79 make.sh: remove only temporary needed iso on arm build.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-16 11:18:21 +02:00
Arne Fitzenreiter
0d77b70188 memtest: use precompiled memtest binary on x86_64
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-15 20:58:24 +02:00
Arne Fitzenreiter
bfc3e1f340 Revert "cdrom: Disable memtest on x86_64"
This reverts commit 5d1c3aca0a.
2015-09-15 20:46:37 +02:00
Michael Tremer
1ca232eb4c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-09-14 23:32:51 +01:00
Matthias Fischer
f62ac3224c dnsmasq: latest upstream patches
dnsmasq: latest upstream patches

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 23:30:32 +01:00
Michael Tremer
c97b3aa372 core94: Add changed snort initscript
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 23:21:48 +01:00
Douglas Duckworth
6ee104aeb7 snort: Remove trailing slash in pid path
Fixes: https://bugzilla.ipfire.org/show_bug.cgi?id=10924

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 23:19:50 +01:00
Arne Fitzenreiter
253983268e backports: disabled on x86_64.
There is a duplicate kernel modul symbol in compat layer so backports modules will not load.
I will debug this at next kernel update.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-14 22:33:29 +02:00
Arne Fitzenreiter
7f69895cb5 make.sh: generate correct SYSTEM_RELEASE string if --target= was used.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-14 19:50:58 +02:00
Arne Fitzenreiter
d9c6f56c2e pakfire: use correct tree on x86_64.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-14 19:50:13 +02:00
Michael Tremer
1e4dbfbdf9 dma: Remove package variables since dma is not a package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 13:49:40 +01:00
Alexander Marx
37b2466d2b DMA: add empty mail.conf needed by WIO
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 13:49:29 +01:00
Alexander Marx
6a3d7dff1f DMA: added new file mail.conf to rootfile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 13:49:23 +01:00
Michael Tremer
c0d5649e99 make.sh: Fix typo in variable name COMPILERCACHE -> COMPILERCHECK
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 13:48:45 +01:00
Michael Tremer
5934eb5832 make.sh: Bump toolchain version
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-14 13:37:31 +01:00