Skip to content

Commit 43c7eae

Browse files
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.15 to 5.15.64 samba36: fix autoshare CVE autosamba: use samba4 bydefault toolchain: binutils: add support for version 2.39
2 parents 24176b0 + 0321612 commit 43c7eae

12 files changed

+78
-73
lines changed

include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .63
2-
LINUX_KERNEL_HASH-5.15.63 = 6dd3cd1e5a629d0002bc6c6ec7e8ea96710104f38664122dd56c83dfd4eb7341
1+
LINUX_VERSION-5.15 = .64
2+
LINUX_KERNEL_HASH-5.15.64 = c6a1d38c6fa3798341372d5cf0088ae806ccdc827e31ecbff8988e097ba5de50

package/lean/autosamba/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
1717
define Package/autosamba
1818
TITLE:=Samba autoconfig hotplug script.
1919
MAINTAINER:=Lean
20-
DEPENDS:=+luci-app-samba +wsdd2
20+
DEPENDS:=+luci-app-samba4 +wsdd2
2121
endef
2222

2323
define Package/autosamba/description
@@ -28,6 +28,8 @@ define Build/Compile
2828
endef
2929

3030
define Package/autosamba/install
31+
$(INSTALL_DIR) $(1)/etc/hotplug.d/block
32+
$(INSTALL_BIN) ./files/20-smb $(1)/etc/hotplug.d/block/20-smb
3133
endef
3234

3335
$(eval $(call BuildPackage,autosamba))

package/network/services/samba36/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=samba
1111
PKG_VERSION:=4.0.26
12-
PKG_RELEASE:=8
12+
PKG_RELEASE:=9
1313

1414
PKG_SOURCE_URL:=https://ftp.samba.org/pub/samba/stable/
1515
PKG_SOURCE:=samba-$(PKG_VERSION).tar.gz

package/network/services/samba36/files/smb.auto

+55-53
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
#!/bin/sh
2-
#
3-
# D-Team Technology Co.,Ltd. ShenZhen
4-
# 作者:Vic
5-
#
2+
3+
#
4+
# D-Team Technology Co.,Ltd. ShenZhen
5+
# 作者:Vic
66
#
77
# 警告:对着屏幕的哥们,我们允许你使用此脚本,但不允许你抹去作者的信息,请保留这段话。
88
#
9+
910
. /lib/functions.sh
1011
. /lib/functions/service.sh
1112

1213
global=0
1314
config_file="/etc/config/samba"
1415

1516
wait_for_init() {
16-
for i in `seq 30`
17-
do
18-
[ -e /tmp/procd.done ] || {
19-
sleep 1; continue;
20-
}
21-
return
22-
done
17+
for i in `seq 30`
18+
do
19+
[ -e /tmp/procd.done ] || {
20+
sleep 1; continue;
21+
}
22+
return
23+
done
2324
}
2425

2526
smb_handle() {
26-
config_get path $1 path
27-
if [ "$path" = "$2" ] ;then
28-
global=1
29-
fi
27+
config_get path $1 path
28+
if [ "$path" = "$2" ] ;then
29+
global=1
30+
fi
3031
}
3132

3233
chk_en() {
33-
config_get_bool autoshare $1 autoshare 0
34+
config_get_bool autoshare $1 autoshare 1
3435
[ $autoshare -eq 0 ] && exit
3536
}
3637

@@ -41,56 +42,57 @@ device=`basename $DEVPATH`
4142

4243
case "$ACTION" in
4344
add)
44-
45-
case "$device" in
46-
sd*) ;;
47-
md*) ;;
48-
hd*);;
49-
mmcblk*);;
50-
*) return;;
51-
esac
52-
53-
path="/dev/$device"
54-
55-
wait_for_init
56-
57-
cat /proc/mounts | while read j
58-
do
59-
str=${j%% *}
60-
if [ "$str" == $path ];then
61-
strr=${j#* }
62-
target=${strr%% *}
63-
global=0
64-
config_foreach smb_handle sambashare $target
65-
name=${target#*/mnt/}
66-
67-
if [ $global -eq 0 ] ;then
68-
echo -e "\n\nconfig sambashare" >> $config_file
69-
echo -e "\toption auto '1'" >> $config_file
70-
echo -e "\toption name '$name'" >> $config_file
71-
echo -e "\toption path '$target'" >> $config_file
72-
echo -e "\toption read_only 'no'" >> $config_file
73-
echo -e "\toption guest_ok 'yes'" >> $config_file
74-
echo -e "\toption device '$device'" >> $config_file
45+
46+
case "$device" in
47+
sd*);;
48+
md*);;
49+
hd*);;
50+
mmcblk*);;
51+
*) return;;
52+
esac
53+
54+
path="/dev/$device"
55+
56+
wait_for_init
57+
58+
cat /proc/mounts | grep -v '/boot\|/opt|p1' | while read j
59+
do
60+
str=${j%% *}
61+
if [ "$str" == $path ];then
62+
strr=${j#* }
63+
target=${strr%% *}
64+
global=0
65+
config_foreach smb_handle sambashare $target
66+
name=${target#*/mnt/}
67+
68+
if [ $global -eq 0 ] ;then
69+
echo -e "\n\nconfig sambashare" >> $config_file
70+
echo -e "\toption auto '1'" >> $config_file
71+
echo -e "\toption name '$name'" >> $config_file
72+
echo -e "\toption path '$target'" >> $config_file
73+
echo -e "\toption read_only 'no'" >> $config_file
74+
echo -e "\toption guest_ok 'yes'" >> $config_file
75+
echo -e "\toption create_mask '0666'" >> $config_file
76+
echo -e "\toption dir_mask '0777'" >> $config_file
77+
echo -e "\toption device '$device'" >> $config_file
7578
/etc/init.d/samba reload
7679
return
77-
fi
78-
fi
79-
done
80+
fi
81+
fi
82+
done
8083
;;
84+
8185
remove)
8286
i=0
8387
while true
8488
do
85-
8689
dev=`uci get samba.@sambashare[$i].device`
8790
[ $? -ne 0 ] && break
88-
91+
8992
[ "$dev" = "$device" ] && {
9093
auto=`uci get samba.@sambashare[$i].auto`
9194
[ $auto = "1" ] && {
9295
mount_dir=`uci get samba.@sambashare[$i].name`
93-
rm -rf /mnt/$device /mnt/$mount_dir
9496
uci delete samba.@sambashare[$i]
9597
uci commit
9698
/etc/init.d/samba reload

target/linux/generic/backport-5.15/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
1010

1111
--- a/net/netfilter/nf_flow_table_core.c
1212
+++ b/net/netfilter/nf_flow_table_core.c
13-
@@ -608,13 +608,41 @@ void nf_flow_table_free(struct nf_flowta
13+
@@ -613,13 +613,41 @@ void nf_flow_table_free(struct nf_flowta
1414
}
1515
EXPORT_SYMBOL_GPL(nf_flow_table_free);
1616

target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
233233
static inline void
234234
--- a/include/linux/netdevice.h
235235
+++ b/include/linux/netdevice.h
236-
@@ -849,6 +849,7 @@ enum net_device_path_type {
236+
@@ -863,6 +863,7 @@ enum net_device_path_type {
237237
DEV_PATH_BRIDGE,
238238
DEV_PATH_PPPOE,
239239
DEV_PATH_DSA,
240240
+ DEV_PATH_MTK_WDMA,
241241
};
242242

243243
struct net_device_path {
244-
@@ -874,6 +875,12 @@ struct net_device_path {
244+
@@ -888,6 +889,12 @@ struct net_device_path {
245245
int port;
246246
u16 proto;
247247
} dsa;

target/linux/generic/hack-5.15/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
821821
}
822822
+EXPORT_SYMBOL_GPL(nf_flow_table_iterate);
823823

824-
static void nf_flow_offload_work_gc(struct work_struct *work)
824+
void nf_flow_table_gc_run(struct nf_flowtable *flow_table)
825825
{
826826
--- /dev/null
827827
+++ b/include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h
@@ -845,7 +845,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
845845
+#endif /* _XT_FLOWOFFLOAD_H */
846846
--- a/include/net/netfilter/nf_flow_table.h
847847
+++ b/include/net/netfilter/nf_flow_table.h
848-
@@ -275,6 +275,11 @@ void nf_flow_table_free(struct nf_flowta
848+
@@ -276,6 +276,11 @@ void nf_flow_table_free(struct nf_flowta
849849

850850
void flow_offload_teardown(struct flow_offload *flow);
851851

target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1919

2020
--- a/include/linux/netdevice.h
2121
+++ b/include/linux/netdevice.h
22-
@@ -1655,6 +1655,10 @@ enum netdev_priv_flags {
22+
@@ -1669,6 +1669,10 @@ enum netdev_priv_flags {
2323
IFF_TX_SKB_NO_LINEAR = BIT_ULL(31),
2424
};
2525

@@ -30,23 +30,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
3030
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
3131
#define IFF_EBRIDGE IFF_EBRIDGE
3232
#define IFF_BONDING IFF_BONDING
33-
@@ -1687,6 +1691,7 @@ enum netdev_priv_flags {
33+
@@ -1701,6 +1705,7 @@ enum netdev_priv_flags {
3434
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
3535
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
3636
#define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR
3737
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN
3838

3939
/* Specifies the type of the struct net_device::ml_priv pointer */
4040
enum netdev_ml_priv_type {
41-
@@ -1988,6 +1993,7 @@ struct net_device {
41+
@@ -2002,6 +2007,7 @@ struct net_device {
4242
/* Read-mostly cache-line for fast-path access */
4343
unsigned int flags;
4444
unsigned int priv_flags;
4545
+ unsigned int extra_priv_flags;
4646
const struct net_device_ops *netdev_ops;
4747
int ifindex;
4848
unsigned short gflags;
49-
@@ -2048,6 +2054,11 @@ struct net_device {
49+
@@ -2062,6 +2068,11 @@ struct net_device {
5050
const struct tlsdev_ops *tlsdev_ops;
5151
#endif
5252

@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
5858
const struct header_ops *header_ops;
5959

6060
unsigned char operstate;
61-
@@ -2122,6 +2133,10 @@ struct net_device {
61+
@@ -2136,6 +2147,10 @@ struct net_device {
6262
struct mctp_dev __rcu *mctp_ptr;
6363
#endif
6464

target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
2222
#include <linux/crc32.h>
2323
#include <linux/if_vlan.h>
2424
#include <linux/uaccess.h>
25-
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
25+
@@ -6861,6 +6862,22 @@ static void rtl_tally_reset(struct r8152
2626
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
2727
}
2828

@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
4545
static void r8152b_init(struct r8152 *tp)
4646
{
4747
u32 ocp_data;
48-
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
48+
@@ -6902,6 +6919,8 @@ static void r8152b_init(struct r8152 *tp
4949
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
5050
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
5151
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
5454
}
5555

5656
static void r8153_init(struct r8152 *tp)
57-
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
57+
@@ -7042,6 +7061,8 @@ static void r8153_init(struct r8152 *tp)
5858
tp->coalesce = COALESCE_SLOW;
5959
break;
6060
}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
6363
}
6464

6565
static void r8153b_init(struct r8152 *tp)
66-
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
66+
@@ -7124,6 +7145,8 @@ static void r8153b_init(struct r8152 *tp
6767
rtl_tally_reset(tp);
6868

6969
tp->coalesce = 15000; /* 15 us */

target/linux/generic/hack-5.15/902-debloat_proc.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
330330

331331
--- a/net/core/sock.c
332332
+++ b/net/core/sock.c
333-
@@ -3855,6 +3855,8 @@ static __net_initdata struct pernet_oper
333+
@@ -3857,6 +3857,8 @@ static __net_initdata struct pernet_oper
334334

335335
static int __init proto_init(void)
336336
{

target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1111

1212
--- a/include/linux/netdevice.h
1313
+++ b/include/linux/netdevice.h
14-
@@ -2075,6 +2075,8 @@ struct net_device {
14+
@@ -2089,6 +2089,8 @@ struct net_device {
1515
struct netdev_hw_addr_list mc;
1616
struct netdev_hw_addr_list dev_addrs;
1717

toolchain/binutils/Config.version

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ config BINUTILS_VERSION
2828
default "2.36.1" if BINUTILS_VERSION_2_36_1
2929
default "2.37" if BINUTILS_VERSION_2_37
3030
default "2.38" if BINUTILS_VERSION_2_38
31+
default "2.39" if BINUTILS_VERSION_2_39

0 commit comments

Comments
 (0)