From e56bd418c1f23ffac8d2a4205b20e8e48d3f98af Mon Sep 17 00:00:00 2001 From: mjyhj <22577418+mjyhj@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:28:55 +0800 Subject: [PATCH 1/3] luci-app-diskman: bump to 0.2.7 (#4144) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit partition: automatic FIX GPT PARTITION TABLE while create partition 当硬盘分区表为GPT时，硬盘容量与GPT分区表不对应（使用DD刷入gpt镜像，或者调整RAID分区大小后），自动修复分区表，修复上述情况下无法创建新分区的BUG --- package/lean/luci-app-diskman/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/luci-app-diskman/Makefile b/package/lean/luci-app-diskman/Makefile index 7cf72229c5..a7c878b175 100644 --- a/package/lean/luci-app-diskman/Makefile +++ b/package/lean/luci-app-diskman/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-diskman -PKG_VERSION:=v0.2.5 +PKG_VERSION:=v0.2.7 PKG_RELEASE:=beta PKG_MAINTAINER:=lisaac PKG_LICENSE:=AGPL-3.0 From 9a65c3ef74295054aced5fcbf06bd64d1906e740 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:29:45 +0800 Subject: [PATCH 2/3] treewide: revert use new procd sysupgrade variable (#4139) --- .../ath79/generic/base-files/lib/upgrade/platform.sh | 4 ++-- .../linux/bcm27xx/base-files/lib/upgrade/platform.sh | 6 +++--- .../mt7623/base-files/lib/upgrade/platform.sh | 2 +- .../linux/mvebu/base-files/lib/preinit/79_move_config | 2 +- .../mvebu/base-files/lib/preinit/81_linksys_syscfg | 8 ++++---- target/linux/mvebu/base-files/lib/preinit/82_uDPU | 6 +++--- target/linux/mvebu/base-files/lib/upgrade/linksys.sh | 2 +- target/linux/mvebu/base-files/lib/upgrade/platform.sh | 11 ++++++----- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 4 ++-- target/linux/mvebu/base-files/lib/upgrade/uDPU.sh | 4 ++-- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh index 10756abbaf..598f301e5b 100644 --- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ redboot_fis_do_upgrade() { if [ "$magic" = "4349" ]; then local kern_length=0x$(dd if="$sysup_file" bs=2 skip=1 count=4 2>/dev/null) - [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP" + [ -f "$CONF_TAR" ] && append="-j $CONF_TAR" dd if="$sysup_file" bs=64k skip=1 2>/dev/null | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs @@ -22,7 +22,7 @@ redboot_fis_do_upgrade() { local board_dir=$(tar tf $sysup_file | grep -m 1 '^sysupgrade-.*/$') local kern_length=$(tar xf $sysup_file ${board_dir}kernel -O | wc -c) - [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP" + [ -f "$CONF_TAR" ] && append="-j $CONF_TAR" tar xf $sysup_file ${board_dir}kernel ${board_dir}root -O | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh index 811355b8f7..37e479272b 100644 --- a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh @@ -45,7 +45,7 @@ platform_do_upgrade() { sync - if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then + if [ "$SAVE_PARTITIONS" = "1" ]; then get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image @@ -91,8 +91,8 @@ platform_copy_config() { if export_partdevice partdev 1; then mkdir -p /boot [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot - cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" - tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt + cp -af "$CONF_TAR" /boot/ + tar -C / -zxvf "$CONF_TAR" boot/config.txt sync unmount /boot fi diff --git a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh index 225fec0bca..dc378144c4 100755 --- a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh @@ -54,7 +54,7 @@ platform_check_image() { platform_copy_config_emmc() { mkdir -p /recovery mount -o rw,noatime /dev/mmcblk0p1 /recovery - cp -af "$UPGRADE_BACKUP" "/recovery/$BACKUP_FILE" + cp -af "$CONF_TAR" "/recovery/$CONF_TAR" sync umount /recovery } diff --git a/target/linux/mvebu/base-files/lib/preinit/79_move_config b/target/linux/mvebu/base-files/lib/preinit/79_move_config index 195be0e137..640fb5cdad 100644 --- a/target/linux/mvebu/base-files/lib/preinit/79_move_config +++ b/target/linux/mvebu/base-files/lib/preinit/79_move_config @@ -18,7 +18,7 @@ move_config() { esac mkdir -p /boot mount -o rw,noatime "/dev/$partdev" /boot - [ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" / + [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / umount /boot fi } diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg index 83448e5ace..9b6e3f32a0 100644 --- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg +++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg @@ -22,12 +22,12 @@ preinit_mount_syscfg() { fi mkdir /tmp/syscfg mount -t ubifs ubi1:syscfg /tmp/syscfg - [ -f "/tmp/syscfg/$BACKUP_FILE" ] && { + [ -f /tmp/syscfg/sysupgrade.tgz ] && { echo "- config restore -" cd / - mv "/tmp/syscfg/$BACKUP_FILE" /tmp - tar xzf "/tmp/$BACKUP_FILE" - rm -f "/tmp/$BACKUP_FILE" + mv /tmp/syscfg/sysupgrade.tgz /tmp + tar xzf /tmp/sysupgrade.tgz + rm -f /tmp/sysupgrade.tgz sync } ;; diff --git a/target/linux/mvebu/base-files/lib/preinit/82_uDPU b/target/linux/mvebu/base-files/lib/preinit/82_uDPU index 12bbfc3725..c73e839ab1 100644 --- a/target/linux/mvebu/base-files/lib/preinit/82_uDPU +++ b/target/linux/mvebu/base-files/lib/preinit/82_uDPU @@ -15,10 +15,10 @@ preinit_mount_udpu() { if [ -b "${mmcdev}p4" ]; then mkdir /misc mount -t f2fs ${mmcdev}p4 /misc - [ -f "/misc/$BACKUP_FILE" ] && { + [ -f /misc/sysupgrade.tgz ] && { echo "- Restoring configuration files -" - tar xzf "/misc/$BACKUP_FILE" -C / - rm -f "/misc/$BACKUP_FILE" + tar xzf /misc/sysupgrade.tgz -C / + rm -f /misc/sysupgrade.tgz sync } [ -f "/misc/firmware/recovery.itb" ] && { diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh index 6ccfdd0768..ddf24836bc 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh @@ -93,6 +93,6 @@ platform_do_upgrade_linksys() { } platform_copy_config_linksys() { - cp -f "$UPGRADE_BACKUP" "/tmp/syscfg/$BACKUP_FILE" + cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz sync } diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 0223b72d71..32f1b8e41c 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -11,7 +11,7 @@ platform_check_image() { case "$(board_name)" in cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_check_image_sdcard "$1" + platform_check_image_sdcard "$ARGV" ;; *) return 0 @@ -22,20 +22,21 @@ platform_check_image() { platform_do_upgrade() { case "$(board_name)" in linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) - platform_do_upgrade_linksys "$1" + platform_do_upgrade_linksys "$ARGV" ;; cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_do_upgrade_sdcard "$1" + platform_do_upgrade_sdcard "$ARGV" ;; methode,udpu) - platform_do_upgrade_uDPU "$1" + platform_do_upgrade_uDPU "$ARGV" ;; *) - default_do_upgrade "$1" + default_do_upgrade "$ARGV" ;; esac } + platform_copy_config() { case "$(board_name)" in linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 184803a50f..5ca5e71fe7 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -49,7 +49,7 @@ platform_do_upgrade_sdcard() { sync - if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then + if [ "$SAVE_PARTITIONS" = "1" ]; then get_partitions "/dev/$diskdev" bootdisk #extract the boot sector from the image @@ -106,7 +106,7 @@ platform_copy_config_sdcard() { if export_partdevice partdev 1; then mkdir -p /boot [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot - cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" + cp -af "$CONF_TAR" /boot/ sync umount /boot fi diff --git a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh index 032c706605..bac67a44d2 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh @@ -149,8 +149,8 @@ platform_do_upgrade_uDPU() { platform_copy_config_uDPU() { # Config is saved on the /misc partition and copied on the rootfs after the reboot - if [ -f "$UPGRADE_BACKUP" ]; then - cp -f "$UPGRADE_BACKUP" "/misc/$BACKUP_FILE" + if [ -f /tmp/sysupgrade.tgz ]; then + cp -f /tmp/sysupgrade.tgz /misc/ sync fi } From 78bec3e9f0891d8bcb6e2ecdf808e1a6f70788ba Mon Sep 17 00:00:00 2001 From: CN_SZTL <22235437+1715173329@users.noreply.github.com> Date: Fri, 3 Apr 2020 09:10:54 +0800 Subject: [PATCH 3/3] openssl: bump to 1.1.1f (#4153) --- package/libs/openssl/Makefile | 12 +-- ...t-Detect-EOF-while-reading-in-libssl.patch | 80 ------------------- 2 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 package/libs/openssl/patches/200-Partially-revert-Detect-EOF-while-reading-in-libssl.patch diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 4357417f81..e2f2661566 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.1.1 -PKG_BUGFIX:=e +PKG_BUGFIX:=f PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_USE_MIPS16:=0 ENGINES_DIR=engines-1.1 @@ -19,12 +19,12 @@ PKG_BUILD_PARALLEL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ - http://www.openssl.org/source/ \ - http://www.openssl.org/source/old/$(PKG_BASE)/ \ http://ftp.fi.muni.cz/pub/openssl/source/ \ http://ftp.linux.hr/pub/openssl/source/ \ - ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ -PKG_HASH:=694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe + ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ + http://www.openssl.org/source/ \ + http://www.openssl.org/source/old/$(PKG_BASE)/ +PKG_HASH:=186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/openssl/patches/200-Partially-revert-Detect-EOF-while-reading-in-libssl.patch b/package/libs/openssl/patches/200-Partially-revert-Detect-EOF-while-reading-in-libssl.patch deleted file mode 100644 index c269dff07c..0000000000 --- a/package/libs/openssl/patches/200-Partially-revert-Detect-EOF-while-reading-in-libssl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 30d190caf311d534867df97e26b552e628cb7d85 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz -Date: Wed, 25 Mar 2020 14:15:31 +0100 -Subject: [PATCH] Partially revert "Detect EOF while reading in libssl" - -This partially reverts commit db943f43a60d1b5b1277e4b5317e8f288e7a0a3a. - -Reviewed-by: Matt Caswell -(Merged from https://github.com/openssl/openssl/pull/11400) - -diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt -index f5324c6819..35512f9caf 100644 ---- a/crypto/err/openssl.txt -+++ b/crypto/err/openssl.txt -@@ -2852,7 +2852,6 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines - SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines - SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message - SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data --SSL_R_UNEXPECTED_EOF_WHILE_READING:294:unexpected eof while reading - SSL_R_UNEXPECTED_MESSAGE:244:unexpected message - SSL_R_UNEXPECTED_RECORD:245:unexpected record - SSL_R_UNINITIALIZED:276:uninitialized -diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h -index 0ef684f3c1..ba4c4ae5fb 100644 ---- a/include/openssl/sslerr.h -+++ b/include/openssl/sslerr.h -@@ -1,6 +1,6 @@ - /* - * Generated by util/mkerr.pl DO NOT EDIT -- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. -+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy -@@ -734,7 +734,6 @@ int ERR_load_SSL_strings(void); - # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 - # define SSL_R_UNEXPECTED_CCS_MESSAGE 262 - # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178 --# define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 - # define SSL_R_UNEXPECTED_MESSAGE 244 - # define SSL_R_UNEXPECTED_RECORD 245 - # define SSL_R_UNINITIALIZED 276 -diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c -index 1c885a664f..b2a7a47eb0 100644 ---- a/ssl/record/rec_layer_s3.c -+++ b/ssl/record/rec_layer_s3.c -@@ -296,12 +296,6 @@ int ssl3_read_n(SSL *s, size_t n, size_t max, int extend, int clearold, - ret = BIO_read(s->rbio, pkt + len + left, max - left); - if (ret >= 0) - bioread = ret; -- if (ret <= 0 -- && !BIO_should_retry(s->rbio) -- && BIO_eof(s->rbio)) { -- SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_SSL3_READ_N, -- SSL_R_UNEXPECTED_EOF_WHILE_READING); -- } - } else { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_READ_N, - SSL_R_READ_BIO_NOT_SET); -diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c -index a0c7b79659..4b12ed1485 100644 ---- a/ssl/ssl_err.c -+++ b/ssl/ssl_err.c -@@ -1,6 +1,6 @@ - /* - * Generated by util/mkerr.pl DO NOT EDIT -- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. -+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy -@@ -1205,8 +1205,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { - "unexpected ccs message"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA), - "unexpected end of early data"}, -- {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING), -- "unexpected eof while reading"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record"}, - {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"},