Commit Graph

11841 Commits

Author SHA1 Message Date
Arne Fitzenreiter
04d63eb482 gitignore: add img.xz to ignore list 2018-05-23 19:33:12 +02:00
Michael Tremer
6b4174133a make.sh: There are no tar.gz images to copy out of the chroot environment
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:09:07 +01:00
Michael Tremer
92244a40d8 make.sh: Generate checksum files for XZ compressed images
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:08:23 +01:00
Michael Tremer
212f17c114 make.sh: Refactor XZ compression parameters again
I completely ruined this now and therefore I had to make
it new again:

* I split the parameters into smaller chunks now and added
  comments about why we have chosen those.

* I move it all to configure_build() since we do not need
  to check if the host architecture is 64 bit capable, but
  the architecture we are building for.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-23 12:03:06 +01:00
Michael Tremer
30a42c6df9 make.sh: Remove check for minimum host memory
This won't build on the ARM builders any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 21:31:24 +01:00
Michael Tremer
f03e254f39 make.sh: Let XZ determine how many cores it wants to use
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:46:25 +01:00
Michael Tremer
a92fb74d1a make.sh: Limit XZ memory to 2GB on 32 bit systems
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:46:03 +01:00
Michael Tremer
f7585bc7ec joe: Bump package because of ncurses update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:40:29 +01:00
Michael Tremer
0bd7b73132 hostapd: Fix detection of wireless devices with kernel 4.14
Fixes #11738

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:38:47 +01:00
Michael Tremer
9b656e7f40 entropy: Don't show message for HWRNGs any more
We cannot reliably detect this with the new kernel
and therefore cannot show this.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:31:12 +01:00
Michael Tremer
ab91dde24b rngd: Always start the daemon
We cannot reliably detect in this script any more if the
system has an actual HWRNG (/dev/hwrng always exists).

Therefore we always start the daemon now and let it
deal with what ever comes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:25:03 +01:00
Michael Tremer
90940aded5 rngd: Update to version 6.2
Fixes #11737

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:23:42 +01:00
Michael Tremer
c577571e2a installer: Drop /var partition
Fixes #11735

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-22 20:07:59 +01:00
Michael Tremer
c8453e8759 make.sh: Use all processor cores for compression
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
5852ad2db7 make.sh: Use exiterror to end script safely
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
2eba1dc954 make.sh: Remove some empty lines
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
0054a52bd8 tar seems to ignore the XZ_OPT variable sometimes
This caused that the xz command was called without any
extra arguments. This will now create the tar archive
first and then pass the archive through xz with our
command line switches.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
b302b9a695 Compress flash-images as XZ as well
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Matthias Fischer
27267889aa xz: Performance and compression tuning (V2) - fine tuning
Changes since V1:

- Tuned some more 'tar'-command lines
- Included 'lfs/core-updates'
- Some fine-tuning

Hi,

Current results with V2 (clean builds):

'next':
'packages' => 255 MB
'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 319 MB
'ipfire-2.19.i586-full-core121.iso' => 218 MB
Total => 792 MB

'xz-tuning':
'packages' => 228 MB
'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz' => 318 MB
'ipfire-2.19.i586-full-core121.iso' => 207 MB

Total => 753 MB (-39 MB)

It would be nice if someone could review and test these. ;-)

If necessary, I can upload a complete patch.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Matthias Fischer
0d7a6f03d4 xz: Performance and compression tuning (V1)
Hi,

as mentioned in the "list", we're trying to make the archives as small as possible
using 'xz'-compression.

In order to achieve this, this patch tests the size of the memory available on the
host system.

It sets the xz-memory-limit (--memory=[N]Mib) to 70% of the available working memory,
a maximum of four xz-'worker threads' (-T4) and a compression rate of '-8' (-8).

These options are written to the 'XZ_OPT=' environment.

For details see:
https://linux.die.net/man/1/xz

I have set the number of available xz-'worker threads' (-T) to four (-T4), because during
the final tests the '-T0' parameter led to error messages snd stopped: 'cannot allocate memory'.
It wouldn't even run with 90%.

Furthermore, testing with '-T0' led to countless messages filling  up '_build.packages.log'.

E.g.:
...
xz: Adjusted the number of threads from 8 to 2 to not exceed the memory usage
limit of 1557 MiB
...

Tests took place on a 32bit-Ubuntu 16.04.4-system with 8 GB RAM and an Intel I7-2600.
Build time was about 04:30 hrs. Perhaps a 64bit-system would perform better (higher
values), but my goal was to make this run on as many systems as possible, so I choosed
these averages.

If minimum requirements (1024 MB RAM) are not met, building stops.

Current results:

'next', untuned:
ipfire-2.19.2gb-ext4.i586-full-core121.img.gz	=> 332951687 Bytes
ipfire-2.19.i586-full-core121.iso		=> 228589568 Bytes

'next', XZ_OPT: -T4 -8, 70% RAM:
ipfire-2.19.2gb-ext4.i586-full-core121.img.gz	=> 329725723 Bytes
ipfire-2.19.i586-full-core121.iso		=> 217055232 Bytes

These two resulting archives are 14760300 Bytes smaller than before.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Matthias Fischer
814a7d126b nano: Update to 2.9.7
For details see:
https://www.nano-editor.org/news.php

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Matthias Fischer
e50f08ae3b cmake: Update to 3.11.2
For details see:
https://cmake.org/cmake/help/v3.11/release/3.11.html#id2

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Matthias Fischer
eb1ff23333 nmap: Update to 7.70
For details see:
https://nmap.org/changelog.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Michael Tremer
bea1884bd7 installer: Increase size of /boot to 128M
Fixes #11736

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-21 20:59:06 +01:00
Arne Fitzenreiter
b7a4672497 kernel: update to 4.14.41
Signen-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-17 07:45:06 +02:00
Arne Fitzenreiter
4dd7df2f82 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2018-05-16 14:09:42 +02:00
Arne Fitzenreiter
959b404ee0 u-boot: add Raspberry Pi 3 Model B+
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-16 10:43:58 +02:00
Arne Fitzenreiter
4a27765601 swconfig: update switch config script for Lamobo R1
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-16 10:40:36 +02:00
Arne Fitzenreiter
83a618fdcc kernel: arm-multi: enable AXP20x power regulator
this is needed for bananapi usb support

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-13 08:12:13 +00:00
Arne Fitzenreiter
61bb655fad Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2018-05-13 08:03:52 +00:00
Arne Fitzenreiter
39a73adadf kernel: kirkwood: fix iConnect leds and modell name
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-13 07:59:01 +00:00
Matthias Fischer
732de65751 Add NRPE initscript to rootfile
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-12 21:04:42 +01:00
Arne Fitzenreiter
8080197b12 kernel: update to 4.14.40
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2018-05-10 21:35:40 +02:00
Peter Müller
a305ffea8b install initscript for NRPE
Install initscript for NRPE addon.

The second version of this patch actually includes the
initscript, which was missing due to lack of coffee the
first time. :-)

Thanks to Michael for catching it.

Resent due to crappy linewrapping in initscript by MUA.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-10 16:41:07 +01:00
Peter Müller
d8ef6a9537 display country data for remote IPs on ovpnmain.cgi
This makes debugging easier, especially when it comes to
GeoIP related firewall rules and database related issues
such as #11482.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:51:20 +01:00
Peter Müller
ea566f8485 fix aesthetic issues in remote.cgi and ship them
Fix some minor cosmetic issues on remote.cgi as well as a typo in
the language files ("sesstions" -> "sessions"). The changes are
listed in "filelists" for Core Update 121.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:49:48 +01:00
Alexander Marx
6d92ee11de BUG11559: fwhosts
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds the changes to the firewall groups.
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:46 +01:00
Alexander Marx
8b20ca2de4 BUG11559: firewall-lib
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch has neccessary changes for the firewall-lib. While the network name of the IpSec changes
on save (subnet is added to name) we need to split the name or normalise the field before using it.
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:42 +01:00
Alexander Marx
93a017cbcf BUG11559: firewall.cgi
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch has the changes for firewall.cgi
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:41 +01:00
Alexander Marx
c07eea1d38 BUG11559: Languagefiles
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:36 +01:00
Peter Müller
e70aa2e0b8 update language files
Add new language strings to the language files.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:37:11 +01:00
Peter Müller
9159bd4bbe display active logins at remote.cgi
Display active user logins (both local and remote) at
the remote.cgi page in the WebUI. This might be useful
for debugging broken SSH sessions or simply checking that
nobody is currently logged in. :-)

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:37:10 +01:00
Matthias Fischer
c2e008880c wget: Update to 1.19.5
Hi,

Excerpts from official announcement:

"This version fixes CVE-2018-0494 (Cookie injection vulnerability) found
by Harry Sintonen.
This version fixes several issues, mostly found by OSS-Fuzz.
It also introduces TLS1.3 with OpenSSL, a new option --ciphers and
updates the CSS grammar to version 2.2.
...
Noteworthy changes:

* Fix cookie injection (CVE-2018-0494)
* Enable TLS1.3 with recent OpenSSL environment
* New option --ciphers to set GnuTLS / OpenSSL ciphers directly
* Updated CSS grammar to CSS 2.2
* Fixed several memleaks found by OSS-Fuzz
* Fixed several buffer overflows found by OSS-Fuzz
* Fixed several integer overflows found by OSS-Fuzz
* Several minor bug fixes"

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:34:24 +01:00
Matthias Fischer
6f18c08a3d cmake: Update to 3.11.1
For details see:
https://cmake.org/cmake/help/v3.11/release/3.11.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:34:01 +01:00
Matthias Fischer
ba5dccd008 unbound: Update to 1.7.1
For details see:
http://www.unbound.net/download.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:33:53 +01:00
Matthias Fischer
1698eb73c7 openssh: Update to 7.7p1
For details see:
http://www.openssh.com/txt/release-7.7

This release fixes:
https://bugzilla.ipfire.org/show_bug.cgi?id=11693
https://bugzilla.ipfire.org/show_bug.cgi?id=11694

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:33:41 +01:00
Matthias Fischer
a389a05cd9 htop: Update to 2.2.0
For details see:
https://hisham.hm/htop/index.php?page=downloads

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:33:26 +01:00
Matthias Fischer
39eb05b200 nano: Update to 2.9.6
For details see:
https://www.nano-editor.org/news.php

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:33:17 +01:00
Matthias Fischer
7f9b851d36 nagios_nrpe: Update for rootfile
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:32:40 +01:00
Michael Tremer
339ee7e9f6 core121: Ship updated libidn
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-05 20:44:52 +01:00