Skip to content

Commit 29795b9

Browse files
muzikrmuzikr
committed
Merge branch 'hbl' into hbd
2 parents 768f371 + 197f51c commit 29795b9

15 files changed

+5181
-406
lines changed

‎NEWS

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,32 @@
44
💥 Breaking Changes
55
• Based on the latest OpenWrt 23.05 release
66

7+
7.0.2
8+
-----
9+
10+
📌 Updates
11+
• knot-resolver: Update to 5.7.4 and 6.0.8 - security updates
12+
13+
🐛 Bug Fixes
14+
• tvheadend: Fix init script and websockets
15+
16+
7.0.1
17+
-----
18+
19+
📌 Updates
20+
• openssh: Update to 9.8p1 (Security update)
21+
• ethtool: Update to 6.6
22+
• iproute2: Update to 6.7.0
23+
• cronie: Update to 1.7.2
24+
• schnapps: Update to 2.13.1 - support for Turris 1.x
25+
26+
🐛 Bug Fixes
27+
• transmission: Downgrade to version 3 as new version seems to have some issues
28+
• modem-manager-autosetup: Proceed with configuration even for unknown service providers
29+
30+
💥 Breaking Changes
31+
• Drop experimental mwifiex-nxp driver (not used anywhere)
32+
733
7.0.0
834
-----
935

‎configs/common/hardening

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ CONFIG_PKG_FORTIFY_SOURCE_2=y
88
CONFIG_KERNEL_CC_STACKPROTECTOR_STRONG=y
99
CONFIG_PKG_CC_STACKPROTECTOR_STRONG=y
1010

11+
# Enable Stack-Smashing Protection for every executable build
12+
CONFIG_GCC_DEFAULT_SSP=y
13+
1114
# Enable seccomp in kernel to use procd-seccomp
12-
CONFIG_SECCOMP=n
13-
CONFIG_KERNEL_SECCOMP=n
1415
CONFIG_LXC_SECCOMP=y

‎helpers/new_release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# Turris OS script verifying new release
3-
# (C) 2019-2021 CZ.NIC, z.s.p.o.
3+
# (C) 2019-2024 CZ.NIC, z.s.p.o.
44
#
55
# This program is free software: you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
@@ -240,7 +240,7 @@ print_help() {
240240
echo "Turris OS new releases managing tool."
241241
echo
242242
echo "Options:"
243-
echo " -v Run script with verbose output"
243+
echo " -d Run script in debugging (verbose) mode"
244244
echo " -h Print this help text"
245245
echo "Modes:"
246246
echo " verify"

‎patches/openwrt/backport/0005-iproute2-update-to-6.7.0.patch

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
From b9a8e3a8a3db5d66c712ff36957971fdc0d4cf2a Mon Sep 17 00:00:00 2001
2+
From: Nick Hainke <[email protected]>
3+
Date: Wed, 19 Jul 2023 09:22:48 +0200
4+
Subject: [PATCH] iproute2: update to 6.7.0
5+
6+
---
7+
package/network/utils/iproute2/Makefile | 4 ++--
8+
.../utils/iproute2/patches/100-configure.patch | 12 ------------
9+
.../iproute2/patches/115-add-config-xtlibdir.patch | 2 +-
10+
.../patches/130-no_netem_tipc_dcb_man_vdpa.patch | 2 +-
11+
.../iproute2/patches/140-keep_libmnl_optional.patch | 2 +-
12+
.../iproute2/patches/145-keep_libelf_optional.patch | 2 +-
13+
.../iproute2/patches/150-keep_libcap_optional.patch | 2 +-
14+
.../iproute2/patches/155-keep_tirpc_optional.patch | 2 +-
15+
.../iproute2/patches/175-reduce-dynamic-syms.patch | 12 ++++++------
16+
.../iproute2/patches/190-fix-nls-rpath-link.patch | 4 ++--
17+
.../iproute2/patches/195-build_variant_ip_tc.patch | 2 +-
18+
.../patches/200-drop_libbsd_dependency.patch | 6 +++---
19+
.../iproute2/patches/300-selinux-configurable.patch | 2 +-
20+
13 files changed, 21 insertions(+), 33 deletions(-)
21+
delete mode 100644 package/network/utils/iproute2/patches/100-configure.patch
22+
23+
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
24+
index 101ca67324..2f9d2f2bc9 100644
25+
--- a/package/network/utils/iproute2/Makefile
26+
+++ b/package/network/utils/iproute2/Makefile
27+
@@ -8,12 +8,12 @@
28+
include $(TOPDIR)/rules.mk
29+
30+
PKG_NAME:=iproute2
31+
-PKG_VERSION:=6.3.0
32+
+PKG_VERSION:=6.7.0
33+
PKG_RELEASE:=1
34+
35+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
36+
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
37+
-PKG_HASH:=dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732
38+
+PKG_HASH:=ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d
39+
PKG_BUILD_PARALLEL:=1
40+
PKG_BUILD_DEPENDS:=iptables
41+
PKG_LICENSE:=GPL-2.0
42+
diff --git a/package/network/utils/iproute2/patches/100-configure.patch b/package/network/utils/iproute2/patches/100-configure.patch
43+
deleted file mode 100644
44+
index 2d4fb7b9b3..0000000000
45+
--- a/package/network/utils/iproute2/patches/100-configure.patch
46+
+++ /dev/null
47+
@@ -1,12 +0,0 @@
48+
---- a/configure
49+
-+++ b/configure
50+
-@@ -36,7 +36,8 @@ int main(int argc, char **argv) {
51+
- }
52+
- EOF
53+
-
54+
-- if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then
55+
-+# OpenWrt: disable ATM support even if present on host system
56+
-+ if [ 1 -eq 0 ]; then
57+
- echo "TC_CONFIG_ATM:=y" >>$CONFIG
58+
- echo yes
59+
- else
60+
diff --git a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch b/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch
61+
index 03df7809f7..c32863c364 100644
62+
--- a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch
63+
+++ b/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch
64+
@@ -1,6 +1,6 @@
65+
--- a/tc/Makefile
66+
+++ b/tc/Makefile
67+
-@@ -127,6 +127,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
68+
+@@ -119,6 +119,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
69+
ifneq ($(IPT_LIB_DIR),)
70+
CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
71+
endif
72+
diff --git a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
73+
index 2a3f9eb90f..8c70c14489 100644
74+
--- a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
75+
+++ b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
76+
@@ -1,6 +1,6 @@
77+
--- a/Makefile
78+
+++ b/Makefile
79+
-@@ -65,9 +65,9 @@ WFLAGS += -Wmissing-declarations -Wold-s
80+
+@@ -68,9 +68,9 @@ WFLAGS += -Wmissing-declarations -Wold-s
81+
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
82+
YACCFLAGS = -d -t -v
83+
84+
diff --git a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
85+
index a8cdd103ba..0d22875751 100644
86+
--- a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
87+
+++ b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
88+
@@ -1,6 +1,6 @@
89+
--- a/configure
90+
+++ b/configure
91+
-@@ -411,7 +411,7 @@ check_tirpc()
92+
+@@ -391,7 +391,7 @@ check_tirpc()
93+
94+
check_mnl()
95+
{
96+
diff --git a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
97+
index 0c5c3f59ed..bffacddb21 100644
98+
--- a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
99+
+++ b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
100+
@@ -1,6 +1,6 @@
101+
--- a/configure
102+
+++ b/configure
103+
-@@ -266,7 +266,7 @@ EOF
104+
+@@ -246,7 +246,7 @@ EOF
105+
106+
check_elf()
107+
{
108+
diff --git a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
109+
index 4cce2c3ca6..570e9c7038 100644
110+
--- a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
111+
+++ b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
112+
@@ -1,6 +1,6 @@
113+
--- a/configure
114+
+++ b/configure
115+
-@@ -469,7 +469,7 @@ EOF
116+
+@@ -449,7 +449,7 @@ EOF
117+
118+
check_cap()
119+
{
120+
diff --git a/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch b/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
121+
index 28ba7e5217..4d7fb76308 100644
122+
--- a/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
123+
+++ b/package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
124+
@@ -1,6 +1,6 @@
125+
--- a/configure
126+
+++ b/configure
127+
-@@ -398,7 +398,7 @@ check_selinux()
128+
+@@ -378,7 +378,7 @@ check_selinux()
129+
130+
check_tirpc()
131+
{
132+
diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
133+
index d0914848d5..aef51395a9 100644
134+
--- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
135+
+++ b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
136+
@@ -1,6 +1,6 @@
137+
--- a/tc/Makefile
138+
+++ b/tc/Makefile
139+
-@@ -113,7 +113,7 @@ LDLIBS += -L. -lm
140+
+@@ -106,7 +106,7 @@ LDLIBS += -L. -lm
141+
142+
ifeq ($(SHARED_LIBS),y)
143+
LDLIBS += -ldl
144+
@@ -9,7 +9,7 @@
145+
endif
146+
147+
TCLIB := tc_core.o
148+
-@@ -143,7 +143,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
149+
+@@ -135,7 +135,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
150+
all: tc $(TCSO)
151+
152+
tc: $(TCOBJ) $(LIBNETLINK) libtc.a
153+
@@ -18,15 +18,15 @@
154+
155+
libtc.a: $(TCLIB)
156+
$(QUIET_AR)$(AR) rcs $@ $^
157+
-@@ -165,6 +165,7 @@ install: all
158+
+@@ -157,6 +157,7 @@ install: all
159+
clean:
160+
rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.tab.h; \
161+
rm -f emp_ematch.tab.*
162+
+ rm -f dynsyms.list
163+
164+
- q_atm.so: q_atm.c
165+
- $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
166+
-@@ -204,4 +205,16 @@ static-syms.h: $(wildcard *.c)
167+
+ m_xt.so: m_xt.c
168+
+ $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$($(PKG_CONFIG) xtables --cflags --libs)
169+
+@@ -193,4 +194,16 @@ static-syms.h: $(wildcard *.c)
170+
sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
171+
done > $@
172+
173+
diff --git a/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
174+
index c7fceb2e22..765e4ad2e8 100644
175+
--- a/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
176+
+++ b/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch
177+
@@ -1,6 +1,6 @@
178+
--- a/configure
179+
+++ b/configure
180+
-@@ -290,7 +290,7 @@ int main(int argc, char **argv) {
181+
+@@ -270,7 +270,7 @@ int main(int argc, char **argv) {
182+
}
183+
EOF
184+
185+
@@ -9,7 +9,7 @@
186+
local ret=$?
187+
188+
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
189+
-@@ -308,7 +308,7 @@ int main(int argc, char **argv) {
190+
+@@ -288,7 +288,7 @@ int main(int argc, char **argv) {
191+
}
192+
EOF
193+
194+
diff --git a/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch b/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
195+
index 141763460d..8156adbf05 100644
196+
--- a/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
197+
+++ b/package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
198+
@@ -11,7 +11,7 @@
199+
200+
--- a/tc/Makefile
201+
+++ b/tc/Makefile
202+
-@@ -140,7 +140,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
203+
+@@ -132,7 +132,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
204+
$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
205+
206+
207+
diff --git a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
208+
index d1948860e8..92bf5cb66d 100644
209+
--- a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
210+
+++ b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
211+
@@ -1,12 +1,12 @@
212+
--- a/configure
213+
+++ b/configure
214+
-@@ -455,14 +455,8 @@ EOF
215+
+@@ -435,14 +435,8 @@ EOF
216+
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
217+
echo "no"
218+
else
219+
- if ${PKG_CONFIG} libbsd --exists; then
220+
-- echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
221+
-- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
222+
+- echo 'CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG
223+
+- echo 'LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG
224+
- echo "no"
225+
- else
226+
- echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
227+
diff --git a/package/network/utils/iproute2/patches/300-selinux-configurable.patch b/package/network/utils/iproute2/patches/300-selinux-configurable.patch
228+
index 817abf7d17..a611ba75f0 100644
229+
--- a/package/network/utils/iproute2/patches/300-selinux-configurable.patch
230+
+++ b/package/network/utils/iproute2/patches/300-selinux-configurable.patch
231+
@@ -1,6 +1,6 @@
232+
--- a/configure
233+
+++ b/configure
234+
-@@ -385,7 +385,7 @@ check_libbpf()
235+
+@@ -365,7 +365,7 @@ check_libbpf()
236+
check_selinux()
237+
# SELinux is a compile time option in the ss utility
238+
{
239+
--
240+
2.45.2
241+
242+

‎patches/openwrt/backport/0006-ethtool-update-to-6.6.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 7ba11eb0106fd681998bd378977cb28dd00b0823 Mon Sep 17 00:00:00 2001
2+
From: Nick Hainke <[email protected]>
3+
Date: Wed, 19 Jul 2023 09:08:06 +0200
4+
Subject: [PATCH] ethtool: update to 6.6
5+
6+
---
7+
package/network/utils/ethtool/Makefile | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile
11+
index 10fecd4a9c..bc2b13e423 100644
12+
--- a/package/network/utils/ethtool/Makefile
13+
+++ b/package/network/utils/ethtool/Makefile
14+
@@ -8,13 +8,13 @@
15+
include $(TOPDIR)/rules.mk
16+
17+
PKG_NAME:=ethtool
18+
-PKG_VERSION:=6.3
19+
+PKG_VERSION:=6.6
20+
PKG_RELEASE:=1
21+
22+
PKG_MAINTAINER:=Felix Fietkau <[email protected]>
23+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
24+
PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
25+
-PKG_HASH:=d9425f0a3df138734001fccc4175fe178c025f938460ac25c4ebc39960168822
26+
+PKG_HASH:=833a8493cb9cd5809ab59743092d9a38742c282290800e9626407511bbcebf9e
27+
28+
PKG_LICENSE:=GPL-2.0
29+
PKG_LICENSE_FILES:=COPYING
30+
--
31+
2.45.2
32+
33+

0 commit comments

Comments
 (0)