|
 |
b0b627 |
# HG changeset patch
|
|
|
b0b627 |
# User Rob Lemley <rob@thunderbird.net>
|
|
|
b0b627 |
# Date 1663866047 14400
|
|
|
b0b627 |
# Thu Sep 22 13:00:47 2022 -0400
|
|
|
b0b627 |
# Node ID 8c718243f4e83fc18dfc88bf5d817c5c18f13937
|
|
|
b0b627 |
# Parent 17dc6bb322b5d40299bba0a90d59c0593137d4f6
|
|
|
b0b627 |
Bug 1790116 - update_rnp.sh changes for RNP v0.16.2. r=kaie
|
|
|
b0b627 |
|
|
|
b0b627 |
The changes in bug_1768424.patch are now included upstream in
|
|
|
b0b627 |
https://github.com/rnpgp/rnp/commit/ac6f58ef7ccea270b735b53f87da2c3ca5b34290.
|
|
|
b0b627 |
|
|
|
b0b627 |
bug_1763641.patch removed per bug 1790116 comment 26.
|
|
|
b0b627 |
|
|
|
b0b627 |
disable_obsolete_ciphers.patch no longer needed, use security rules instead.
|
|
|
b0b627 |
|
|
|
b0b627 |
Differential Revision: https://phabricator.services.mozilla.com/D157010
|
|
|
b0b627 |
|
|
|
b0b627 |
diff --git a/comm/third_party/update_rnp.sh b/comm/third_party/update_rnp.sh
|
|
|
b0b627 |
--- a/comm/third_party/update_rnp.sh
|
|
|
b0b627 |
+++ b/comm/third_party/update_rnp.sh
|
|
|
b0b627 |
@@ -43,11 +43,11 @@ TAGLIST=$(git -C "${RNPgit}" tag --list
|
|
|
b0b627 |
LATEST_VERSION=$($THIRDROC latest_version $TAGLIST)
|
|
|
b0b627 |
REVISION=$(git -C "${RNPgit}" rev-parse --verify HEAD)
|
|
|
b0b627 |
TIMESTAMP=$(git -C "${RNPgit}" show -s --format=%ct)
|
|
|
b0b627 |
|
|
|
b0b627 |
# Cleanup rnp checkout
|
|
|
b0b627 |
-rm -rf ${RNPgit}/{.git,.github,.cirrus.yml,.clang-format,.gitignore}
|
|
|
b0b627 |
+rm -rf ${RNPgit}/{.git,.github,.cirrus.yml,.clang-format,.gitignore,.codespellrc}
|
|
|
b0b627 |
rm -rf ${RNPgit}/{_config.yml,docker.sh,ci,cmake,git-hooks,travis.sh,vcpkg.txt}
|
|
|
b0b627 |
rm -rf ${RNPgit}/{Brewfile,CMakeLists.txt,CMakeSettings.json}
|
|
|
b0b627 |
|
|
|
b0b627 |
# Do the switch
|
|
|
b0b627 |
rm -rf rnp
|
|
|
b0b627 |
@@ -60,17 +60,17 @@ mv "${RNPgit}" rnp
|
|
|
b0b627 |
|
|
|
b0b627 |
# Restore moz.build
|
|
|
b0b627 |
hg revert rnp/moz.build rnp/module.ver rnp/rnp.symbols rnp/src/lib/rnp/rnp_export.h \
|
|
|
b0b627 |
rnp/src/rnp/moz.build rnp/src/rnpkeys/moz.build
|
|
|
b0b627 |
|
|
|
b0b627 |
-# Reapply Thunderbird patch to disable obsolete ciphers
|
|
|
b0b627 |
-PATCH_FILES=("patches/rnp/disable_obsolete_ciphers.patch" \
|
|
|
b0b627 |
- "patches/rnp/bug_1763641.patch" \
|
|
|
b0b627 |
- "patches/rnp/bug_1768424.patch")
|
|
|
b0b627 |
-for PATCH_FILE in "${PATCH_FILES[@]}"; do
|
|
|
b0b627 |
- patch -p2 -i "${PATCH_FILE}" -N -r "${MY_TEMP_DIR}/${PATCH_FILE}.rej"
|
|
|
b0b627 |
-done
|
|
|
b0b627 |
+# Patch librnp - currently not needed
|
|
|
b0b627 |
+#PATCH_FILES=("patches/rnp/disable_obsolete_ciphers.patch")
|
|
|
b0b627 |
+#for PATCH_FILE in "${PATCH_FILES[@]}"; do
|
|
|
b0b627 |
+# # shellcheck disable=SC2086
|
|
|
b0b627 |
+# echo "Applying patch $(basename ${PATCH_FILE})"
|
|
|
b0b627 |
+# patch -p2 -i "${PATCH_FILE}" -N -r "${MY_TEMP_DIR}/${PATCH_FILE}.rej"
|
|
|
b0b627 |
+#done
|
|
|
b0b627 |
|
|
|
b0b627 |
# Patch sometimes creates backup files that are not wanted.
|
|
|
b0b627 |
find rnp -name '*.orig' -exec rm -f '{}' \;
|
|
|
b0b627 |
|
|
|
b0b627 |
rm -rf "${MY_TEMP_DIR}"
|