Skip to content

Merge stable into dev - #138

Merged
liquidsec merged 25 commits into
devfrom
sync-stable-into-dev
Oct 21, 2026
Merged

liquidsec merged 25 commits into
devfrom
sync-stable-into-dev

Conversation

@liquidsec

Copy link
Copy Markdown
Contributor

Syncs dev with stable after the 0.10.1 patch release, which went straight to stable. Brings in Python 3.15 support (PyO3 0.30), the dependency updates, and the AGPL relicense.

Conflicts were only in pyproject.toml (took stable's ruff 0.17.0) and Cargo.lock (stable's lock, plus httpdate for dev's hyper server dev-dependency).

liquidsec and others added 25 commits June 29, 2026 16:03
`blasthttp` is a Black Lantern original, so this is the copyright holder
relicensing its own work. The notices carry `either version 3 of the
License, or (at your option) any later version`, and GPLv3 section 13
already permits AGPLv3 interoperation, so making the AGPL grant explicit
needs no contributor sign-off.

The file is the same AGPL-3.0 text `bbot` carries.

The manifest moves in the same commit. A tree that ships an AGPL-3.0 file
next to a manifest naming something else is self-contradictory at the point
a packager reads it: `Cargo.toml`, `pyproject.toml`.

Refs #151
docs: relicense from GPL-3.0 to AGPL-3.0
Bumps [brotli](https://github.com/dropbox/rust-brotli) from 8.0.4 to 9.0.0.
- [Release notes](https://github.com/dropbox/rust-brotli/releases)
- [Commits](dropbox/rust-brotli@8.0.4...9.0.0)

---
updated-dependencies:
- dependency-name: brotli
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 88777d4)
Bumps [hyper](https://github.com/hyperium/hyper) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](hyperium/hyper@v1.11.0...v1.11.1)

---
updated-dependencies:
- dependency-name: hyper
  dependency-version: 1.11.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit d23e9b2)
Bumps [psl](https://github.com/addr-rs/psl) from 2.1.224 to 2.1.232.
- [Release notes](https://github.com/addr-rs/psl/releases)
- [Commits](addr-rs/psl@v2.1.224...v2.1.232)

---
updated-dependencies:
- dependency-name: psl
  dependency-version: 2.1.232
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 92c18c1)
Bumps the github-actions group with 1 update: [actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain).

Updates `actions-rust-lang/setup-rust-toolchain` from 1 to 2
- [Release notes](https://github.com/actions-rust-lang/setup-rust-toolchain/releases)
- [Changelog](https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md)
- [Commits](actions-rust-lang/setup-rust-toolchain@v1...v2)

---
updated-dependencies:
- dependency-name: actions-rust-lang/setup-rust-toolchain
  dependency-version: '2'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c9f0e2a)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.16.2 to 0.16.8.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.16.2...0.16.8)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.16.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 5c91d2d)
Bumps [clap](https://github.com/clap-rs/clap) from 4.6.6 to 4.6.7.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/main/CHANGELOG.md)
- [Commits](clap-rs/clap@clap_complete-v4.6.6...clap_complete-v4.6.7)

---
updated-dependencies:
- dependency-name: clap
  dependency-version: 4.6.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit f6e7936)
Bumps [psl](https://github.com/addr-rs/psl) from 2.1.232 to 2.1.236.
- [Release notes](https://github.com/addr-rs/psl/releases)
- [Commits](addr-rs/psl@v2.1.232...v2.1.236)

---
updated-dependencies:
- dependency-name: psl
  dependency-version: 2.1.236
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 43cbedb)
Bumps [tokio-test](https://github.com/tokio-rs/tokio) from 0.4.5 to 0.4.6.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-test-0.4.5...tokio-test-0.4.6)

---
updated-dependencies:
- dependency-name: tokio-test
  dependency-version: 0.4.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit d5b26ff)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.16.8 to 0.16.9.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.16.8...0.16.9)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.16.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 0823a80)
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 2.0.20 to 2.0.21.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](dtolnay/thiserror@2.0.20...2.0.21)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-version: 2.0.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit cd0e35e)
Bumps [hyper-util](https://github.com/hyperium/hyper-util) from 0.1.20 to 0.1.21.
- [Release notes](https://github.com/hyperium/hyper-util/releases)
- [Changelog](https://github.com/hyperium/hyper-util/blob/master/CHANGELOG.md)
- [Commits](hyperium/hyper-util@v0.1.20...v0.1.21)

---
updated-dependencies:
- dependency-name: hyper-util
  dependency-version: 0.1.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit d65f14c)
Bumps [psl](https://github.com/addr-rs/psl) from 2.1.236 to 2.1.238.
- [Release notes](https://github.com/addr-rs/psl/releases)
- [Commits](addr-rs/psl@v2.1.236...v2.1.238)

---
updated-dependencies:
- dependency-name: psl
  dependency-version: 2.1.238
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 6cb4f16)
Bumps [hyper](https://github.com/hyperium/hyper) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](hyperium/hyper@v1.11.1...v1.12.0)

---
updated-dependencies:
- dependency-name: hyper
  dependency-version: 1.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 3e36138)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.16.9 to 0.17.0.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.16.9...0.17.0)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.17.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit f4992a0)
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.53.1 to 1.53.3.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.53.1...tokio-1.53.3)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.53.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 9cbc8e0)
Bumps [psl](https://github.com/addr-rs/psl) from 2.1.238 to 2.1.241.
- [Release notes](https://github.com/addr-rs/psl/releases)
- [Commits](addr-rs/psl@v2.1.238...v2.1.241)

---
updated-dependencies:
- dependency-name: psl
  dependency-version: 2.1.241
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit e4b2219)
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.151 to 1.0.154.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@v1.0.151...v1.0.154)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-version: 1.0.154
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 59adada)
Brings the 0.10.1 patch release (Python 3.15, PyO3 0.30, dependency
updates) and the AGPL relicense back into dev. Conflicts were only
version bumps: took ruff 0.17.0 from stable, and regenerated Cargo.lock
from stable's lock plus dev's httpdate dependency.
@liquidsec
liquidsec merged commit e90c796 into dev Oct 21, 2026
16 checks passed
@liquidsec
liquidsec deleted the sync-stable-into-dev branch October 21, 2026 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants