Update to libsignal v0.61.0

2024-11-06 18:44:33 -08:00 · 2024-11-06 18:44:33 -08:00 · bdb67d4e78
commit bdb67d4e78
parent ce9f5ba854
4 changed files with 62 additions and 45 deletions
--- a/4
+++ b/4
@ -11,8 +11,8 @@ source 'https://cdn.cocoapods.org/'
 pod 'blurhash', podspec: './ThirdParty/blurhash.podspec'
 pod 'SwiftProtobuf', "1.28.2"

-ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = 'c11d63ecb4a6f1b3f26ef65c1fe7fce83cef365b20b995a0d09d0ccdba75b00b'
-pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.60.2', testspecs: ["Tests"]
+ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = 'f775326587758e22ce2e878f6dfd79536adbb0de65e4d37136eb94d1c7409108'
+pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.61.0', testspecs: ["Tests"]
 # pod 'LibSignalClient', path: '../libsignal', testspecs: ["Tests"]

 ENV['RINGRTC_PREBUILD_CHECKSUM'] = 'd6fdeb91e64fa7cb438fd15446e6f7ec9152da83de3b32e7f14c301d57ce9da7'
--- a/Podfile.lock
+++ b/Podfile.lock
@ -9,8 +9,8 @@ PODS:
  - LibMobileCoin/CoreHTTP (6.0.2):
    - SwiftProtobuf (~> 1.5)
  - libPhoneNumber-iOS (0.9.15)
-  - LibSignalClient (0.60.2)
-  - LibSignalClient/Tests (0.60.2)
+  - LibSignalClient (0.61.0)
+  - LibSignalClient/Tests (0.61.0)
  - libwebp (1.3.2):
    - libwebp/demux (= 1.3.2)
    - libwebp/mux (= 1.3.2)
@ -53,8 +53,8 @@ DEPENDENCIES:
  - GRDB.swift/SQLCipher
  - LibMobileCoin/CoreHTTP (from `https://github.com/signalapp/libmobilecoin-ios-artifacts`, tag `signal/6.0.2`)
  - libPhoneNumber-iOS (from `https://github.com/signalapp/libPhoneNumber-iOS`, branch `signal-master`)
-  - LibSignalClient (from `https://github.com/signalapp/libsignal.git`, tag `v0.60.2`)
-  - LibSignalClient/Tests (from `https://github.com/signalapp/libsignal.git`, tag `v0.60.2`)
+  - LibSignalClient (from `https://github.com/signalapp/libsignal.git`, tag `v0.61.0`)
+  - LibSignalClient/Tests (from `https://github.com/signalapp/libsignal.git`, tag `v0.61.0`)
  - libwebp (from `./ThirdParty/libwebp.podspec.json`)
  - lottie-ios
  - Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`)
@ -90,7 +90,7 @@ EXTERNAL SOURCES:
    :git: https://github.com/signalapp/libPhoneNumber-iOS
  LibSignalClient:
    :git: https://github.com/signalapp/libsignal.git
-    :tag: v0.60.2
+    :tag: v0.61.0
  libwebp:
    :podspec: "./ThirdParty/libwebp.podspec.json"
  Mantle:
@ -121,7 +121,7 @@ CHECKOUT OPTIONS:
    :git: https://github.com/signalapp/libPhoneNumber-iOS
  LibSignalClient:
    :git: https://github.com/signalapp/libsignal.git
-    :tag: v0.60.2
+    :tag: v0.61.0
  Mantle:
    :commit: e7e46253bb01ce39525d90aa69ed9e85e758bfc4
    :git: https://github.com/signalapp/Mantle
@ -145,7 +145,7 @@ SPEC CHECKSUMS:
  GRDB.swift: 1395cb3556df6b16ed69dfc74c3886abc75d2825
  LibMobileCoin: 8503f567fa32184a5be7bc038fbd727747dd9991
  libPhoneNumber-iOS: 2d26d0a38933eee2702962a4dbdec2fc20e5ef9f
-  LibSignalClient: 89b5317750b3afd32da3f3998661835aa09783e4
+  LibSignalClient: c95f056abe73b6fd4da39f9202191bb00592ddb7
  libwebp: 1b5562124e3ca3336fb7506e76501bed7758963a
  Logging: beeb016c9c80cf77042d62e83495816847ef108b
  lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
@ -158,6 +158,6 @@ SPEC CHECKSUMS:
  SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d
  YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331

-PODFILE CHECKSUM: d6e729acbd5226752f86f92e7396dae3355161ab
+PODFILE CHECKSUM: c51d9862fc3ba5d8e0021d12c877795e4c4a979d

 COCOAPODS: 1.15.2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d044acb4aa534135a7103e7fa79e508d7a0dc516
+Subproject commit b1a5643358bd0927a91555d3567e0cd092a97150
--- a/Signal/Settings.bundle/Acknowledgements.plist
+++ b/Signal/Settings.bundle/Acknowledgements.plist
@ -1099,7 +1099,7 @@ You should also get your employer (if you work as a programmer) or school, if an
 			<key>License</key>
 			<string>GNU Affero General Public License v3.0</string>
 			<key>Title</key>
-			<string>attest 0.1.0, device-transfer 0.1.0, libsignal-account-keys 0.1.0, libsignal-bridge 0.1.0, libsignal-bridge-macros 0.1.0, libsignal-bridge-testing 0.1.0, libsignal-bridge-types 0.1.0, libsignal-core 0.1.0, libsignal-ffi 0.60.2, libsignal-jni 0.60.2, libsignal-jni-testing 0.60.2, libsignal-keytrans 0.0.1, libsignal-message-backup 0.1.0, libsignal-message-backup-macros 0.1.0, libsignal-net 0.1.0, libsignal-net-infra 0.1.0, libsignal-node 0.60.2, libsignal-protocol 0.1.0, libsignal-svr3 0.1.0, mrp 2.48.4, partial-default-derive 0.1.0, poksho 0.7.0, protobuf 2.48.4, regex-aot 0.1.0, ringrtc 2.48.4, signal-crypto 0.1.0, signal-media 0.1.0, signal-neon-futures 0.1.0, signal-neon-futures-tests 0.1.0, usernames 0.1.0, zkcredential 0.1.0, zkgroup 0.9.0</string>
+			<string>attest, device-transfer, libsignal-account-keys, libsignal-bridge, libsignal-bridge-macros, libsignal-bridge-testing, libsignal-bridge-types, libsignal-core, libsignal-core 0.1.0, libsignal-ffi, libsignal-jni, libsignal-jni-testing, libsignal-keytrans, libsignal-message-backup, libsignal-message-backup-macros, libsignal-net, libsignal-net-infra, libsignal-node, libsignal-protocol, libsignal-svr3, mrp 2.48.4, partial-default-derive 0.1.0, poksho, protobuf 2.48.4, regex-aot 0.1.0, ringrtc 2.48.4, signal-crypto, signal-media, signal-neon-futures, signal-neon-futures-tests, usernames, zkcredential, zkgroup</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
@ -3865,7 +3865,7 @@ DEALINGS IN THE SOFTWARE.
 			<key>License</key>
 			<string>MIT License</string>
 			<key>Title</key>
-			<string>either 1.13.0, itertools 0.10.5, itertools 0.12.1, itertools 0.13.0, petgraph 0.6.5, serde_with 3.9.0, serde_with_macros 3.9.0</string>
+			<string>either 1.13.0, itertools 0.12.1, itertools 0.13.0, petgraph 0.6.5, serde_with 3.9.0, serde_with_macros 3.9.0</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
@ -10608,6 +10608,23 @@ DEALINGS IN THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright 2019 Jeffrey Parsons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT License</string>
+			<key>Title</key>
+			<string>rangemap 1.5.1</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2011, Tony Million.
@ -10630,21 +10647,29 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 		</dict>
 		<dict>
 			<key>FooterText</key>
-			<string>   Copyright 2015-2016 Brian Smith.
+			<string>Copyright (c) 2015-2016 the fiat-crypto authors (see
+https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).

-   Permission to use, copy, modify, and/or distribute this software for any
-   purpose with or without fee is hereby granted, provided that the above
-   copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:

-   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
-   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-   SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-   OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</string>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</string>
 			<key>License</key>
-			<string>ISC License</string>
+			<string>MIT License</string>
 			<key>Title</key>
 			<string>ring 0.17.8</string>
 			<key>Type</key>
@ -10675,29 +10700,21 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 		</dict>
 		<dict>
 			<key>FooterText</key>
-			<string>Copyright (c) 2015-2016 the fiat-crypto authors (see
-https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
+			<string>   Copyright 2015-2016 Brian Smith.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+   Permission to use, copy, modify, and/or distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</string>
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+   SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+   OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</string>
 			<key>License</key>
-			<string>MIT License</string>
+			<string>ISC License</string>
 			<key>Title</key>
 			<string>ring 0.17.8</string>
 			<key>Type</key>