DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-02-18 07:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump(main/proton-bridge): 3.22.0

Browse Source 
- Fixes https://github.com/termux/termux-packages/issues/28390

- Disable `libfido2` because Termux does not currently have a `libfido2` package
This commit is contained in:
termux-pacman-bot
2026-02-10 12:50:57 +00:00
parent 137371efed
commit 5f4f4b9bee
2 changed files with 68 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/proton-bridge/build.sh
View File

@@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://github.com/ProtonMail/proton-bridge
TERMUX_PKG_DESCRIPTION="ProtonMail Bridge application"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION="3.21.2"
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="3.22.0"
TERMUX_PKG_SRCURL=git+https://github.com/ProtonMail/proton-bridge
TERMUX_PKG_GIT_BRANCH=v${TERMUX_PKG_VERSION}
TERMUX_PKG_GIT_BRANCH="v${TERMUX_PKG_VERSION}"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_DEPENDS="glib, libsecret"
TERMUX_PKG_AUTO_UPDATE=true
@@ -19,6 +18,9 @@ termux_step_make() {
export GOPATH="${TERMUX_PKG_BUILDDIR}"
cd "${TERMUX_PKG_SRCDIR}" || exit 1
rm -rf internal/fido \
internal/frontend/grpc/fido.go
make build-nogui
}

63
packages/proton-bridge/disable-fido.patch Normal file
View File

@@ -0,0 +1,63 @@
--- a/internal/frontend/cli/accounts.go
+++ b/internal/frontend/cli/accounts.go
@@ -27,7 +27,5 @@ import (
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
"github.com/ProtonMail/proton-bridge/v3/internal/certs"
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
- "github.com/ProtonMail/proton-bridge/v3/internal/fido"
"github.com/ProtonMail/proton-bridge/v3/internal/hv"
- "github.com/ProtonMail/proton-bridge/v3/internal/unleash"
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
@@ -176,7 +176,6 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) {
return
}
- u2fLoginEnabled := f.bridge.GetFeatureFlagValue(unleash.InboxBridgeU2FLoginEnabled)
switch auth.TwoFA.Enabled {
case proton.HasTOTP:
@@ -187,30 +186,12 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) {
}
case proton.HasFIDO2:
- if !u2fLoginEnabled {
- // This case may only occur for internal users.
- f.printAndLogError("Cannot login: Security key authentication required but not enabled in server configuration.")
- return
- }
-
- if len(auth.TwoFA.FIDO2.RegisteredKeys) == 0 {
- f.printAndLogError("Cannot login: Security key login is required, but no registered keys were provided.")
- }
- if err := fido.AuthWithHardwareKeyCLI(f, client, auth); err != nil {
- f.printAndLogError("Cannot login: ", err)
- return
- }
+ f.printAndLogError("Cannot login: Termux does not currently build proton-bridge with FIDO support.")
+ return
case proton.HasFIDO2AndTOTP:
- if u2fLoginEnabled && len(auth.TwoFA.FIDO2.RegisteredKeys) > 0 && f.yesNoQuestion("Do you want to use a security key for Two-factor authentication") {
- if err := fido.AuthWithHardwareKeyCLI(f, client, auth); err != nil {
- f.printAndLogError("Cannot login: ", err)
- return
- }
- } else if err := f.loginTOTP(c, client); err != nil {
- f.printAndLogError("Cannot login: ", err)
- return
- }
+ f.printAndLogError("Cannot login: Termux does not currently build proton-bridge with FIDO support.")
+ return
}
var keyPass []byte
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,6 @@ endif
ifneq "${GOOS}" "darwin"
ifneq "${GOOS}" "windows"
go-build-finalize= \
- CGO_LDFLAGS="${LIBFIDO2_LDFLAGS}" \
$(call go-build,$(1),$(2),$(3))
endif
endif