From 25f37f9cb45f574340a83ea40e4a070b029502e9 Mon Sep 17 00:00:00 2001 From: Internet1235 <135099493+Internet1235@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:36:06 +0800 Subject: [PATCH 1/2] golang: update to 1.24.1 Fixes: https://github.com/coolsnowwolf/lede/issues/13377 --- lang/golang/golang/Makefile | 38 +++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 7867f701..c16d36c6 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk -GO_VERSION_MAJOR_MINOR:=1.23 -GO_VERSION_PATCH:=6 +GO_VERSION_MAJOR_MINOR:=1.24 +GO_VERSION_PATCH:=1 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222 +PKG_HASH:=8244ebf46c65607db10222b5806aeb31c1fcf8979c1b6b12f60c677e9a3c0656 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause @@ -102,6 +102,12 @@ BOOTSTRAP_1_20_HASH:=1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b BOOTSTRAP_1_20_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.20 +BOOTSTRAP_1_22_SOURCE:=go1.22.6.src.tar.gz +BOOTSTRAP_1_22_SOURCE_URL:=$(GO_SOURCE_URLS) +BOOTSTRAP_1_22_HASH:=9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51 + +BOOTSTRAP_1_22_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.22 + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk include ../golang-compiler.mk @@ -112,6 +118,7 @@ HOST_UNPACK:=$(HOST_TAR) -C "$(HOST_BUILD_DIR)" --strip-components=1 -xzf "$(DL_ BOOTSTRAP_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_SOURCE)" BOOTSTRAP_1_17_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_17_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_17_SOURCE)" BOOTSTRAP_1_20_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_20_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_20_SOURCE)" +BOOTSTRAP_1_22_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_22_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_22_SOURCE)" # don't strip ELF executables in test data RSTRIP:=: @@ -174,6 +181,7 @@ endef define Package/golang-src $(call Package/golang/Default) TITLE+= (source files) + DEPENDS+= +libstdcpp +libtiff endef define Package/golang-src/description @@ -240,6 +248,23 @@ Hooks/HostPrepare/Post+=Bootstrap-1.20/Prepare $(eval $(call GoCompiler/AddProfile,Bootstrap-1.20,$(BOOTSTRAP_1_20_BUILD_DIR),,bootstrap-1.20,$(GO_HOST_OS_ARCH))) + +# Bootstrap 1.22 + +define Download/golang-bootstrap-1.22 + FILE:=$(BOOTSTRAP_1_22_SOURCE) + URL:=$(BOOTSTRAP_1_22_SOURCE_URL) + HASH:=$(BOOTSTRAP_1_22_HASH) +endef +$(eval $(call Download,golang-bootstrap-1.22)) + +define Bootstrap-1.22/Prepare + mkdir -p "$(BOOTSTRAP_1_22_BUILD_DIR)" && $(BOOTSTRAP_1_22_UNPACK) ; +endef +Hooks/HostPrepare/Post+=Bootstrap-1.22/Prepare + +$(eval $(call GoCompiler/AddProfile,Bootstrap-1.22,$(BOOTSTRAP_1_22_BUILD_DIR),,bootstrap-1.22,$(GO_HOST_OS_ARCH))) + # Host ifeq ($(GO_HOST_PIE_SUPPORTED),1) @@ -280,8 +305,13 @@ define Host/Compile $(HOST_GO_VARS) \ ) - $(call GoCompiler/Host/Make, \ + $(call GoCompiler/Bootstrap-1.22/Make, \ GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_20_BUILD_DIR)" \ + $(HOST_GO_VARS) \ + ) + + $(call GoCompiler/Host/Make, \ + GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_22_BUILD_DIR)" \ $(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \ $(HOST_GO_VARS) \ ) From 2ff564e37c6fd8ec65f48f4e2948eb1e7224be63 Mon Sep 17 00:00:00 2001 From: Internet1235 <135099493+Internet1235@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:43:14 +0800 Subject: [PATCH 2/2] tiff: update to 4.7.0 --- libs/tiff/Makefile | 23 ++---- libs/tiff/patches/010-CVE-2022-2519.patch | 93 ----------------------- libs/tiff/patches/020-CVE-2022-2520.patch | 28 ------- 3 files changed, 7 insertions(+), 137 deletions(-) delete mode 100644 libs/tiff/patches/010-CVE-2022-2519.patch delete mode 100644 libs/tiff/patches/020-CVE-2022-2520.patch diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 3b65ca7c..0e7bbd60 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff -PKG_VERSION:=4.4.0 -PKG_RELEASE:=2 +PKG_VERSION:=4.7.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.osgeo.org/libtiff -PKG_HASH:=917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed +PKG_HASH:=67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976 PKG_MAINTAINER:=Jiri Slachta -PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE:=libtiff PKG_LICENSE_FILES:=COPYRIGHT PKG_CPE_ID:=cpe:/a:libtiff:libtiff @@ -34,7 +34,7 @@ $(call Package/tiff/Default) CATEGORY:=Libraries TITLE+= library DEPENDS:=+zlib +libjpeg - ABI_VERSION:=5 + ABI_VERSION:=6 endef define Package/tiff-utils @@ -48,23 +48,14 @@ endef CMAKE_OPTIONS += \ -Dld-version-script=OFF \ - -Dccitt=ON \ - -Dpackbits=ON \ - -Dlzw=ON \ - -Dthunder=ON \ - -Dnext=ON \ - -Dlogluv=ON \ - -Dmdi=ON \ - -Dzlib=ON \ - -Dpixarlog=ON \ - -Djpeg=ON \ -Dold-jpeg=OFF \ -Djbig=OFF \ -Dlzma=OFF \ -Dzstd=OFF \ -Dwebp=OFF \ -Djpeg12=OFF \ - -Dcxx=OFF + -Dcxx=OFF \ + -Dlibdeflate=OFF define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) diff --git a/libs/tiff/patches/010-CVE-2022-2519.patch b/libs/tiff/patches/010-CVE-2022-2519.patch deleted file mode 100644 index 6c61ed01..00000000 --- a/libs/tiff/patches/010-CVE-2022-2519.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8fe3735942ea1d90d8cef843b55b3efe8ab6feaf Mon Sep 17 00:00:00 2001 -From: Su_Laus -Date: Mon, 15 Aug 2022 22:11:03 +0200 -Subject: [PATCH] =?UTF-8?q?According=20to=20Richard=20Nolde=20https://gitl?= - =?UTF-8?q?ab.com/libtiff/libtiff/-/issues/401#note=5F877637400=20the=20ti?= - =?UTF-8?q?ffcrop=20option=20=E2=80=9E-S=E2=80=9C=20is=20also=20mutually?= - =?UTF-8?q?=20exclusive=20to=20the=20other=20crop=20options=20(-X|-Y),=20-?= - =?UTF-8?q?Z=20and=20-z.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is now checked and ends tiffcrop if those arguments are not mutually exclusive. - -This MR will fix the following tiffcrop issues: #349, #414, #422, #423, #424 ---- - tools/tiffcrop.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -108,12 +108,12 @@ - * lower level, scanline level routines. Debug reports a limited set - * of messages to monitor progress without enabling dump logs. - * -- * Note: The (-X|-Y), -Z and -z options are mutually exclusive. -+ * Note: The (-X|-Y), -Z, -z and -S options are mutually exclusive. - * In no case should the options be applied to a given selection successively. - */ - --static char tiffcrop_version_id[] = "2.5"; --static char tiffcrop_rev_date[] = "02-09-2022"; -+static char tiffcrop_version_id[] = "2.5.1"; -+static char tiffcrop_rev_date[] = "15-08-2022"; - - #include "tif_config.h" - #include "libport.h" -@@ -173,12 +173,12 @@ static char tiffcrop_rev_date[] = "02- - #define ROTATECW_270 32 - #define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270) - --#define CROP_NONE 0 --#define CROP_MARGINS 1 --#define CROP_WIDTH 2 --#define CROP_LENGTH 4 --#define CROP_ZONES 8 --#define CROP_REGIONS 16 -+#define CROP_NONE 0 /* "-S" -> Page_MODE_ROWSCOLS and page->rows/->cols != 0 */ -+#define CROP_MARGINS 1 /* "-m" */ -+#define CROP_WIDTH 2 /* "-X" */ -+#define CROP_LENGTH 4 /* "-Y" */ -+#define CROP_ZONES 8 /* "-Z" */ -+#define CROP_REGIONS 16 /* "-z" */ - #define CROP_ROTATE 32 - #define CROP_MIRROR 64 - #define CROP_INVERT 128 -@@ -316,7 +316,7 @@ struct crop_mask { - #define PAGE_MODE_RESOLUTION 1 - #define PAGE_MODE_PAPERSIZE 2 - #define PAGE_MODE_MARGINS 4 --#define PAGE_MODE_ROWSCOLS 8 -+#define PAGE_MODE_ROWSCOLS 8 /* for -S option */ - - #define INVERT_DATA_ONLY 10 - #define INVERT_DATA_AND_TAG 11 -@@ -781,7 +781,7 @@ static const char usage_info[] = - " The four debug/dump options are independent, though it makes little sense to\n" - " specify a dump file without specifying a detail level.\n" - "\n" --"Note: The (-X|-Y), -Z and -z options are mutually exclusive.\n" -+"Note: The (-X|-Y), -Z, -z and -S options are mutually exclusive.\n" - " In no case should the options be applied to a given selection successively.\n" - "\n" - ; -@@ -2131,13 +2131,14 @@ void process_command_opts (int argc, ch - /*NOTREACHED*/ - } - } -- /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and -z are mutually exclusive) --*/ -- char XY, Z, R; -+ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ -+ char XY, Z, R, S; - XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); - Z = (crop_data->crop_mode & CROP_ZONES); - R = (crop_data->crop_mode & CROP_REGIONS); -- if ((XY && Z) || (XY && R) || (Z && R)) { -- TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z and -z are mutually exclusive.->Exit"); -+ S = (page->mode & PAGE_MODE_ROWSCOLS); -+ if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { -+ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); - exit(EXIT_FAILURE); - } - } /* end process_command_opts */ diff --git a/libs/tiff/patches/020-CVE-2022-2520.patch b/libs/tiff/patches/020-CVE-2022-2520.patch deleted file mode 100644 index 5cfa52e7..00000000 --- a/libs/tiff/patches/020-CVE-2022-2520.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bad48e90b410df32172006c7876da449ba62cdba Mon Sep 17 00:00:00 2001 -From: Su_Laus -Date: Sat, 20 Aug 2022 23:35:26 +0200 -Subject: [PATCH] tiffcrop -S option: Make decision simpler. - ---- - tools/tiffcrop.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -2133,11 +2133,11 @@ void process_command_opts (int argc, ch - } - /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ - char XY, Z, R, S; -- XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); -- Z = (crop_data->crop_mode & CROP_ZONES); -- R = (crop_data->crop_mode & CROP_REGIONS); -- S = (page->mode & PAGE_MODE_ROWSCOLS); -- if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { -+ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)) ? 1 : 0; -+ Z = (crop_data->crop_mode & CROP_ZONES) ? 1 : 0; -+ R = (crop_data->crop_mode & CROP_REGIONS) ? 1 : 0; -+ S = (page->mode & PAGE_MODE_ROWSCOLS) ? 1 : 0; -+ if (XY + Z + R + S > 1) { - TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); - exit(EXIT_FAILURE); - }