aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/kernel/linux/modules/crypto.mk9
-rw-r--r--toolchain/musl/patches/400-fix_quoted_timezone.patch11
2 files changed, 15 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index cc62f2cc27..f11ebd931a 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -123,12 +123,11 @@ $(eval $(call KernelPackage,crypto-rng))
define KernelPackage/crypto-iv
TITLE:=CryptoAPI initialization vectors
DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq
- KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 CONFIG_CRYPTO_ECHAINIV
+ KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2
FILES:= \
- $(LINUX_DIR)/crypto/eseqiv.ko \
- $(LINUX_DIR)/crypto/chainiv.ko \
- $(LINUX_DIR)/crypto/echainiv.ko@ge4.3
- AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv echainiv@ge4.3)
+ $(LINUX_DIR)/crypto/eseqiv.ko@lt4.8 \
+ $(LINUX_DIR)/crypto/chainiv.ko@lt4.8
+ AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv)
$(call AddDepends/crypto)
endef
diff --git a/toolchain/musl/patches/400-fix_quoted_timezone.patch b/toolchain/musl/patches/400-fix_quoted_timezone.patch
new file mode 100644
index 0000000000..79afa4a63b
--- /dev/null
+++ b/toolchain/musl/patches/400-fix_quoted_timezone.patch
@@ -0,0 +1,11 @@
+--- a/src/time/__tz.c
++++ b/src/time/__tz.c
+@@ -87,7 +87,7 @@
+ int i;
+ if (**p == '<') {
+ ++*p;
+- for (i=0; **p!='>' && i<TZNAME_MAX; i++)
++ for (i=0; (*p)[i]!='>' && i<TZNAME_MAX; i++)
+ d[i] = (*p)[i];
+ ++*p;
+ } else {