IPFire-SCM May 2018

ipfire-scm@lists.ipfire.org

1 participants
32 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65a736981bf12eb235f0286de6c942d6660b5875
by git＠ipfire.org 25 May '18

25 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 65a736981bf12eb235f0286de6c942d6660b5875 (commit) from b46f951e8a9026bb499334cb99f08beaa948e2b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 65a736981bf12eb235f0286de6c942d6660b5875 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 25 18:36:37 2018 +0100 Don't compress packages three times. Once is enough. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/Config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/Config b/lfs/Config index 5cd32da06..cf70f81f9 100644 --- a/lfs/Config +++ b/lfs/Config @@ -211,11 +211,11 @@ define PAK tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ -p --numeric-owner rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner -J * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz + cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz rm -r /install/packages/package/tmp -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES - cd /install/packages/package && tar cf - --files-from=/usr/src/src/paks/files | xz $(XZ_OPT) > ../$(PROG)-$(VER)-$(PAK_VER).ipfire + cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files rm -rf /install/packages/package sed -e s/NAME/$(PROG)/g \ -e s/VER/$(VER)/g \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b46f951e8a9026bb499334cb99f08beaa948e2b1
by git＠ipfire.org 25 May '18

25 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via b46f951e8a9026bb499334cb99f08beaa948e2b1 (commit) from 6c9651f6208db27d0daad7a822c9a511e509fc9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b46f951e8a9026bb499334cb99f08beaa948e2b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 25 13:17:20 2018 +0000 make.sh: Compress toolchain in the same way we compress everything else Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 1050eb03b..bfcfbc3e4 100755 --- a/make.sh +++ b/make.sh @@ -1785,8 +1785,8 @@ toolchain) buildtoolchain echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \ - build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE + cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \ + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5 stdumount hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6c9651f6208db27d0daad7a822c9a511e509fc9c
by git＠ipfire.org 24 May '18

24 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6c9651f6208db27d0daad7a822c9a511e509fc9c (commit) from 04d63eb482dcff767aaefe6d9cffc50d9ab05b87 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c9651f6208db27d0daad7a822c9a511e509fc9c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 24 07:39:36 2018 +0200 kernel: update to 4.14.43 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 7c4052b3c..93dd593bf 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.38 Kernel Configuration +# Linux/arm 4.14.43 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 7a1018c4c..002302c70 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.40 Kernel Configuration +# Linux/arm 4.14.43 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 1e8a6ab57..f5eeff526 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.38 Kernel Configuration +# Linux/x86 4.14.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index b1d62e309..ffe1beb06 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.38 Kernel Configuration +# Linux/x86 4.14.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 19afaf3cf..579a0284c 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.38 Kernel Configuration +# Linux/x86 4.14.43 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/lfs/linux b/lfs/linux index 3ae2a8764..a65be9190 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.41 -ARM_PATCHES = 4.14.41-ipfire0 +VER = 4.14.43 +ARM_PATCHES = 4.14.43-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -75,7 +75,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = ce212dfed5c5e8a92808f675ef433382 +$(DL_FILE)_MD5 = e2ee85c1c56cc048b072ccd469862233 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 12f346d38b519c71d9e9837529d53494 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 04d63eb482dcff767aaefe6d9cffc50d9ab05b87
by git＠ipfire.org 23 May '18

23 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 04d63eb482dcff767aaefe6d9cffc50d9ab05b87 (commit) from 6b4174133a4cad58db3570d1cd1a16b243d4da84 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 04d63eb482dcff767aaefe6d9cffc50d9ab05b87 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 23 19:33:12 2018 +0200 gitignore: add img.xz to ignore list ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/.gitignore b/.gitignore index 0215a60e6..7babe0405 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /tmp /*.diff *.img.gz +*.img.xz *.iso *.tar.bz2 /*.md5 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6b4174133a4cad58db3570d1cd1a16b243d4da84
by git＠ipfire.org 23 May '18

23 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6b4174133a4cad58db3570d1cd1a16b243d4da84 (commit) via 92244a40d898f7a885aeeb875786d23cf94175d6 (commit) from 212f17c1145bb6978b4797eb9c805f603ecb1f29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6b4174133a4cad58db3570d1cd1a16b243d4da84 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 23 12:09:07 2018 +0100 make.sh: There are no tar.gz images to copy out of the chroot environment Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92244a40d898f7a885aeeb875786d23cf94175d6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 23 12:08:23 2018 +0100 make.sh: Generate checksum files for XZ compressed images Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 070271658..1050eb03b 100755 --- a/make.sh +++ b/make.sh @@ -1582,7 +1582,7 @@ buildpackages() { lfsmake2 flash-images fi - mv $LFS/install/images/{*.iso,*.tgz,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 + mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -1594,7 +1594,7 @@ buildpackages() { # remove not useable iso on armv5tel (needed to build flash images) [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso - for i in `ls *.bz2 *.img.gz *.iso`; do + for i in `ls *.bz2 *.img.xz *.iso`; do md5sum $i > $i.md5 done cd $PWD hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 212f17c1145bb6978b4797eb9c805f603ecb1f29
by git＠ipfire.org 23 May '18

23 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 212f17c1145bb6978b4797eb9c805f603ecb1f29 (commit) from 30a42c6df9e7db23cf5f202d749747967fbcbf55 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 212f17c1145bb6978b4797eb9c805f603ecb1f29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 23 12:03:06 2018 +0100 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(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 703ce0c48..070271658 100755 --- a/make.sh +++ b/make.sh @@ -225,6 +225,30 @@ configure_build() { MAKETUNING="-j${parallelism}" fi + + # Compression parameters + # We use mode 8 for reasonable memory usage when decompressing + # but with overall good compression + XZ_OPT="-8" + + # We try to use as many cores as possible + XZ_OPT="${XZ_OPT} -T0" + + # We need to limit memory because XZ uses too much when running + # in parallel and it isn't very smart in limiting itself. + # We allow XZ to use up to 70% of all system memory. + local xz_memory=$(( HOST_MEM * 7 / 10 )) + + # XZ memory cannot be larger than 2GB on 32 bit systems + case "${build_arch}" in + i*86|armv*) + if [ ${xz_memory} -gt 2048 ]; then + xz_memory=2048 + fi + ;; + esac + + XZ_OPT="${XZ_OPT} --memory=${xz_memory}MiB" } configure_build_guess() { @@ -861,20 +885,6 @@ fi # Get the amount of memory in this build system HOST_MEM=$(system_memory) -# We compress archives with "xz -8", using all cores and up to 70% of memory -XZ_MEM=$(( HOST_MEM * 7 / 10 )) - -# XZ memory cannot be larger than 2GB on 32 bit systems -case "${HOST_ARCH}" in - i*86|armv*) - if [ ${XZ_MEM} -gt 2048 ]; then - XZ_MEM=2048 - fi - ;; -esac - -XZ_OPT="-T0 -8 --memory=${XZ_MEM}MiB" - if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" else hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30a42c6df9e7db23cf5f202d749747967fbcbf55
by git＠ipfire.org 22 May '18

22 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 30a42c6df9e7db23cf5f202d749747967fbcbf55 (commit) from f03e254f39ddb7cacea7a39ec6b98dce77018b0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 30a42c6df9e7db23cf5f202d749747967fbcbf55 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 21:31:24 2018 +0100 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(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 5 ----- 1 file changed, 5 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 353441b01..703ce0c48 100755 --- a/make.sh +++ b/make.sh @@ -861,11 +861,6 @@ fi # Get the amount of memory in this build system HOST_MEM=$(system_memory) -# Checking host memory, tuning XZ_OPT -if [ ${HOST_MEM} -lt 1024 ]; then - exiterror "You will need more than 1GB or host memory to run the build" -fi - # We compress archives with "xz -8", using all cores and up to 70% of memory XZ_MEM=$(( HOST_MEM * 7 / 10 )) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f03e254f39ddb7cacea7a39ec6b98dce77018b0d
by git＠ipfire.org 22 May '18

22 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via f03e254f39ddb7cacea7a39ec6b98dce77018b0d (commit) via a92fb74d1aeb9229044c1a9fbc54abafca50da58 (commit) via f7585bc7ecf81e172ff18c04fece3e4f3227cf2c (commit) via 0bd7b7313293c127cf4782d5434273a5f3559566 (commit) via 9b656e7f40a3e0082681a63d2a2c0d4eea885906 (commit) via ab91dde24b512f7a6067937803946a10750b1ed6 (commit) via 90940aded5b7e233fadaae8bad8efbdfe383ce6c (commit) via c577571e2a6b623f7027d97d3ea523db663c68fa (commit) from c8453e87599fe66f4d18d901bc9dc431306afa2d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f03e254f39ddb7cacea7a39ec6b98dce77018b0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:46:25 2018 +0100 make.sh: Let XZ determine how many cores it wants to use Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a92fb74d1aeb9229044c1a9fbc54abafca50da58 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:46:03 2018 +0100 make.sh: Limit XZ memory to 2GB on 32 bit systems Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f7585bc7ecf81e172ff18c04fece3e4f3227cf2c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:40:29 2018 +0100 joe: Bump package because of ncurses update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0bd7b7313293c127cf4782d5434273a5f3559566 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:38:47 2018 +0100 hostapd: Fix detection of wireless devices with kernel 4.14 Fixes #11738 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b656e7f40a3e0082681a63d2a2c0d4eea885906 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:31:12 2018 +0100 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(a)ipfire.org> commit ab91dde24b512f7a6067937803946a10750b1ed6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:25:03 2018 +0100 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(a)ipfire.org> commit 90940aded5b7e233fadaae8bad8efbdfe383ce6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:23:42 2018 +0100 rngd: Update to version 6.2 Fixes #11737 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c577571e2a6b623f7027d97d3ea523db663c68fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 22 20:07:59 2018 +0100 installer: Drop /var partition Fixes #11735 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/entropy.cgi | 19 +++----- lfs/hostapd | 2 +- lfs/joe | 2 +- lfs/rng-tools | 5 +- make.sh | 14 +++++- src/initscripts/packages/hostapd | 7 ++- src/initscripts/system/rngd | 22 +-------- src/installer/hw.c | 100 +++++++-------------------------------- src/installer/hw.h | 2 - src/installer/main.c | 1 - 10 files changed, 46 insertions(+), 128 deletions(-) Difference in files: diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi index e5db5c212..d7a9ca5d8 100644 --- a/html/cgi-bin/entropy.cgi +++ b/html/cgi-bin/entropy.cgi @@ -51,14 +51,9 @@ if ( $querry[0] ne~ "") { # Check for hardware support. my $message; my $message_colour = $Header::colourred; - if (&has_hwrng()) { - $message = $Lang::tr{'system has hwrng'}; - $message_colour = $Header::colourgreen; - } elsif (&has_rdrand()) { + if (&has_rdrand()) { $message = $Lang::tr{'system has rdrand'}; $message_colour = $Header::colourgreen; - } else { - $message = $Lang::tr{'no hardware random number generator'}; } my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'>$Lang::tr{'stopped'}</td>"; @@ -67,9 +62,13 @@ if ( $querry[0] ne~ "") { } &Header::openbox('100%', 'center', $Lang::tr{'hardware support'}); - print <<EOF; - $message + if ($message) { + print <<EOF; + $message +EOF + } + print <<EOF; <table width='80%' cellspacing='1' class='tbl'> <tr> <th align='center'>$Lang::tr{'service'}</th> @@ -89,10 +88,6 @@ EOF &Header::closepage(); } -sub has_hwrng() { - return (-c "/dev/hwrng"); -} - sub has_rdrand() { open(FILE, "/proc/cpuinfo") or return 0; my @cpuinfo = <FILE>; diff --git a/lfs/hostapd b/lfs/hostapd index 5b2f001d5..349a3d940 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 41 +PAK_VER = 42 DEPS = "" diff --git a/lfs/joe b/lfs/joe index e4cee9528..73a0d3611 100644 --- a/lfs/joe +++ b/lfs/joe @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = joe -PAK_VER = 1 +PAK_VER = 2 DEPS = "" diff --git a/lfs/rng-tools b/lfs/rng-tools index c8ea08d8a..f9b79d108 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -24,7 +24,7 @@ include Config -VER = 5 +VER = 6.2 THISAPP = rng-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6726cdc6fae1f5122463f24ae980dd68 +$(DL_FILE)_MD5 = a596ecd89afc584afe48758923fe6195 install : $(TARGET) @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install diff --git a/make.sh b/make.sh index d7f56f293..353441b01 100755 --- a/make.sh +++ b/make.sh @@ -867,8 +867,18 @@ if [ ${HOST_MEM} -lt 1024 ]; then fi # We compress archives with "xz -8", using all cores and up to 70% of memory -XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB" -XZ_OPT="-T$(system_processors) -8 --memory=${XZ_MEM}" +XZ_MEM=$(( HOST_MEM * 7 / 10 )) + +# XZ memory cannot be larger than 2GB on 32 bit systems +case "${HOST_ARCH}" in + i*86|armv*) + if [ ${XZ_MEM} -gt 2048 ]; then + XZ_MEM=2048 + fi + ;; +esac + +XZ_OPT="-T0 -8 --memory=${XZ_MEM}MiB" if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd index 02e8c1614..27e79f0a7 100644 --- a/src/initscripts/packages/hostapd +++ b/src/initscripts/packages/hostapd @@ -17,18 +17,21 @@ case "${1}" in boot_mesg "Starting hostapd... " # Check Interface configuration - if ! ip link show $INTERFACE > /dev/null 2>&1; then + if [ ! -d "/sys/class/net/${INTERFACE}" ]; then boot_mesg "Interface $INTERFACE doesn't exist." ${FAILURE} echo_failure exit 0 fi + if [ "$(ip link show $INTERFACE | /bin/grep "ether")" == "" ]; then boot_mesg "Interface $INTERFACE is assigned to wlan master device." ${FAILURE} boot_mesg "Please reboot to fix this." ${FAILURE} echo_failure exit 0 fi - if [ "$(iwconfig $INTERFACE | /bin/grep "IEEE")" == "" ]; then + + # Check if INTERFACE is an actual wireless device + if [ ! -d "/sys/class/net/${INTERFACE}/wireless" ]; then boot_mesg "Interface $INTERFACE is no wireless device." ${FAILURE} echo_failure exit 0 diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd index df4aa7da2..91b70a7b4 100644 --- a/src/initscripts/system/rngd +++ b/src/initscripts/system/rngd @@ -11,30 +11,10 @@ . /etc/sysconfig/rc . ${rc_functions} -function has_rdrand() { - grep -q "rdrand" /proc/cpuinfo -} - -function has_hwrng() { - [ -e "/dev/hwrng" ] -} - case "${1}" in start) - if ! has_hwrng && ! has_rdrand; then - boot_mesg "No Hardware Random Number Generator found..." - echo_warning - exit 0 - fi - boot_mesg "Starting Random Number Generator Daemon..." - - if pidofproc /usr/sbin/rngd &>/dev/null; then - # Is already running. - echo_ok - else - loadproc /usr/sbin/rngd --no-tpm=1 - fi + loadproc /usr/sbin/rngd --quiet ;; stop) diff --git a/src/installer/hw.c b/src/installer/hw.c index add36c8f4..6acddf9bf 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -420,21 +420,6 @@ static unsigned long long hw_swap_size(struct hw_destination* dest) { return swap_size; } -static unsigned long long hw_root_size(struct hw_destination* dest) { - unsigned long long root_size; - - if (dest->size < MB2BYTES(2048)) - root_size = MB2BYTES(1024); - - else if (dest->size >= MB2BYTES(2048) && dest->size <= MB2BYTES(3072)) - root_size = MB2BYTES(1536); - - else - root_size = MB2BYTES(2048); - - return root_size; -} - static unsigned long long hw_boot_size(struct hw_destination* dest) { return MB2BYTES(128); } @@ -480,6 +465,10 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable // Add some more space for partition tables, etc. dest->size -= MB2BYTES(1); + // The disk has to have at least 2GB + if (dest->size <= MB2BYTES(2048)) + return -1; + // Determine partition table dest->part_table = HW_PART_TABLE_MSDOS; @@ -506,7 +495,14 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable } dest->size_boot = hw_boot_size(dest); - dest->size_root = hw_root_size(dest); + + // Determine the size of the data partition. + unsigned long long space_left = dest->size - \ + (dest->size_bootldr + dest->size_boot); + + // If we have less than 2GB left, we disable swap + if (space_left <= MB2BYTES(2048)) + disable_swap = 1; // Should we use swap? if (disable_swap) @@ -514,21 +510,11 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable else dest->size_swap = hw_swap_size(dest); - // Determine the size of the data partition. - unsigned long long used_space = dest->size_bootldr + dest->size_boot - + dest->size_swap + dest->size_root; + // Subtract swap + space_left -= dest->size_swap; - // Disk is way too small - if (used_space >= dest->size) - return -1; - - dest->size_data = dest->size - used_space; - - // If it gets too small, we remove the swap space. - if (dest->size_data <= MB2BYTES(256)) { - dest->size_data += dest->size_swap; - dest->size_swap = 0; - } + // Root is getting what ever is left + dest->size_root = space_left; // Set partition names if (dest->size_boot > 0) { @@ -550,11 +536,6 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable snprintf(dest->part_root, sizeof(dest->part_root), "%s%d", path, part_idx++); - if (dest->size_data > 0) - snprintf(dest->part_data, sizeof(dest->part_data), "%s%d", path, part_idx++); - else - *dest->part_data = '\0'; - return 0; } @@ -682,14 +663,6 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { part_start += dest->size_root; } - if (*dest->part_data) { - asprintf(&cmd, "%s mkpart %s ext2 %lluB %lluB", cmd, - (dest->part_table == HW_PART_TABLE_GPT) ? "DATA" : "primary", - part_start, part_start + dest->size_data - 1); - - part_start += dest->size_data; - } - if (dest->part_boot_idx > 0) asprintf(&cmd, "%s set %d boot on", cmd, dest->part_boot_idx); @@ -721,9 +694,6 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { if (*dest->part_root && (try_open(dest->part_root) != 0)) continue; - if (*dest->part_data && (try_open(dest->part_data) != 0)) - continue; - // All partitions do exist, exiting the loop. break; } @@ -787,13 +757,6 @@ int hw_create_filesystems(struct hw_destination* dest, const char* output) { if (r) return r; - // data - if (*dest->part_data) { - r = hw_format_filesystem(dest->part_data, dest->filesystem, output); - if (r) - return r; - } - return 0; } @@ -839,19 +802,6 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { } } - // data - if (*dest->part_data) { - snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_DATA); - mkdir(target, S_IRWXU|S_IRWXG|S_IRWXO); - - r = hw_mount(dest->part_data, target, filesystem, 0); - if (r) { - hw_umount_filesystems(dest, prefix); - - return r; - } - } - // swap if (*dest->part_swap) { r = swapon(dest->part_swap, 0); @@ -896,14 +846,6 @@ int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { return -1; } - // data - if (*dest->part_data) { - snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_DATA); - r = hw_umount(target); - if (r) - return -1; - } - // swap if (*dest->part_swap) { swapoff(dest->part_swap); @@ -1096,16 +1038,6 @@ int hw_write_fstab(struct hw_destination* dest) { free(uuid); } - // data - if (*dest->part_data) { - uuid = hw_get_uuid(dest->part_data); - - if (uuid) { - fprintf(f, FSTAB_FMT, uuid, "/var", "auto", "defaults", 1, 1); - free(uuid); - } - } - fclose(f); return 0; diff --git a/src/installer/hw.h b/src/installer/hw.h index e2d621be5..e127f1f51 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -84,7 +84,6 @@ struct hw_destination { char part_boot[DEV_SIZE]; char part_swap[DEV_SIZE]; char part_root[DEV_SIZE]; - char part_data[DEV_SIZE]; int part_boot_idx; int filesystem; @@ -94,7 +93,6 @@ struct hw_destination { unsigned long long size_boot; unsigned long long size_swap; unsigned long long size_root; - unsigned long long size_data; }; struct hw* hw_init(); diff --git a/src/installer/main.c b/src/installer/main.c index c7075aa71..116f52b05 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -685,7 +685,6 @@ int main(int argc, char *argv[]) { fprintf(flog, " boot : %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot)); fprintf(flog, " swap : %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap)); fprintf(flog, " root : %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root)); - fprintf(flog, " data : %s (%lluMB)\n", destination->part_data, BYTES2MB(destination->size_data)); fprintf(flog, "Memory : %lluMB\n", BYTES2MB(hw_memory())); // Warn the user if there is not enough space to create a swap partition hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c8453e87599fe66f4d18d901bc9dc431306afa2d
by git＠ipfire.org 21 May '18

21 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c8453e87599fe66f4d18d901bc9dc431306afa2d (commit) via 5852ad2db76bd25107280d6b0b04f4eee797bd9b (commit) via 2eba1dc954ad479231ebeb51d4f32c52597407f7 (commit) via 0054a52bd818fc1ef33684b8b8a8decd60fe4cee (commit) via b302b9a695e391477eab0cb2343f3ba1b1ba1989 (commit) via 27267889aa791b5c4683f62fe823ab96fb42fe8a (commit) via 0d7a6f03d43994265a5c3a1d58be69ceecec9275 (commit) via 814a7d126b461cf2a71dddb1a0e78e306e544233 (commit) via e50f08ae3bdb548bfa5c83ec6926e0096277e89b (commit) via eb1ff23333e91b0ef6fc2c4dca69853b9d109f59 (commit) via bea1884bd79cd91c4b31c2bd20c6f06d029c1e22 (commit) from b7a46724970feeb1edd11bc779db1ca53da0ccdb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c8453e87599fe66f4d18d901bc9dc431306afa2d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 21 20:58:36 2018 +0100 make.sh: Use all processor cores for compression Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5852ad2db76bd25107280d6b0b04f4eee797bd9b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 21 20:56:58 2018 +0100 make.sh: Use exiterror to end script safely Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2eba1dc954ad479231ebeb51d4f32c52597407f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 21 20:56:08 2018 +0100 make.sh: Remove some empty lines Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0054a52bd818fc1ef33684b8b8a8decd60fe4cee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 21 20:54:09 2018 +0100 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(a)ipfire.org> commit b302b9a695e391477eab0cb2343f3ba1b1ba1989 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 21 20:53:49 2018 +0100 Compress flash-images as XZ as well Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 27267889aa791b5c4683f62fe823ab96fb42fe8a Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 21 16:19:48 2018 +0200 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(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0d7a6f03d43994265a5c3a1d58be69ceecec9275 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 20 09:30:23 2018 +0200 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(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 814a7d126b461cf2a71dddb1a0e78e306e544233 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat May 19 13:53:33 2018 +0200 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(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e50f08ae3bdb548bfa5c83ec6926e0096277e89b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 20 17:59:29 2018 +0200 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(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eb1ff23333e91b0ef6fc2c4dca69853b9d109f59 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 20 17:40:36 2018 +0200 nmap: Update to 7.70 For details see: https://nmap.org/changelog.html Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bea1884bd79cd91c4b31c2bd20c6f06d029c1e22 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 18 17:14:15 2018 +0100 installer: Increase size of /boot to 128M Fixes #11736 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/nmap | 50 +++++++++++++++++++++++++++++++++++++++--- lfs/Config | 6 +++-- lfs/cdrom | 11 +--------- lfs/cmake | 4 ++-- lfs/core-updates | 9 ++++---- lfs/flash-images | 4 ++-- lfs/nano | 6 ++--- lfs/nmap | 14 +++++++----- make.sh | 14 ++++++++++-- src/installer/hw.c | 2 +- 10 files changed, 86 insertions(+), 34 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index 111610a62..211a8e758 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -14,8 +14,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc #usr/share/man/hu/man1 #usr/share/man/hu/man1/nmap.1 #usr/share/man/it/man1/nmap.1 -#usr/share/man/ja -#usr/share/man/ja/man1 #usr/share/man/ja/man1/nmap.1 #usr/share/man/man1/ndiff.1 #usr/share/man/man1/nmap.1 @@ -85,6 +83,7 @@ usr/share/nmap/nselib/data/http-fingerprints.lua usr/share/nmap/nselib/data/http-folders.txt usr/share/nmap/nselib/data/http-sql-errors.lst usr/share/nmap/nselib/data/http-web-files-extensions.lst +usr/share/nmap/nselib/data/idnaMappings.lua usr/share/nmap/nselib/data/ike-fingerprints.lua #usr/share/nmap/nselib/data/jdwp-class #usr/share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class @@ -110,6 +109,7 @@ usr/share/nmap/nselib/data/psexec/network.lua usr/share/nmap/nselib/data/psexec/nmap_service.c usr/share/nmap/nselib/data/psexec/nmap_service.vcproj usr/share/nmap/nselib/data/psexec/pwdump.lua +usr/share/nmap/nselib/data/publickeydb usr/share/nmap/nselib/data/rtsp-urls.txt usr/share/nmap/nselib/data/snmpcommunities.lst usr/share/nmap/nselib/data/ssl-fingerprints @@ -138,18 +138,22 @@ usr/share/nmap/nselib/gps.lua usr/share/nmap/nselib/http.lua usr/share/nmap/nselib/httpspider.lua usr/share/nmap/nselib/iax2.lua +usr/share/nmap/nselib/idna.lua usr/share/nmap/nselib/ike.lua usr/share/nmap/nselib/imap.lua usr/share/nmap/nselib/informix.lua usr/share/nmap/nselib/ipOps.lua usr/share/nmap/nselib/ipmi.lua usr/share/nmap/nselib/ipp.lua +usr/share/nmap/nselib/irc.lua usr/share/nmap/nselib/iscsi.lua usr/share/nmap/nselib/isns.lua usr/share/nmap/nselib/jdwp.lua usr/share/nmap/nselib/json.lua usr/share/nmap/nselib/ldap.lua usr/share/nmap/nselib/lfs.luadoc +usr/share/nmap/nselib/libssh2-utility.lua +usr/share/nmap/nselib/libssh2.luadoc usr/share/nmap/nselib/listop.lua usr/share/nmap/nselib/lpeg-utility.lua usr/share/nmap/nselib/lpeg.luadoc @@ -166,6 +170,7 @@ usr/share/nmap/nselib/mssql.lua usr/share/nmap/nselib/multicast.lua usr/share/nmap/nselib/mysql.lua usr/share/nmap/nselib/natpmp.lua +usr/share/nmap/nselib/nbd.lua usr/share/nmap/nselib/ncp.lua usr/share/nmap/nselib/ndmp.lua usr/share/nmap/nselib/netbios.lua @@ -181,6 +186,7 @@ usr/share/nmap/nselib/pgsql.lua usr/share/nmap/nselib/pop3.lua usr/share/nmap/nselib/pppoe.lua usr/share/nmap/nselib/proxy.lua +usr/share/nmap/nselib/punycode.lua usr/share/nmap/nselib/rdp.lua usr/share/nmap/nselib/re.lua usr/share/nmap/nselib/redis.lua @@ -194,6 +200,7 @@ usr/share/nmap/nselib/shortport.lua usr/share/nmap/nselib/sip.lua usr/share/nmap/nselib/slaxml.lua usr/share/nmap/nselib/smb.lua +usr/share/nmap/nselib/smb2.lua usr/share/nmap/nselib/smbauth.lua usr/share/nmap/nselib/smtp.lua usr/share/nmap/nselib/snmp.lua @@ -225,6 +232,7 @@ usr/share/nmap/nselib/vuzedht.lua usr/share/nmap/nselib/wsdd.lua usr/share/nmap/nselib/xdmcp.lua usr/share/nmap/nselib/xmpp.lua +usr/share/nmap/nselib/zlib.luadoc #usr/share/nmap/scripts usr/share/nmap/scripts/acarsd-info.nse usr/share/nmap/scripts/address-info.nse @@ -267,6 +275,7 @@ usr/share/nmap/scripts/broadcast-ms-sql-discover.nse usr/share/nmap/scripts/broadcast-netbios-master-browser.nse usr/share/nmap/scripts/broadcast-networker-discover.nse usr/share/nmap/scripts/broadcast-novell-locate.nse +usr/share/nmap/scripts/broadcast-ospf2-discover.nse usr/share/nmap/scripts/broadcast-pc-anywhere.nse usr/share/nmap/scripts/broadcast-pc-duo.nse usr/share/nmap/scripts/broadcast-pim-discovery.nse @@ -287,6 +296,8 @@ usr/share/nmap/scripts/cassandra-brute.nse usr/share/nmap/scripts/cassandra-info.nse usr/share/nmap/scripts/cccam-version.nse usr/share/nmap/scripts/cics-enum.nse +usr/share/nmap/scripts/cics-info.nse +usr/share/nmap/scripts/cics-user-brute.nse usr/share/nmap/scripts/cics-user-enum.nse usr/share/nmap/scripts/citrix-brute-xml.nse usr/share/nmap/scripts/citrix-enum-apps-xml.nse @@ -306,6 +317,7 @@ usr/share/nmap/scripts/cvs-brute.nse usr/share/nmap/scripts/daap-get-library.nse usr/share/nmap/scripts/daytime.nse usr/share/nmap/scripts/db2-das-info.nse +usr/share/nmap/scripts/deluge-rpc-brute.nse usr/share/nmap/scripts/dhcp-discover.nse usr/share/nmap/scripts/dict-info.nse usr/share/nmap/scripts/distcc-cve2004-2687.nse @@ -352,6 +364,7 @@ usr/share/nmap/scripts/ftp-bounce.nse usr/share/nmap/scripts/ftp-brute.nse usr/share/nmap/scripts/ftp-libopie.nse usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +usr/share/nmap/scripts/ftp-syst.nse usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse usr/share/nmap/scripts/ganglia-info.nse @@ -369,6 +382,7 @@ usr/share/nmap/scripts/hbase-region-info.nse usr/share/nmap/scripts/hddtemp-info.nse usr/share/nmap/scripts/hnap-info.nse usr/share/nmap/scripts/hostmap-bfk.nse +usr/share/nmap/scripts/hostmap-crtsh.nse usr/share/nmap/scripts/hostmap-ip2hosts.nse usr/share/nmap/scripts/hostmap-robtex.nse usr/share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse @@ -383,6 +397,7 @@ usr/share/nmap/scripts/http-awstatstotals-exec.nse usr/share/nmap/scripts/http-axis2-dir-traversal.nse usr/share/nmap/scripts/http-backup-finder.nse usr/share/nmap/scripts/http-barracuda-dir-traversal.nse +usr/share/nmap/scripts/http-bigip-cookie.nse usr/share/nmap/scripts/http-brute.nse usr/share/nmap/scripts/http-cakephp-version.nse usr/share/nmap/scripts/http-chrono.nse @@ -390,6 +405,7 @@ usr/share/nmap/scripts/http-cisco-anyconnect.nse usr/share/nmap/scripts/http-coldfusion-subzero.nse usr/share/nmap/scripts/http-comments-displayer.nse usr/share/nmap/scripts/http-config-backup.nse +usr/share/nmap/scripts/http-cookie-flags.nse usr/share/nmap/scripts/http-cors.nse usr/share/nmap/scripts/http-cross-domain-policy.nse usr/share/nmap/scripts/http-csrf.nse @@ -424,6 +440,7 @@ usr/share/nmap/scripts/http-iis-short-name-brute.nse usr/share/nmap/scripts/http-iis-webdav-vuln.nse usr/share/nmap/scripts/http-internal-ip-disclosure.nse usr/share/nmap/scripts/http-joomla-brute.nse +usr/share/nmap/scripts/http-jsonp-detection.nse usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse usr/share/nmap/scripts/http-ls.nse usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse @@ -447,6 +464,7 @@ usr/share/nmap/scripts/http-rfi-spider.nse usr/share/nmap/scripts/http-robots.txt.nse usr/share/nmap/scripts/http-robtex-reverse-ip.nse usr/share/nmap/scripts/http-robtex-shared-ns.nse +usr/share/nmap/scripts/http-security-headers.nse usr/share/nmap/scripts/http-server-header.nse usr/share/nmap/scripts/http-shellshock.nse usr/share/nmap/scripts/http-sitemap-generator.nse @@ -460,6 +478,7 @@ usr/share/nmap/scripts/http-title.nse usr/share/nmap/scripts/http-tplink-dir-traversal.nse usr/share/nmap/scripts/http-trace.nse usr/share/nmap/scripts/http-traceroute.nse +usr/share/nmap/scripts/http-trane-info.nse usr/share/nmap/scripts/http-unsafe-output-escaping.nse usr/share/nmap/scripts/http-useragent-tester.nse usr/share/nmap/scripts/http-userdir-enum.nse @@ -485,6 +504,10 @@ usr/share/nmap/scripts/http-vuln-cve2014-3704.nse usr/share/nmap/scripts/http-vuln-cve2014-8877.nse usr/share/nmap/scripts/http-vuln-cve2015-1427.nse usr/share/nmap/scripts/http-vuln-cve2015-1635.nse +usr/share/nmap/scripts/http-vuln-cve2017-1001000.nse +usr/share/nmap/scripts/http-vuln-cve2017-5638.nse +usr/share/nmap/scripts/http-vuln-cve2017-5689.nse +usr/share/nmap/scripts/http-vuln-cve2017-8917.nse usr/share/nmap/scripts/http-vuln-misfortune-cookie.nse usr/share/nmap/scripts/http-vuln-wnr1000-creds.nse usr/share/nmap/scripts/http-waf-detect.nse @@ -497,10 +520,12 @@ usr/share/nmap/scripts/http-xssed.nse usr/share/nmap/scripts/iax2-brute.nse usr/share/nmap/scripts/iax2-version.nse usr/share/nmap/scripts/icap-info.nse +usr/share/nmap/scripts/iec-identify.nse usr/share/nmap/scripts/ike-version.nse usr/share/nmap/scripts/imap-brute.nse usr/share/nmap/scripts/imap-capabilities.nse usr/share/nmap/scripts/imap-ntlm-info.nse +usr/share/nmap/scripts/impress-remote-discover.nse usr/share/nmap/scripts/informix-brute.nse usr/share/nmap/scripts/informix-query.nse usr/share/nmap/scripts/informix-tables.nse @@ -585,6 +610,7 @@ usr/share/nmap/scripts/mysql-variables.nse usr/share/nmap/scripts/mysql-vuln-cve2012-2122.nse usr/share/nmap/scripts/nat-pmp-info.nse usr/share/nmap/scripts/nat-pmp-mapport.nse +usr/share/nmap/scripts/nbd-info.nse usr/share/nmap/scripts/nbstat.nse usr/share/nmap/scripts/ncp-enum-users.nse usr/share/nmap/scripts/ncp-serverinfo.nse @@ -612,6 +638,7 @@ usr/share/nmap/scripts/omp2-enum-targets.nse usr/share/nmap/scripts/omron-info.nse usr/share/nmap/scripts/openlookup-info.nse usr/share/nmap/scripts/openvas-otp-brute.nse +usr/share/nmap/scripts/openwebnet-discovery.nse usr/share/nmap/scripts/oracle-brute-stealth.nse usr/share/nmap/scripts/oracle-brute.nse usr/share/nmap/scripts/oracle-enum-users.nse @@ -628,6 +655,7 @@ usr/share/nmap/scripts/pop3-brute.nse usr/share/nmap/scripts/pop3-capabilities.nse usr/share/nmap/scripts/pop3-ntlm-info.nse usr/share/nmap/scripts/pptp-version.nse +usr/share/nmap/scripts/puppet-naivesigning.nse usr/share/nmap/scripts/qconn-exec.nse usr/share/nmap/scripts/qscan.nse usr/share/nmap/scripts/quake1-info.nse @@ -650,6 +678,7 @@ usr/share/nmap/scripts/rpc-grind.nse usr/share/nmap/scripts/rpcap-brute.nse usr/share/nmap/scripts/rpcap-info.nse usr/share/nmap/scripts/rpcinfo.nse +usr/share/nmap/scripts/rsa-vuln-roca.nse usr/share/nmap/scripts/rsync-brute.nse usr/share/nmap/scripts/rsync-list-modules.nse usr/share/nmap/scripts/rtsp-methods.nse @@ -666,9 +695,11 @@ usr/share/nmap/scripts/sip-enum-users.nse usr/share/nmap/scripts/sip-methods.nse usr/share/nmap/scripts/skypev2-version.nse usr/share/nmap/scripts/smb-brute.nse +usr/share/nmap/scripts/smb-double-pulsar-backdoor.nse usr/share/nmap/scripts/smb-enum-domains.nse usr/share/nmap/scripts/smb-enum-groups.nse usr/share/nmap/scripts/smb-enum-processes.nse +usr/share/nmap/scripts/smb-enum-services.nse usr/share/nmap/scripts/smb-enum-sessions.nse usr/share/nmap/scripts/smb-enum-shares.nse usr/share/nmap/scripts/smb-enum-users.nse @@ -677,19 +708,25 @@ usr/share/nmap/scripts/smb-ls.nse usr/share/nmap/scripts/smb-mbenum.nse usr/share/nmap/scripts/smb-os-discovery.nse usr/share/nmap/scripts/smb-print-text.nse +usr/share/nmap/scripts/smb-protocols.nse usr/share/nmap/scripts/smb-psexec.nse usr/share/nmap/scripts/smb-security-mode.nse usr/share/nmap/scripts/smb-server-stats.nse usr/share/nmap/scripts/smb-system-info.nse usr/share/nmap/scripts/smb-vuln-conficker.nse +usr/share/nmap/scripts/smb-vuln-cve-2017-7494.nse usr/share/nmap/scripts/smb-vuln-cve2009-3103.nse usr/share/nmap/scripts/smb-vuln-ms06-025.nse usr/share/nmap/scripts/smb-vuln-ms07-029.nse usr/share/nmap/scripts/smb-vuln-ms08-067.nse usr/share/nmap/scripts/smb-vuln-ms10-054.nse usr/share/nmap/scripts/smb-vuln-ms10-061.nse +usr/share/nmap/scripts/smb-vuln-ms17-010.nse usr/share/nmap/scripts/smb-vuln-regsvc-dos.nse -usr/share/nmap/scripts/smbv2-enabled.nse +usr/share/nmap/scripts/smb2-capabilities.nse +usr/share/nmap/scripts/smb2-security-mode.nse +usr/share/nmap/scripts/smb2-time.nse +usr/share/nmap/scripts/smb2-vuln-uptime.nse usr/share/nmap/scripts/smtp-brute.nse usr/share/nmap/scripts/smtp-commands.nse usr/share/nmap/scripts/smtp-enum-users.nse @@ -715,7 +752,11 @@ usr/share/nmap/scripts/snmp-win32-users.nse usr/share/nmap/scripts/socks-auth-info.nse usr/share/nmap/scripts/socks-brute.nse usr/share/nmap/scripts/socks-open-proxy.nse +usr/share/nmap/scripts/ssh-auth-methods.nse +usr/share/nmap/scripts/ssh-brute.nse usr/share/nmap/scripts/ssh-hostkey.nse +usr/share/nmap/scripts/ssh-publickey-acceptance.nse +usr/share/nmap/scripts/ssh-run.nse usr/share/nmap/scripts/ssh2-enum-algos.nse usr/share/nmap/scripts/sshv1.nse usr/share/nmap/scripts/ssl-ccs-injection.nse @@ -750,7 +791,9 @@ usr/share/nmap/scripts/telnet-brute.nse usr/share/nmap/scripts/telnet-encryption.nse usr/share/nmap/scripts/telnet-ntlm-info.nse usr/share/nmap/scripts/tftp-enum.nse +usr/share/nmap/scripts/tls-alpn.nse usr/share/nmap/scripts/tls-nextprotoneg.nse +usr/share/nmap/scripts/tls-ticketbleed.nse usr/share/nmap/scripts/tn3270-screen.nse usr/share/nmap/scripts/tor-consensus-checker.nse usr/share/nmap/scripts/traceroute-geolocation.nse @@ -763,6 +806,7 @@ usr/share/nmap/scripts/url-snarf.nse usr/share/nmap/scripts/ventrilo-info.nse usr/share/nmap/scripts/versant-info.nse usr/share/nmap/scripts/vmauthd-brute.nse +usr/share/nmap/scripts/vmware-version.nse usr/share/nmap/scripts/vnc-brute.nse usr/share/nmap/scripts/vnc-info.nse usr/share/nmap/scripts/vnc-title.nse diff --git a/lfs/Config b/lfs/Config index d63a1dc9a..5cd32da06 100644 --- a/lfs/Config +++ b/lfs/Config @@ -47,6 +47,8 @@ else PREFIX = /usr endif +TAR_OPTIONS = --xz + # URLs that are common sources of downloads. If you're having trouble with # a site you should change its URL to that of a suitable mirror site. # @@ -209,11 +211,11 @@ define PAK tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ -p --numeric-owner rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && XZ_OPT=-T0 tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz * + cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner -J * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz rm -r /install/packages/package/tmp -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES - cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files + cd /install/packages/package && tar cf - --files-from=/usr/src/src/paks/files | xz $(XZ_OPT) > ../$(PROG)-$(VER)-$(PAK_VER).ipfire rm -rf /install/packages/package sed -e s/NAME/$(PROG)/g \ -e s/VER/$(VER)/g \ diff --git a/lfs/cdrom b/lfs/cdrom index 7a7fff166..00f185d81 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -29,15 +29,6 @@ VER = ipfire THISAPP = cdrom TARGET = $(DIR_INFO)/$(THISAPP) -ifeq "$(BUILD_PLATFORM)" "arm" - TAR_OPTIONS = -else - TAR_OPTIONS = --xz -endif - -# Enable multi-threaded compression for LZMA -export XZ_OPT = --threads=0 - ############################################################################### # Top-level Rules ############################################################################### @@ -81,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar @mkdir /tmp/sys - cd /tmp && tar cf /install/cdrom/distro.img $(TAR_OPTIONS) * && rm -rf * + cd /tmp && tar cf - * | xz $(XZ_OPT) > /install/cdrom/distro.img && rm -rf * # Other files touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media diff --git a/lfs/cmake b/lfs/cmake index e5977b971..dd0f626a9 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -24,7 +24,7 @@ include Config -VER = 3.11.1 +VER = 3.11.2 THISAPP = cmake-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 12a3177477e4e2c7bc514193d421dafe +$(DL_FILE)_MD5 = d2d554c05fc07cfae7846d2aa205f12a install : $(TARGET) diff --git a/lfs/core-updates b/lfs/core-updates index 3c847daf2..d34926967 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -26,8 +26,9 @@ include Config VER = ipfire -THISAPP = core-updates -TARGET = $(DIR_INFO)/$(THISAPP) +THISAPP = core-updates +TARGET = $(DIR_INFO)/$(THISAPP) +TAR_OPTIONS = --xz ############################################################################### # Top-level Rules @@ -78,7 +79,7 @@ core/%: mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar - cd /tmp && tar cJf /install/packages/package/files.tar.xz * && rm -rf * + cd /tmp && XZ_OPT="$(XZ_OPT)" tar cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf * cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp rm /install/packages/package/ROOTFILES mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES @@ -89,7 +90,7 @@ core/%: #Change xxxKVERxxx to Kernelversion sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh - cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $(a)).ipfire \ + cd /install/packages/package && XZ_OPT="$(XZ_OPT)" tar cf ../core-upgrade-$(VERSION)-$$(basename $(a)).ipfire $(TAR_OPTIONS) \ update.sh files.tar.xz ROOTFILES rm -rf /install/packages/package sed -e "s/NAME/core-upgrade/g" \ diff --git a/lfs/flash-images b/lfs/flash-images index 57d600cf0..a5a3c29ce 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -33,7 +33,7 @@ DEVICE = $(shell losetup -f) PART_BOOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1 PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3 -IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz +IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n @@ -214,5 +214,5 @@ ifeq "$(BUILD_PLATFORM)" "arm" endif # Compress Image - pigz -f9 < $(IMG) > $(IMAGE_FILE) + xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE) rm -rf $(IMG) $(MNThdd) diff --git a/lfs/nano b/lfs/nano index 68759ed05..98dec8897 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.9.6 +VER = 2.9.7 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 21 +PAK_VER = 22 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8b12ca2e4d33794a9c1794c4c7d84623 +$(DL_FILE)_MD5 = 804a0e91cb11f2e8884aee7bfac2d18d install : $(TARGET) diff --git a/lfs/nmap b/lfs/nmap index 1daeb89b0..1d9b33f21 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 7.40 +VER = 7.70 THISAPP = nmap-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 9 +PAK_VER = 10 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9c5a28bfb46228bade82b238408c065e +$(DL_FILE)_MD5 = 84eb6fbe788e0d4918c2b1e39421bf79 install : $(TARGET) @@ -77,7 +77,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ncat + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --without-nmapfe \ + --without-zenmap \ + --without-ncat cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 419f9fa95..d7f56f293 100755 --- a/make.sh +++ b/make.sh @@ -526,6 +526,7 @@ enterchroot() { CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER="${KVER}" \ + XZ_OPT="${XZ_OPT}" \ $(fake_environ) \ $(qemu_environ) \ "$@" @@ -860,6 +861,15 @@ fi # Get the amount of memory in this build system HOST_MEM=$(system_memory) +# Checking host memory, tuning XZ_OPT +if [ ${HOST_MEM} -lt 1024 ]; then + exiterror "You will need more than 1GB or host memory to run the build" +fi + +# We compress archives with "xz -8", using all cores and up to 70% of memory +XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB" +XZ_OPT="-T$(system_processors) -8 --memory=${XZ_MEM}" + if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" else @@ -1557,7 +1567,7 @@ buildpackages() { lfsmake2 flash-images fi - mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 + mv $LFS/install/images/{*.iso,*.tgz,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -1760,7 +1770,7 @@ toolchain) buildtoolchain echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - cd $BASEDIR && XZ_OPT="-T0 -8" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ + cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \ build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5 diff --git a/src/installer/hw.c b/src/installer/hw.c index 06bf42b67..add36c8f4 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -436,7 +436,7 @@ static unsigned long long hw_root_size(struct hw_destination* dest) { } static unsigned long long hw_boot_size(struct hw_destination* dest) { - return MB2BYTES(64); + return MB2BYTES(128); } static int hw_device_has_p_suffix(const struct hw_destination* dest) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b7a46724970feeb1edd11bc779db1ca53da0ccdb
by git＠ipfire.org 17 May '18

17 May '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via b7a46724970feeb1edd11bc779db1ca53da0ccdb (commit) from 4dd7df2f82266d8d7a4474568020a326e9823f40 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b7a46724970feeb1edd11bc779db1ca53da0ccdb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu May 17 07:45:06 2018 +0200 kernel: update to 4.14.41 Signen-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/linux-multi | 1 + lfs/linux | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 1b6139c6b..94838e119 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -86,6 +86,7 @@ boot/dtb-KVER-ipfire-multi #boot/dtb-KVER-ipfire-multi/bcm2835-rpi-zero-w.dtb #boot/dtb-KVER-ipfire-multi/bcm2835-rpi-zero.dtb #boot/dtb-KVER-ipfire-multi/bcm2836-rpi-2-b.dtb +#boot/dtb-KVER-ipfire-multi/bcm2837-rpi-3-b-plus.dtb #boot/dtb-KVER-ipfire-multi/bcm2837-rpi-3-b.dtb #boot/dtb-KVER-ipfire-multi/berlin2-sony-nsz-gs7.dtb #boot/dtb-KVER-ipfire-multi/berlin2cd-google-chromecast.dtb diff --git a/lfs/linux b/lfs/linux index 5db41c434..3ae2a8764 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.40 -ARM_PATCHES = 4.14.40-ipfire0 +VER = 4.14.41 +ARM_PATCHES = 4.14.41-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -75,8 +75,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 8376ed89777760443a359edb1d08ed9a -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ae7091bb79bad05c8394c8bacc48dd60 +$(DL_FILE)_MD5 = ce212dfed5c5e8a92808f675ef433382 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 12f346d38b519c71d9e9837529d53494 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2018