From 94e4f3c53214d65f6049d44064c348e95682ef8b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 22 Jan 2025 12:36:47 +0100 Subject: [PATCH] util/update_public_suffix_list.sh: adapt to PURL addition to qt_attribution.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add a comment to publicsuffix-list's entry that the update is done by a script that should be updated whenever this file's contents change. Amends 36dca3c04f759449f74008a3e79021a179b0f35e. Pick-to: 6.8 6.5 Change-Id: I1a0e51568e6d4300197c09f759ad3d82277a74d1 Reviewed-by: Mårten Nordheim (cherry picked from commit b9f74f9a0b97588fc07d75fa6a427f5c8d6a2c6c) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/libpsl/qt_attribution.json | 1 + util/update_public_suffix_list.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/3rdparty/libpsl/qt_attribution.json b/src/3rdparty/libpsl/qt_attribution.json index e69c2efb56b..3f56f423eef 100644 --- a/src/3rdparty/libpsl/qt_attribution.json +++ b/src/3rdparty/libpsl/qt_attribution.json @@ -20,6 +20,7 @@ supported by Qt (by the QNetworkCookieJar class).", "Comment": "Consult https://github.com/publicsuffix/list for the sha1 but download from ...", "Homepage": "http://publicsuffix.org/", "Comment": "Suggested update schedule: twice per year (before a 6.x.0 release), no relevant CPE found", + "Comment": "Updated by util/update_public_suffix_list.sh; if you add fields here, update the script, too!", "Version": "903a83ff7bfc3148e3692e09396f9f3bdc9462ef, fetched on 2024-06-05", "DownloadLocation": "https://publicsuffix.org/list/public_suffix_list.dat", "PURL": "pkg:generic/psl-data@903a83ff7bfc3148e3692e09396f9f3bdc9462ef?download_url=https://publicsuffix.org/list/public_suffix_list.dat", diff --git a/util/update_public_suffix_list.sh b/util/update_public_suffix_list.sh index 1e9793a1a8d..ba00f1177f6 100755 --- a/util/update_public_suffix_list.sh +++ b/util/update_public_suffix_list.sh @@ -63,6 +63,9 @@ run_or_die "$MAKE_DAFSA" --output-format=binary "$INPUT" "$PUBLIC_SUFFIX_LIST_DA # update the first Version line in qt_attribution.json with the new SHA1 and date: run_or_die sed -i -e "1,/\"Version\":/{ /\"Version\":/ { s/[0-9a-fA-F]\{40\}/$GITSHA1/; s/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/$TODAY/ } }" "$ATTRIBUTION_JSON" +# update the first "PURL" line with the new SHA1: +run_or_die sed -i -e "1,/\"PURL\":/{ /\"PURL\":/ { s/[0-9a-fA-F]\{40\}/$GITSHA1/; } }" "$ATTRIBUTION_JSON" + run_or_die git add "$PSL_DATA_CPP" run_or_die git add "$PUBLIC_SUFFIX_LIST_DAFSA" run_or_die git add "$ATTRIBUTION_JSON"