Skip to content

Commit 2678dd8

Browse files
committed
Merge remote-tracking branch 'origin/main' into hoc/securejoin-v3
2 parents 3ecc077 + 8df9b9e commit 2678dd8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2686
-2361
lines changed

.github/workflows/deltachat-rpc-server.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
show-progress: false
3636
persist-credentials: false
37-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
37+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
3838

3939
- name: Build deltachat-rpc-server binaries
4040
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
show-progress: false
6060
persist-credentials: false
61-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
61+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
6262

6363
- name: Build deltachat-rpc-server wheels
6464
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux-wheel
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
show-progress: false
8484
persist-credentials: false
85-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
85+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
8686

8787
- name: Build deltachat-rpc-server binaries
8888
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
@@ -106,7 +106,7 @@ jobs:
106106
with:
107107
show-progress: false
108108
persist-credentials: false
109-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
109+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
110110

111111
- name: Build deltachat-rpc-server wheels
112112
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-wheel
@@ -157,7 +157,7 @@ jobs:
157157
with:
158158
show-progress: false
159159
persist-credentials: false
160-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
160+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
161161

162162
- name: Build deltachat-rpc-server binaries
163163
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
@@ -181,7 +181,7 @@ jobs:
181181
with:
182182
show-progress: false
183183
persist-credentials: false
184-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
184+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
185185

186186
- name: Build deltachat-rpc-server wheels
187187
run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android-wheel
@@ -208,7 +208,7 @@ jobs:
208208
with:
209209
show-progress: false
210210
persist-credentials: false
211-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
211+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
212212

213213
- name: Download Linux aarch64 binary
214214
uses: actions/download-artifact@v7

.github/workflows/nix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
show-progress: false
2727
persist-credentials: false
28-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
28+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
2929
- run: nix fmt flake.nix -- --check
3030

3131
build:
@@ -84,7 +84,7 @@ jobs:
8484
with:
8585
show-progress: false
8686
persist-credentials: false
87-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
87+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
8888
- run: nix build .#${{ matrix.installable }}
8989

9090
build-macos:
@@ -105,5 +105,5 @@ jobs:
105105
with:
106106
show-progress: false
107107
persist-credentials: false
108-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
108+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
109109
- run: nix build .#${{ matrix.installable }}

.github/workflows/repl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
show-progress: false
2020
persist-credentials: false
21-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
21+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
2222
- name: Build
2323
run: nix build .#deltachat-repl-win64
2424
- name: Upload binary

.github/workflows/upload-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
show-progress: false
3737
persist-credentials: false
3838
fetch-depth: 0 # Fetch history to calculate VCS version number.
39-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
39+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
4040
- name: Build Python documentation
4141
run: nix build .#python-docs
4242
- name: Upload to py.delta.chat
@@ -55,7 +55,7 @@ jobs:
5555
show-progress: false
5656
persist-credentials: false
5757
fetch-depth: 0 # Fetch history to calculate VCS version number.
58-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
58+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
5959
- name: Build C documentation
6060
run: nix build .#docs
6161
- name: Upload to c.delta.chat

CHANGELOG.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,58 @@
11
# Changelog
22

3+
## [2.44.0] - 2026-02-27
4+
5+
### Build system
6+
7+
- git-cliff: do not capitalize the first letter of commit message.
8+
9+
### Documentation
10+
11+
- RELEASE.md: add section about dealing with antivirus false positives.
12+
13+
### Features / Changes
14+
15+
- improve logging of connection failures.
16+
- add backup versions to the importing error message.
17+
- add context to message loading failures.
18+
- Add 📱 to all webxdc summaries ([#7790](https://github.com/chatmail/core/pull/7790)).
19+
- Send webxdc name instead of raw file name in pre-messages. Display it in summary ([#7790](https://github.com/chatmail/core/pull/7790)).
20+
- rpc: add startup health-check and propagate server errors.
21+
22+
### Fixes
23+
24+
- imex: do not call `set_config` before running SQL migrations ([#7851](https://github.com/chatmail/core/pull/7851)).
25+
- add missing group description strings to cffi.
26+
- chat-description-changed text in old clients ([#7870](https://github.com/chatmail/core/pull/7870)).
27+
- add cffi type for "Description changed" info message.
28+
- If there was no chat description, and it's set to be an empty string, don't send out a "chat description changed" message ([#7879](https://github.com/chatmail/core/pull/7879)).
29+
- Make clicking on broadcast member-added messages work always ([#7882](https://github.com/chatmail/core/pull/7882)).
30+
- tolerate empty existing directory in Accounts::new() ([#7886](https://github.com/chatmail/core/pull/7886)).
31+
- If importing a backup fails, delete the partially-imported profile ([#7885](https://github.com/chatmail/core/pull/7885)).
32+
- Don't generate new timestamp for re-sent messages ([#7889](https://github.com/chatmail/core/pull/7889)).
33+
34+
### Miscellaneous Tasks
35+
36+
- cargo: update async-native-tls from 0.5.0 to 0.6.0.
37+
- add dev-version bump instructions to RELEASE.md (bumping to 2.44.0-dev).
38+
- deps: bump cachix/install-nix-action from 31.9.0 to 31.9.1.
39+
40+
### Performance
41+
42+
- batched event reception.
43+
44+
### Refactor
45+
46+
- enable clippy::arithmetic_side_effects lint.
47+
- imex: check for overflow when adding blob size.
48+
- http: saturating addition to calculate cache expiration timestamp.
49+
- Move migrations to the end of the file ([#7895](https://github.com/chatmail/core/pull/7895)).
50+
- do not chain Autocrypt key verification to parsing.
51+
52+
### Tests
53+
54+
- fail fast when CHATMAIL_DOMAIN is unset.
55+
356
## [2.43.0] - 2026-02-17
457

558
### Features / Changes
@@ -7767,3 +7820,4 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
77677820
[2.41.0]: https://github.com/chatmail/core/compare/v2.40.0..v2.41.0
77687821
[2.42.0]: https://github.com/chatmail/core/compare/v2.41.0..v2.42.0
77697822
[2.43.0]: https://github.com/chatmail/core/compare/v2.42.0..v2.43.0
7823+
[2.44.0]: https://github.com/chatmail/core/compare/v2.43.0..v2.44.0

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "deltachat"
3-
version = "2.43.0"
3+
version = "2.44.0-dev"
44
edition = "2024"
55
license = "MPL-2.0"
66
rust-version = "1.88"
@@ -45,7 +45,7 @@ anyhow = { workspace = true }
4545
async-broadcast = "0.7.2"
4646
async-channel = { workspace = true }
4747
async-imap = { version = "0.11.1", default-features = false, features = ["runtime-tokio", "compress"] }
48-
async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
48+
async-native-tls = { version = "0.6", default-features = false, features = ["runtime-tokio"] }
4949
async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
5050
async_zip = { version = "0.0.18", default-features = false, features = ["deflate", "tokio-fs"] }
5151
base64 = { workspace = true }

RELEASE.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,44 @@ For example, to release version 1.116.0 of the core, do the following steps.
2222

2323
9. Create a GitHub release: `gh release create v1.116.0 --notes ''`.
2424

25+
10. Update the version to the next development version:
26+
`scripts/set_core_version.py 1.117.0-dev`.
27+
28+
11. Commit and push the change:
29+
`git commit -m "chore: bump version to 1.117.0-dev" && git push origin main`.
30+
31+
12. Once the binaries are generated and [published](https://github.com/chatmail/core/releases),
32+
check Windows binaries for false positive detections at [VirusTotal].
33+
Either upload the binaries directly or submit a direct link to the artifact.
34+
You can use [old browsers interface](https://www.virustotal.com/old-browsers/)
35+
if there are problems with using the default website.
36+
If you submit a direct link and get to the page saying
37+
"No security vendors flagged this URL as malicious",
38+
it does not mean that the file itself is not detected.
39+
You need to go to the "details" tab
40+
and click on the SHA-256 hash in the "Body SHA-256" section.
41+
If any false positive is detected,
42+
open an issue to track removing it.
43+
See <https://github.com/chatmail/core/issues/7847>
44+
for an example of false positive detection issue.
45+
If there is a false positive "Microsoft" detection,
46+
mark the issue as a blocker.
47+
48+
[VirusTotal]: https://www.virustotal.com/
49+
50+
## Dealing with antivirus false positives
51+
52+
If Windows release is incorrectly detected by some antivirus, submit requests to remove detection.
53+
54+
"Microsoft" antivirus is built in Windows and will break user setups so removing its detection should be highest priority.
55+
To submit false positive to Microsoft, go to <https://www.microsoft.com/en-us/wdsi/filesubmission> and select "Submit file as a ... Software developer" option.
56+
57+
False positive contacts for other vendors can be found at <https://docs.virustotal.com/docs/false-positive-contacts>.
58+
Not all of them may be up to date, so check the links below first.
59+
Previously we successfully used the following contacts:
60+
- [ESET-NOD32](mailto:samples@eset.com)
61+
- [Symantec](https://symsubmit.symantec.com/)
62+
2563
## Dealing with failed releases
2664

2765
Once you make a GitHub release,

benches/decrypting.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use deltachat::securejoin::get_securejoin_qr;
3333
use deltachat::{
3434
Events, chat::ChatId, config::Config, context::Context, internals_for_benches::key_from_asc,
3535
internals_for_benches::parse_and_get_text, internals_for_benches::store_self_keypair,
36-
pgp::KeyPair, stock_str::StockStrings,
36+
stock_str::StockStrings,
3737
};
3838
use tempfile::tempdir;
3939

@@ -62,9 +62,7 @@ async fn create_context() -> Context {
6262
.await
6363
.unwrap();
6464
let secret = key_from_asc(include_str!("../test-data/key/bob-secret.asc")).unwrap();
65-
let public = secret.to_public_key();
66-
let key_pair = KeyPair { public, secret };
67-
store_self_keypair(&context, &key_pair)
65+
store_self_keypair(&context, &secret)
6866
.await
6967
.expect("Failed to save key");
7068

deltachat-ffi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "deltachat_ffi"
3-
version = "2.43.0"
3+
version = "2.44.0-dev"
44
description = "Deltachat FFI"
55
edition = "2018"
66
readme = "README.md"

0 commit comments

Comments
 (0)