diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 5add7644124ef0..64d6af5b805fe9 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ LINUX_VERSION-5.19 = -LINUX_KERNEL_HASH-5.19 = 11614fc737638f693d02bf0d95422dfe2b3bcf3088196cd1c4c799cfdf675b70 +LINUX_KERNEL_HASH-5.19 = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index dad7322e1135a2..c96e45cbcd2d38 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -109,9 +109,9 @@ define KernelPackage/fs-cifs +kmod-crypto-ccm \ +kmod-crypto-ecb \ +kmod-crypto-des \ - +(LINUX_5_15||LINUX_5_18):kmod-asn1-decoder \ - +(LINUX_5_15||LINUX_5_18):kmod-oid-registry \ - +(LINUX_5_15||LINUX_5_18):kmod-dnsresolver + +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-decoder \ + +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-oid-registry \ + +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-dnsresolver endef define KernelPackage/fs-cifs/description @@ -530,7 +530,7 @@ $(eval $(call KernelPackage,fs-ntfs)) define KernelPackage/fs-ntfs3 SUBMENU:=$(FS_MENU) TITLE:=NTFS3 Read-Write file system support - DEPENDS:=@(LINUX_5_15||LINUX_5_18) +kmod-nls-base + DEPENDS:=@(LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-nls-base KCONFIG:= \ CONFIG_NTFS3_FS \ CONFIG_NTFS3_64BIT_CLUSTER=y \ diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 5475dfd1531327..b86ec9c9b97ff2 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -142,7 +142,7 @@ $(eval $(call KernelPackage,mii)) define KernelPackage/mdio-devres SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Supports MDIO device registration - DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_18) +kmod-libphy PACKAGE_kmod-of-mdio:kmod-of-mdio + DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-libphy PACKAGE_kmod-of-mdio:kmod-of-mdio KCONFIG:=CONFIG_MDIO_DEVRES HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko @@ -563,7 +563,7 @@ $(eval $(call KernelPackage,8139cp)) define KernelPackage/r8169 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support - DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_5_18):kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres KCONFIG:= \ CONFIG_R8169 \ CONFIG_R8169_NAPI=y \ @@ -689,7 +689,7 @@ $(eval $(call KernelPackage,igbvf)) define KernelPackage/ixgbe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support - DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18):kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres KCONFIG:=CONFIG_IXGBE \ CONFIG_IXGBE_VXLAN=n \ CONFIG_IXGBE_HWMON=y \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 03bb4d164594fc..030e6767c4f3cf 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1151,8 +1151,8 @@ $(eval $(call KernelPackage,keys-trusted)) define KernelPackage/tpm SUBMENU:=$(OTHER_MENU) TITLE:=TPM Hardware Support - DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_5_18):kmod-asn1-decoder \ - +(LINUX_5_15||LINUX_5_18):kmod-asn1-encoder +(LINUX_5_15||LINUX_5_18):kmod-oid-registry + DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-decoder \ + +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-encoder +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-oid-registry KCONFIG:= CONFIG_TCG_TPM FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko AUTOLOAD:=$(call AutoLoad,10,tpm,1) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 918d87c6694a9c..6f97c55b740c2b 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1138,7 +1138,7 @@ $(eval $(call KernelPackage,usb-net-aqc111)) define KernelPackage/usb-net-asix TITLE:=Kernel module for USB-to-Ethernet Asix convertors - DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_5_18):kmod-mdio-devres + DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres KCONFIG:=CONFIG_USB_NET_AX8817X FILES:= \ $(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko \ diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 8baf3fc74f5be5..8675253bf580d0 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -244,7 +244,7 @@ define KernelPackage/drm TITLE:=Direct Rendering Manager (DRM) support HIDDEN:=1 DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \ - +(LINUX_5_15||LINUX_5_18):kmod-fb + +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-fb KCONFIG:= \ CONFIG_DRM \ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \ diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 5a6c5d5ceaf87f..b0e100673cb105 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl -PKG_VERSION:=5.3.0-stable +PKG_VERSION:=5.4.0-stable PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) -PKG_HASH:=1a3bb310dc01d3e73d9ad91b6ea8249d081016f8eef4ae8f21d3421f91ef1de9 +PKG_HASH:=dc36cc19dad197253e5c2ecaa490c7eef579ad448706e55d73d79396e814098b PKG_FIXUP:=libtool libtool-abiver PKG_INSTALL:=1 diff --git a/package/libs/wolfssl/patches/100-disable-hardening-check.patch b/package/libs/wolfssl/patches/100-disable-hardening-check.patch index 7e473b390bb2c7..d3ad2e27bc3e35 100644 --- a/package/libs/wolfssl/patches/100-disable-hardening-check.patch +++ b/package/libs/wolfssl/patches/100-disable-hardening-check.patch @@ -1,6 +1,6 @@ --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h -@@ -2338,7 +2338,7 @@ extern void uITRON4_free(void *p) ; +@@ -2442,7 +2442,7 @@ extern void uITRON4_free(void *p) ; #endif /* warning for not using harden build options (default with ./configure) */ diff --git a/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch b/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch new file mode 100644 index 00000000000000..4b56c1568afe5c --- /dev/null +++ b/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch @@ -0,0 +1,23 @@ +From dc92ec2aa9cb76b782bdba3fc5203267ebf39994 Mon Sep 17 00:00:00 2001 +From: Kareem +Date: Fri, 22 Jul 2022 11:07:46 -0700 +Subject: [PATCH] Update sp_rand_prime's preprocessor gating to match + wolfSSL_BN_generate_prime_ex's. + +--- + wolfcrypt/src/sp_int.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/wolfcrypt/src/sp_int.c ++++ b/wolfcrypt/src/sp_int.c +@@ -15647,8 +15647,8 @@ int sp_radix_size(sp_int* a, int radix, + * Prime number generation and checking. + ***************************************/ + +-#if defined(WOLFSSL_KEY_GEN) && (!defined(NO_DH) || !defined(NO_DSA)) && \ +- !defined(WC_NO_RNG) ++#if defined(WOLFSSL_KEY_GEN) && (!defined(NO_RSA) || !defined(NO_DH) || \ ++ !defined(NO_DSA)) && !defined(WC_NO_RNG) + /* Generate a random prime for RSA only. + * + * @param [out] r SP integer to hold result. diff --git a/package/libs/wolfssl/patches/200-ecc-rng.patch b/package/libs/wolfssl/patches/200-ecc-rng.patch index f1f156a8aeace5..2e09e6d273e39e 100644 --- a/package/libs/wolfssl/patches/200-ecc-rng.patch +++ b/package/libs/wolfssl/patches/200-ecc-rng.patch @@ -11,7 +11,7 @@ RNG regardless of the built settings for wolfssl. --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c -@@ -11655,21 +11655,21 @@ void wc_ecc_fp_free(void) +@@ -12288,21 +12288,21 @@ void wc_ecc_fp_free(void) #endif /* FP_ECC */ diff --git a/package/libs/wolfssl/patches/300-AESNI-fix-configure-to-use-minimal-compiler-flags.patch b/package/libs/wolfssl/patches/300-AESNI-fix-configure-to-use-minimal-compiler-flags.patch deleted file mode 100644 index d65a117d1ef4a9..00000000000000 --- a/package/libs/wolfssl/patches/300-AESNI-fix-configure-to-use-minimal-compiler-flags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9ba77300f9f5dea9f53aed00bf6c33d10b7b2fce Mon Sep 17 00:00:00 2001 -From: Sean Parkinson -Date: Thu, 7 Jul 2022 09:30:48 +1000 -Subject: [PATCH] AESNI: fix configure to use minimal compiler flags - - -diff --git a/configure.ac b/configure.ac -index df97ac75c..6abb0c744 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2142,21 +2142,19 @@ then - if test "$ENABLED_AESNI" = "yes" || test "$ENABLED_INTELASM" = "yes" - then - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AESNI" -- if test "$GCC" = "yes" -+ if test "$CC" != "icc" - then -- # clang needs these flags -- if test "$CC" = "clang" -- then -- AM_CFLAGS="$AM_CFLAGS -maes -mpclmul" -- else -- # GCC needs these flags, icc doesn't -- # opt levels greater than 2 may cause problems on systems w/o -- # aesni -- if test "$CC" != "icc" -- then -- AM_CFLAGS="$AM_CFLAGS -maes -msse4 -mpclmul" -- fi -- fi -+ case $host_os in -+ mingw*) -+ # Windows uses intrinsics for GCM which uses SSE4 instructions. -+ # MSVC has own build files. -+ AM_CFLAGS="$AM_CFLAGS -maes -msse4 -mpclmul" -+ ;; -+ *) -+ # Intrinsics used in AES_set_decrypt_key (TODO: rework) -+ AM_CFLAGS="$AM_CFLAGS -maes" -+ ;; -+ esac - fi - AS_IF([test "x$ENABLED_AESGCM" != "xno"],[AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_AESGCM"]) - fi diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 1ed83ca13cdc5b..02cc36a8700139 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -11,7 +11,7 @@ FEATURES:=squashfs vdi vmdk vhdx pcmcia fpu boot-part rootfs-part SUBTARGETS:=64 generic legacy geode KERNEL_PATCHVER:=5.15 -KERNEL_TESTING_PATCHVER:=5.19 +KERNEL_TESTING_PATCHVER:=5.18 KERNELNAME:=bzImage diff --git a/tools/7z/Makefile b/tools/7z/Makefile index c94d746c6489ec..90362e79779f92 100644 --- a/tools/7z/Makefile +++ b/tools/7z/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=7z -PKG_VERSION:=22.00 -PKG_SOURCE_VERSION:=2200 +PKG_VERSION:=22.01 +PKG_SOURCE_VERSION:=2201 PKG_SOURCE:=$(PKG_NAME)$(PKG_SOURCE_VERSION)-src.tar.xz PKG_SOURCE_URL:=https://7-zip.org/a/ -PKG_HASH:=40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675 +PKG_HASH:=393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5 # This builds the 7zr variant which supports only 7z, so no non-LGPL code should be included PKG_LICENSE:=LGPL-2.1-or-later