From mboxrd@z Thu Jan 1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] linux: Update to 5.15.46
Date: Sat, 11 Jun 2022 18:13:57 +0000
Message-ID: <cda947e2-1fca-0d9d-a77d-6e680713a658@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7115394133606812607=="
List-Id: <development.lists.ipfire.org>
--===============7115394133606812607==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.46
for the changelog of this version.
Due to operational constraints, ARM rootfile changes are simulated.
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
config/rootfiles/common/aarch64/linux | 5 +-
config/rootfiles/common/armv6l/linux | 4 +-
config/rootfiles/common/x86_64/linux | 6 +-
lfs/linux | 6 +-
...ayer7.patch =3D> linux-5.15.46-layer7.patch} | 82 +++++++++----------
5 files changed, 48 insertions(+), 55 deletions(-)
rename src/patches/linux/{linux-5.15.17-layer7.patch =3D> linux-5.15.46-laye=
r7.patch} (94%)
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/=
aarch64/linux
index a88af0a37..73177bd71 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -6878,6 +6878,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK
#lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_BRANCH_PROT_PAC_RET
@@ -7107,7 +7108,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4
-#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S_GENERIC
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305
@@ -15293,7 +15293,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h
#lib/modules/KVER-ipfire/build/include/trace/events/qla.h
#lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h
-#lib/modules/KVER-ipfire/build/include/trace/events/random.h
#lib/modules/KVER-ipfire/build/include/trace/events/rcu.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h
@@ -20520,8 +20519,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto
#lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s-generic.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz
diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/a=
rmv6l/linux
index 11da0fb3c..e8e10463c 100644
--- a/config/rootfiles/common/armv6l/linux
+++ b/config/rootfiles/common/armv6l/linux
@@ -7317,6 +7317,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK
#lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC
@@ -7569,7 +7570,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4
-#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA_GENERIC
@@ -15743,7 +15743,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h
#lib/modules/KVER-ipfire/build/include/trace/events/qla.h
#lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h
-#lib/modules/KVER-ipfire/build/include/trace/events/random.h
#lib/modules/KVER-ipfire/build/include/trace/events/rcu.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h
@@ -20739,7 +20738,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto
#lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x=
86_64/linux
index a578435d3..04e636046 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -6780,12 +6780,14 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CC_CAN_LINK_STATIC
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_OUTPUT
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_GOTO_TIED_OUTPUT
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ASM_INLINE
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_INT128
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_NO_PROFILE_FN_ATTR
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANCOV_TRACE_PC
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANE_STACKPROTECTOR
+#lib/modules/KVER-ipfire/build/include/config/CC_HAS_SLS
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_WORKING_NOSANITIZE_ADDR=
ESS
#lib/modules/KVER-ipfire/build/include/config/CC_HAS_ZERO_CALL_USED_REGS
#lib/modules/KVER-ipfire/build/include/config/CC_IS_GCC
@@ -6999,7 +7001,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_KPP2
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_AES
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_ARC4
-#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_BLAKE2S_GENERIC
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA
#lib/modules/KVER-ipfire/build/include/config/CRYPTO_LIB_CHACHA20POLY1305
@@ -15730,7 +15731,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/trace/events/qdisc.h
#lib/modules/KVER-ipfire/build/include/trace/events/qla.h
#lib/modules/KVER-ipfire/build/include/trace/events/qrtr.h
-#lib/modules/KVER-ipfire/build/include/trace/events/random.h
#lib/modules/KVER-ipfire/build/include/trace/events/rcu.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma.h
#lib/modules/KVER-ipfire/build/include/trace/events/rdma_core.h
@@ -21621,8 +21621,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/crc8.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto
#lib/modules/KVER-ipfire/kernel/lib/crypto/libarc4.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s-generic.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/crypto/libblake2s.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libchacha20poly1305.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crypto/libcurve25519-generic.ko.xz
diff --git a/lfs/linux b/lfs/linux
index d9637ef94..df3b348d4 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
=20
include Config
=20
-VER =3D 5.15.35
+VER =3D 5.15.46
ARM_PATCHES =3D 5.15-ipfire5
=20
THISAPP =3D linux-$(VER)
@@ -78,7 +78,7 @@ objects =3D$(DL_FILE) \
$(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche=
s-$(ARM_PATCHES).patch.xz
=20
-$(DL_FILE)_BLAKE2 =3D 15f1af609ae4a233dc6bdae84c1231c2335be6320ddbb9a5d76c79=
83498a9ca72c13b55cc1408dac477f707fb84df99435994c1a7eeb91396481c2f7b11ecc2e
+$(DL_FILE)_BLAKE2 =3D 26fdc4bbed153f7a5a511b7c1a804f794dd6e4b8b44d0317a4cad3=
04b2c824183fd6054b7ca94f22b3e49e22a13ec9dbd24373b628b01bdcdb5392eafe6b3dbe
arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 =3D 58a70e757a9121a0aac8360=
4a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a=
86e0371a3e896f4c7cdd699c34a0
=20
install : $(TARGET)
@@ -116,7 +116,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf linux-$(VER) $(DIR_SRC)/linux
=20
# Layer7-patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.17-la=
yer7.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15.46-la=
yer7.patch
=20
# DVB Patches
cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pl=
l.patch
diff --git a/src/patches/linux/linux-5.15.17-layer7.patch b/src/patches/linux=
/linux-5.15.46-layer7.patch
similarity index 94%
rename from src/patches/linux/linux-5.15.17-layer7.patch
rename to src/patches/linux/linux-5.15.46-layer7.patch
index 0dafa16c7..d6b46142c 100644
--- a/src/patches/linux/linux-5.15.17-layer7.patch
+++ b/src/patches/linux/linux-5.15.46-layer7.patch
@@ -1,6 +1,6 @@
-diff -Naur a/include/linux/skbuff.h b/include/linux/skbuff.h
---- a/include/linux/skbuff.h 2022-01-27 10:05:44.000000000 +0000
-+++ b/include/linux/skbuff.h 2022-01-29 08:04:32.984637671 +0000
+diff -Naur linux-5.15.46.orig/include/linux/skbuff.h linux-5.15.46/include/l=
inux/skbuff.h
+--- linux-5.15.46.orig/include/linux/skbuff.h 2022-06-11 14:51:47.639775333 =
+0000
++++ linux-5.15.46/include/linux/skbuff.h 2022-06-11 14:53:07.977494189 +0000
@@ -772,6 +772,9 @@
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
unsigned long _nfct;
@@ -11,10 +11,10 @@ diff -Naur a/include/linux/skbuff.h b/include/linux/skbuf=
f.h
unsigned int len,
data_len;
__u16 mac_len,
-diff -Naur a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf=
_conntrack.h
---- a/include/net/netfilter/nf_conntrack.h 2022-01-27 10:05:44.000000000 +00=
00
-+++ b/include/net/netfilter/nf_conntrack.h 2022-01-29 08:04:32.984637671 +00=
00
-@@ -117,6 +117,23 @@
+diff -Naur linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h linux-5.1=
5.46/include/net/netfilter/nf_conntrack.h
+--- linux-5.15.46.orig/include/net/netfilter/nf_conntrack.h 2022-06-11 14:51=
:48.471834543 +0000
++++ linux-5.15.46/include/net/netfilter/nf_conntrack.h 2022-06-11 14:53:07.9=
77494189 +0000
+@@ -119,6 +119,23 @@
/* Extensions */
struct nf_ct_ext *ext;
=20
@@ -38,9 +38,9 @@ diff -Naur a/include/net/netfilter/nf_conntrack.h b/include=
/net/netfilter/nf_con
/* Storage reserved for other modules, must be the last member */
union nf_conntrack_proto proto;
};
-diff -Naur a/include/uapi/linux/netfilter/xt_layer7.h b/include/uapi/linux/n=
etfilter/xt_layer7.h
---- a/include/uapi/linux/netfilter/xt_layer7.h 1970-01-01 00:00:00.000000000=
+0000
-+++ b/include/uapi/linux/netfilter/xt_layer7.h 2022-01-29 08:04:32.984637671=
+0000
+diff -Naur linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h linux=
-5.15.46/include/uapi/linux/netfilter/xt_layer7.h
+--- linux-5.15.46.orig/include/uapi/linux/netfilter/xt_layer7.h 1970-01-01 0=
0:00:00.000000000 +0000
++++ linux-5.15.46/include/uapi/linux/netfilter/xt_layer7.h 2022-06-11 14:53:=
07.977494189 +0000
@@ -0,0 +1,13 @@
+#ifndef _XT_LAYER7_H
+#define _XT_LAYER7_H
@@ -55,9 +55,9 @@ diff -Naur a/include/uapi/linux/netfilter/xt_layer7.h b/inc=
lude/uapi/linux/netfi
+};
+
+#endif /* _XT_LAYER7_H */
-diff -Naur a/net/netfilter/Kconfig b/net/netfilter/Kconfig
---- a/net/netfilter/Kconfig 2022-01-27 10:05:44.000000000 +0000
-+++ b/net/netfilter/Kconfig 2022-01-29 08:04:32.988637605 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/Kconfig linux-5.15.46/net/netfil=
ter/Kconfig
+--- linux-5.15.46.orig/net/netfilter/Kconfig 2022-06-11 14:51:48.599843652 +=
0000
++++ linux-5.15.46/net/netfilter/Kconfig 2022-06-11 14:53:07.977494189 +0000
@@ -1389,6 +1389,26 @@
=20
To compile it as a module, choose M here. If unsure, say N.
@@ -85,9 +85,9 @@ diff -Naur a/net/netfilter/Kconfig b/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED
-diff -Naur a/net/netfilter/Makefile b/net/netfilter/Makefile
---- a/net/netfilter/Makefile 2022-01-27 10:05:44.000000000 +0000
-+++ b/net/netfilter/Makefile 2022-01-29 08:04:32.988637605 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/Makefile linux-5.15.46/net/netfi=
lter/Makefile
+--- linux-5.15.46.orig/net/netfilter/Makefile 2022-06-11 14:51:48.599843652 =
+0000
++++ linux-5.15.46/net/netfilter/Makefile 2022-06-11 14:53:07.981494474 +0000
@@ -201,6 +201,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) +=3D xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) +=3D xt_socket.o
@@ -96,10 +96,10 @@ diff -Naur a/net/netfilter/Makefile b/net/netfilter/Makef=
ile
obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) +=3D xt_statistic.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) +=3D xt_string.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) +=3D xt_tcpmss.o
-diff -Naur a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_=
core.c
---- a/net/netfilter/nf_conntrack_core.c 2022-01-27 10:05:44.000000000 +0000
-+++ b/net/netfilter/nf_conntrack_core.c 2022-01-29 08:04:32.992637539 +0000
-@@ -636,6 +636,11 @@
+diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c linux-5.15.4=
6/net/netfilter/nf_conntrack_core.c
+--- linux-5.15.46.orig/net/netfilter/nf_conntrack_core.c 2022-06-11 14:51:48=
.599843652 +0000
++++ linux-5.15.46/net/netfilter/nf_conntrack_core.c 2022-06-11 14:53:07.9814=
94474 +0000
+@@ -648,6 +648,11 @@
*/
nf_ct_remove_expectations(ct);
=20
@@ -111,24 +111,24 @@ diff -Naur a/net/netfilter/nf_conntrack_core.c b/net/ne=
tfilter/nf_conntrack_core
nf_ct_del_from_dying_or_unconfirmed_list(ct);
=20
local_bh_enable();
-diff -Naur a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conn=
track_standalone.c
---- a/net/netfilter/nf_conntrack_standalone.c 2022-01-27 10:05:44.000000000 =
+0000
-+++ b/net/netfilter/nf_conntrack_standalone.c 2022-01-29 08:04:32.992637539 =
+0000
+diff -Naur linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c linux-=
5.15.46/net/netfilter/nf_conntrack_standalone.c
+--- linux-5.15.46.orig/net/netfilter/nf_conntrack_standalone.c 2022-06-11 14=
:51:48.603843938 +0000
++++ linux-5.15.46/net/netfilter/nf_conntrack_standalone.c 2022-06-11 14:54:2=
3.322859367 +0000
@@ -370,6 +370,11 @@
ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
ct_show_delta_time(s, ct);
=20
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_X=
T_MATCH_LAYER7_MODULE)
++ #if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_=
XT_MATCH_LAYER7_MODULE)
+ if(ct->layer7.app_proto)
+ seq_printf(s, "l7proto=3D%s ", ct->layer7.app_proto);
-+#endif
++ #endif
+
- seq_printf(s, "use=3D%u\n", atomic_read(&ct->ct_general.use));
+ seq_printf(s, "use=3D%u\n", refcount_read(&ct->ct_general.use));
=20
if (seq_has_overflowed(s))
-diff -Naur a/net/netfilter/regexp/regexp.c b/net/netfilter/regexp/regexp.c
---- a/net/netfilter/regexp/regexp.c 1970-01-01 00:00:00.000000000 +0000
-+++ b/net/netfilter/regexp/regexp.c 2022-01-29 08:04:32.992637539 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.c linux-5.15.46/ne=
t/netfilter/regexp/regexp.c
+--- linux-5.15.46.orig/net/netfilter/regexp/regexp.c 1970-01-01 00:00:00.000=
000000 +0000
++++ linux-5.15.46/net/netfilter/regexp/regexp.c 2022-06-11 14:53:07.98549475=
8 +0000
@@ -0,0 +1,1197 @@
+/*
+ * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1327,9 +1327,9 @@ diff -Naur a/net/netfilter/regexp/regexp.c b/net/netfil=
ter/regexp/regexp.c
+#endif
+
+
-diff -Naur a/net/netfilter/regexp/regexp.h b/net/netfilter/regexp/regexp.h
---- a/net/netfilter/regexp/regexp.h 1970-01-01 00:00:00.000000000 +0000
-+++ b/net/netfilter/regexp/regexp.h 2022-01-29 08:04:32.992637539 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regexp.h linux-5.15.46/ne=
t/netfilter/regexp/regexp.h
+--- linux-5.15.46.orig/net/netfilter/regexp/regexp.h 1970-01-01 00:00:00.000=
000000 +0000
++++ linux-5.15.46/net/netfilter/regexp/regexp.h 2022-06-11 14:53:07.98549475=
8 +0000
@@ -0,0 +1,41 @@
+/*
+ * Definitions etc. for regexp(3) routines.
@@ -1372,18 +1372,18 @@ diff -Naur a/net/netfilter/regexp/regexp.h b/net/netf=
ilter/regexp/regexp.h
+void regerror(char *s);
+
+#endif
-diff -Naur a/net/netfilter/regexp/regmagic.h b/net/netfilter/regexp/regmagic=
.h
---- a/net/netfilter/regexp/regmagic.h 1970-01-01 00:00:00.000000000 +0000
-+++ b/net/netfilter/regexp/regmagic.h 2022-01-29 08:04:32.992637539 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regmagic.h linux-5.15.46/=
net/netfilter/regexp/regmagic.h
+--- linux-5.15.46.orig/net/netfilter/regexp/regmagic.h 1970-01-01 00:00:00.0=
00000000 +0000
++++ linux-5.15.46/net/netfilter/regexp/regmagic.h 2022-06-11 14:53:07.985494=
758 +0000
@@ -0,0 +1,5 @@
+/*
+ * The first byte of the regexp internal "program" is actually this magic
+ * number; the start node begins in the second byte.
+ */
+#define MAGIC 0234
-diff -Naur a/net/netfilter/regexp/regsub.c b/net/netfilter/regexp/regsub.c
---- a/net/netfilter/regexp/regsub.c 1970-01-01 00:00:00.000000000 +0000
-+++ b/net/netfilter/regexp/regsub.c 2022-01-29 08:04:32.992637539 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/regexp/regsub.c linux-5.15.46/ne=
t/netfilter/regexp/regsub.c
+--- linux-5.15.46.orig/net/netfilter/regexp/regsub.c 1970-01-01 00:00:00.000=
000000 +0000
++++ linux-5.15.46/net/netfilter/regexp/regsub.c 2022-06-11 14:53:07.98549475=
8 +0000
@@ -0,0 +1,95 @@
+/*
+ * regsub
@@ -1480,9 +1480,9 @@ diff -Naur a/net/netfilter/regexp/regsub.c b/net/netfil=
ter/regexp/regsub.c
+ }
+ *dst++ =3D '\0';
+}
-diff -Naur a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
---- a/net/netfilter/xt_layer7.c 1970-01-01 00:00:00.000000000 +0000
-+++ b/net/netfilter/xt_layer7.c 2022-01-29 08:04:32.992637539 +0000
+diff -Naur linux-5.15.46.orig/net/netfilter/xt_layer7.c linux-5.15.46/net/ne=
tfilter/xt_layer7.c
+--- linux-5.15.46.orig/net/netfilter/xt_layer7.c 1970-01-01 00:00:00.0000000=
00 +0000
++++ linux-5.15.46/net/netfilter/xt_layer7.c 2022-06-11 14:53:07.985494758 +0=
000
@@ -0,0 +1,666 @@
+/*
+ Kernel module to match application layer (OSI layer 7) data in connection=
s.
--=20
2.35.3
--===============7115394133606812607==--