chore(release): prepare for 1.136.2

build: downgrade cc to 1.0.83
1.0.84 and 1.0.85 are yanked. With 1.0.86 and 1.0.89 Delta Chat for Android fails to build. Fixes <https://github.com/deltachat/deltachat-android/issues/2972>.
2026-04-06 07:32:12 +03:00 · 2024-03-05 22:42:36 +00:00 · 2024-03-05 22:21:28 +00:00 · 2024-03-05 03:19:46 +00:00 · 2024-03-05 01:23:12 +00:00 · 2024-03-05 01:18:22 +00:00
19 changed files with 82 additions and 43 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,9 +89,9 @@ jobs:
          - os: macos-latest
            rust: 1.76.0

-          # Minimum Supported Rust Version = 1.74.0
+          # Minimum Supported Rust Version = 1.70.0
          - os: ubuntu-latest
-            rust: 1.74.0
+            rust: 1.70.0
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -16,7 +16,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: "18"
      - name: Get tag
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -18,7 +18,7 @@ jobs:
        with:
          show-progress: false
      - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18.x
      - name: Add Rust cache
--- a/.github/workflows/node-docs.yml
+++ b/.github/workflows/node-docs.yml
@@ -19,7 +19,7 @@ jobs:
          show-progress: false

      - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18.x

--- a/.github/workflows/node-package.yml
+++ b/.github/workflows/node-package.yml
@@ -17,7 +17,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: "18"
      - name: System info
@@ -78,7 +78,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: "18"
      - run: apt-get update
@@ -142,7 +142,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
        with:
          node-version: "18"
      - name: Get tag
--- a/.github/workflows/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -26,7 +26,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          show-progress: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: "18"
      - name: System info
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog

+## [1.136.2] - 2024-03-05
+
+### Build system
+
+- Downgrade `cc` to 1.0.83 to fix build for Android.
+
+### CI
+
+- Update setup-node action.
+
+## [1.136.1] - 2024-03-05
+
+### Build system
+
+- Revert to OpenSSL 3.1.
+- Restore MSRV 1.70.0.
+
+### Miscellaneous Tasks
+
+- Update node constants.
+
 ## [1.136.0] - 2024-03-04

 ### Features / Changes
@@ -3677,3 +3698,5 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.135.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.134.0...v1.135.0
 [1.135.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.135.0...v1.135.1
 [1.136.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.135.1...v1.136.0
+[1.136.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.136.0...v1.136.1
+[1.136.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.136.1...v1.136.2
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -627,9 +627,12 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.89"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]

 [[package]]
 name = "cfb-mode"
@@ -709,18 +712,18 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.1"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
 "clap_builder",
 ]

 [[package]]
 name = "clap_builder"
-version = "4.5.1"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
 "anstyle",
 "clap_lex",
@@ -728,9 +731,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"

 [[package]]
 name = "clipboard-win"
@@ -1085,7 +1088,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.136.0"
+version = "1.136.2"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1124,6 +1127,7 @@ dependencies = [
 "num-traits",
 "num_cpus",
 "once_cell",
+ "openssl-src",
 "parking_lot",
 "percent-encoding",
 "pgp",
@@ -1165,7 +1169,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.136.0"
+version = "1.136.2"
 dependencies = [
 "anyhow",
 "async-channel 2.2.0",
@@ -1189,7 +1193,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.136.0"
+version = "1.136.2"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1204,7 +1208,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.136.0"
+version = "1.136.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1233,7 +1237,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.136.0"
+version = "1.136.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -3211,9 +3215,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"

 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
 "bitflags 2.4.2",
 "cfg-if",
@@ -3243,17 +3247,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
-source = "git+https://github.com/link2xt/openssl-src-rs.git?branch=link2xt/copy-symlink#68efa9733ace4aae3372646838d7430b8f974c67"
+version = "300.1.6+3.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
 dependencies = [
 "cc",
 ]

 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
 "cc",
 "libc",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.136.0"
+version = "1.136.2"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.74"
+rust-version = "1.70"

 [profile.dev]
 debug = 0
@@ -30,9 +30,6 @@ opt-level = "z"
 codegen-units = 1
 strip = true

-[patch.crates-io]
-openssl-src = { git = "https://github.com/link2xt/openssl-src-rs.git", branch = "link2xt/copy-symlink" }
-
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 deltachat-time = { path = "./deltachat-time" }
@@ -103,6 +100,14 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }

+# Pin OpenSSL to 3.1 releases.
+# OpenSSL 3.2 has a regression tracked at <https://github.com/openssl/openssl/issues/23376>
+# which results in broken `deltachat-rpc-server` binaries when cross-compiled using Zig toolchain.
+# See <https://github.com/deltachat/deltachat-core-rust/issues/5206> for Delta Chat issue.
+# According to <https://www.openssl.org/policies/releasestrat.html>
+# 3.1 branch will be supported until 2025-03-14.
+openssl-src = "~300.1"
+
 [dev-dependencies]
 ansi_term = "0.12.0"
 anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.136.0"
+version = "1.136.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.136.0"
+version = "1.136.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -53,5 +53,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.136.0"
+  "version": "1.136.2"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.136.0"
+version = "1.136.2"
 license = "MPL-2.0"
 edition = "2021"

--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.136.0"
+version = "1.136.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/flake.nix
+++ b/flake.nix
@@ -165,12 +165,12 @@
            version = manifest.version;
            strictDeps = true;
            src = pkgs.lib.cleanSource ./.;
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
            nativeBuildInputs = [
              pkgs.perl # Needed to build vendored OpenSSL.
            ];
+            auditable = false; # Avoid cargo-auditable failures.
+            doCheck = false; # Disable test as it requires network access.
+
            CARGO_BUILD_TARGET = rustTarget;
            TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
            CARGO_BUILD_RUSTFLAGS = [
--- a/node/constants.js
+++ b/node/constants.js
@@ -115,6 +115,9 @@ module.exports = {
  DC_PROVIDER_STATUS_BROKEN: 3,
  DC_PROVIDER_STATUS_OK: 1,
  DC_PROVIDER_STATUS_PREPARATION: 2,
+  DC_PUSH_CONNECTED: 2,
+  DC_PUSH_HEARTBEAT: 1,
+  DC_PUSH_NOT_CONNECTED: 0,
  DC_QR_ACCOUNT: 250,
  DC_QR_ADDR: 320,
  DC_QR_ASK_VERIFYCONTACT: 200,
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -115,6 +115,9 @@ export enum C {
  DC_PROVIDER_STATUS_BROKEN = 3,
  DC_PROVIDER_STATUS_OK = 1,
  DC_PROVIDER_STATUS_PREPARATION = 2,
+  DC_PUSH_CONNECTED = 2,
+  DC_PUSH_HEARTBEAT = 1,
+  DC_PUSH_NOT_CONNECTED = 0,
  DC_QR_ACCOUNT = 250,
  DC_QR_ADDR = 320,
  DC_QR_ASK_VERIFYCONTACT = 200,
--- a/package.json
+++ b/package.json
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.136.0"
+  "version": "1.136.2"
 }
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-03-04
+2024-03-05
Author	SHA1	Message	Date
link2xt	5addfa8d1d	chore(release): prepare for 1.136.2	2024-03-05 22:42:36 +00:00
link2xt	02d68332c7	build: downgrade `cc` to 1.0.83 1.0.84 and 1.0.85 are yanked. With 1.0.86 and 1.0.89 Delta Chat for Android fails to build. Fixes <https://github.com/deltachat/deltachat-android/issues/2972>.	2024-03-05 22:21:28 +00:00
link2xt	97abb9a0a9	ci: update setup-node action	2024-03-05 03:19:46 +00:00
link2xt	d0e0cfafef	chore(release): prepare for 1.136.1	2024-03-05 01:23:12 +00:00
link2xt	f630b5fb39	chore: update node constants	2024-03-05 01:18:22 +00:00
link2xt	d9bab938d5	build: restore MSRV 1.70.0	2024-03-05 01:04:49 +00:00
link2xt	215ec14b20	build: revert to OpenSSL 3.1 OpenSSL 3.2 build currently fails under Nix so we cannot build deltachat-rpc-server releases: <https://github.com/alexcrichton/openssl-src-rs/issues/235>	2024-03-05 00:14:52 +00:00
@@ -1 +1 @@
 -03-04
 -03-05