From dd526d33bd622fb85158763e3373e20c2d41f34a Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 15 Nov 2025 18:05:12 +0800 Subject: [PATCH] Update download URL for Nettle The GitLab mirror has been archived. --- app/src/main/cpp/CMakeLists.txt | 6 ++---- app/src/main/cpp/configure_nettle.sh | 2 +- renovate.json | 23 ++++++++++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index c57d836bd..5cb070d34 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -49,10 +49,8 @@ endif () set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}") ExternalProject_Add( nettle - GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git - GIT_TAG nettle_3.10.2_release_20250626 - GIT_SHALLOW 1 - GIT_CONFIG core.autocrlf=input + URL https://ftpmirror.gnu.org/nettle/nettle-3.10.2.tar.gz + URL_MD5 b28bcbf6f045ff007940a9401673600d CONFIGURE_COMMAND bash ${CURRENT_DIR}/configure_nettle.sh ${NDK_VERSION} ${CMAKE_C_COMPILER_TARGET} BUILD_COMMAND bash -c "make -j4 libnettle.a CFLAGS='${CMAKE_C_FLAGS} -Qunused-arguments'" INSTALL_COMMAND "" diff --git a/app/src/main/cpp/configure_nettle.sh b/app/src/main/cpp/configure_nettle.sh index feffbf18e..dd777a949 100644 --- a/app/src/main/cpp/configure_nettle.sh +++ b/app/src/main/cpp/configure_nettle.sh @@ -7,7 +7,7 @@ else TOOLCHAIN=$ARCH_NDK_LOCATION fi TARGET=$2 -./.bootstrap && ./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \ +./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \ AR=$TOOLCHAIN/llvm-ar \ CC="$TOOLCHAIN/clang -target $TARGET" \ RANLIB=$TOOLCHAIN/llvm-ranlib diff --git a/renovate.json b/renovate.json index c8c988790..42788fc21 100644 --- a/renovate.json +++ b/renovate.json @@ -15,7 +15,18 @@ "matchStrings": [ "(?\\S*)\\s*GIT_REPOSITORY https://(?.*?)\\.com/(?.*?)\\.git\\s*GIT_TAG (?\\S*)" ], - "datasourceTemplate": "{{{datasource}}}-tags" + "datasourceTemplate": "{{datasource}}-tags" + }, + { + "customType": "regex", + "managerFilePatterns": [ + "/(^|/)CMakeLists\\.txt$/" + ], + "matchStrings": [ + "(/(?[^/]+)){2}-(?.+)\\.tar\\.gz" + ], + "datasourceTemplate": "custom.gnu", + "extractVersionTemplate": "{{depName}}-(?.+)\\.tar\\.gz$" }, { "customType": "regex", @@ -67,6 +78,10 @@ "transformTemplates": [ "{\"releases\":[{\"version\":$match(body,/ndkVersion \"([^\"]+)\"/).groups[0]}],\"changelogUrl\":html_url}" ] + }, + "gnu": { + "defaultRegistryUrlTemplate": "https://ftpmirror.gnu.org/{{packageName}}/", + "format": "html" } }, "packageRules": [ @@ -92,12 +107,6 @@ ], "allowedVersions": "!/compat$/" }, - { - "matchDepNames": [ - "nettle" - ], - "versioning": "regex:^nettle_(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?(?rc\\d+)?" - }, { "matchDepNames": [ "rust-nightly"