* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c49bf5412b3d1c3ef8ac894839d04fbfd82b4d3a
@ 2021-04-10 13:28 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-04-10 13:28 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7718 bytes --]
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 c49bf5412b3d1c3ef8ac894839d04fbfd82b4d3a (commit)
via 00c5561eb90f6ea676dfd0abe68a57f6a50a2cd1 (commit)
via 45022af1b80270039d649cde6071fe30344ae443 (commit)
from 5847a7d01133a0ca7f5f6f096e24fa174f243510 (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 c49bf5412b3d1c3ef8ac894839d04fbfd82b4d3a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Apr 8 22:37:21 2021 +0200
speedtest-cli: Fix for bug #12602 - CORE 155 error with speedtest-cli
- Update from 2.1.2 to 2.1.3 - fix for bug #12602
Updated addon installed and fix confirmed
- Update rootfile
- Changelog
Address issue where a test server may return an HTTP error during upload or download
Address issue where ignore_ids may be empty or have empty values
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 00c5561eb90f6ea676dfd0abe68a57f6a50a2cd1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Apr 10 13:18:43 2021 +0000
core156: Load all sysctl files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45022af1b80270039d649cde6071fe30344ae443
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Apr 9 21:13:52 2021 +0200
sysctl.conf: Turn on BPF JIT hardening, if the JIT is enabled
The second version of this patch splits this up into different
architecture-specific sysctl config files, as i586 does not support BPF
JIT, hence the net.core.bpf_jit_harden does not exist on that
architecture.
Fixes: #12384
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/etc/sysctl-aarch64.conf | 2 ++
config/etc/sysctl-armv5tel.conf | 2 ++
config/etc/sysctl-x86_64.conf | 3 +++
config/rootfiles/core/156/filelists/aarch64/files | 1 +
config/rootfiles/core/156/filelists/armv5tel/files | 1 +
.../x86_64/sysctl-x86_64 => core/156/filelists/x86_64/files} | 0
config/rootfiles/core/156/update.sh | 2 +-
config/rootfiles/packages/speedtest-cli | 12 ++++++------
lfs/speedtest-cli | 6 +++---
9 files changed, 19 insertions(+), 10 deletions(-)
create mode 100644 config/etc/sysctl-aarch64.conf
create mode 100644 config/etc/sysctl-armv5tel.conf
create mode 100644 config/rootfiles/core/156/filelists/aarch64/files
create mode 100644 config/rootfiles/core/156/filelists/armv5tel/files
copy config/rootfiles/{oldcore/135/filelists/x86_64/sysctl-x86_64 => core/156/filelists/x86_64/files} (100%)
Difference in files:
diff --git a/config/etc/sysctl-aarch64.conf b/config/etc/sysctl-aarch64.conf
new file mode 100644
index 000000000..9f840806d
--- /dev/null
+++ b/config/etc/sysctl-aarch64.conf
@@ -0,0 +1,2 @@
+# Turn on BPF JIT hardening, if the JIT is enabled.
+net.core.bpf_jit_harden = 2
diff --git a/config/etc/sysctl-armv5tel.conf b/config/etc/sysctl-armv5tel.conf
new file mode 100644
index 000000000..9f840806d
--- /dev/null
+++ b/config/etc/sysctl-armv5tel.conf
@@ -0,0 +1,2 @@
+# Turn on BPF JIT hardening, if the JIT is enabled.
+net.core.bpf_jit_harden = 2
diff --git a/config/etc/sysctl-x86_64.conf b/config/etc/sysctl-x86_64.conf
index 7384bed51..c7abecc5d 100644
--- a/config/etc/sysctl-x86_64.conf
+++ b/config/etc/sysctl-x86_64.conf
@@ -1,3 +1,6 @@
# Improve KASLR effectiveness for mmap
vm.mmap_rnd_bits = 32
vm.mmap_rnd_compat_bits = 16
+
+# Turn on BPF JIT hardening, if the JIT is enabled.
+net.core.bpf_jit_harden = 2
diff --git a/config/rootfiles/core/156/filelists/aarch64/files b/config/rootfiles/core/156/filelists/aarch64/files
new file mode 100644
index 000000000..19343ce01
--- /dev/null
+++ b/config/rootfiles/core/156/filelists/aarch64/files
@@ -0,0 +1 @@
+etc/sysctl-aarch64.conf
diff --git a/config/rootfiles/core/156/filelists/armv5tel/files b/config/rootfiles/core/156/filelists/armv5tel/files
new file mode 100644
index 000000000..f273eab44
--- /dev/null
+++ b/config/rootfiles/core/156/filelists/armv5tel/files
@@ -0,0 +1 @@
+etc/sysctl-armv5tel.conf
diff --git a/config/rootfiles/core/156/filelists/x86_64/files b/config/rootfiles/core/156/filelists/x86_64/files
new file mode 100644
index 000000000..0a9fd8a87
--- /dev/null
+++ b/config/rootfiles/core/156/filelists/x86_64/files
@@ -0,0 +1 @@
+etc/sysctl-x86_64.conf
diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh
index 972fc1d70..5b14c5355 100644
--- a/config/rootfiles/core/156/update.sh
+++ b/config/rootfiles/core/156/update.sh
@@ -60,7 +60,7 @@ rm -rfv \
/usr/local/bin/filesystem-cleanup
# Reload sysctl.conf
-sysctl -p
+/etc/init.d/sysctl start
# Migrate any macvtap interfaces to bridge
sed -e "s/_MODE=macvtap/_MODE=bridge/g" \
diff --git a/config/rootfiles/packages/speedtest-cli b/config/rootfiles/packages/speedtest-cli
index 0ef126e23..48320f6b6 100644
--- a/config/rootfiles/packages/speedtest-cli
+++ b/config/rootfiles/packages/speedtest-cli
@@ -1,9 +1,9 @@
usr/bin/speedtest
usr/bin/speedtest-cli
usr/lib/python3.8/site-packages/speedtest.py
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info/PKG-INFO
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info/SOURCES.txt
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info/dependency_links.txt
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info/entry_points.txt
-usr/lib/python3.8/site-packages/speedtest_cli-2.1.2-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info/PKG-INFO
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info/SOURCES.txt
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info/dependency_links.txt
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info/entry_points.txt
+usr/lib/python3.8/site-packages/speedtest_cli-2.1.3-py3.8.egg-info/top_level.txt
diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli
index 446844ab3..f6bcf4c96 100644
--- a/lfs/speedtest-cli
+++ b/lfs/speedtest-cli
@@ -24,7 +24,7 @@
include Config
-VER = 2.1.2
+VER = 2.1.3
THISAPP = speedtest-cli-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = speedtest-cli
-PAK_VER = 3
+PAK_VER = 4
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a49ad088331810fc9442e8a5c59de713
+$(DL_FILE)_MD5 = 08c431f2f398880745c4f0564962b9e2
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-10 13:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-10 13:28 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c49bf5412b3d1c3ef8ac894839d04fbfd82b4d3a Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox