Skip to content

Commit

Permalink
Build Rust code in package
Browse files Browse the repository at this point in the history
* Switch to `Arch: any` because the package contains compiled code and
  this enables debhelper's automatic shlibs dependency system.
* Rename the binary to `securedrop-proxy` because that's the Rust name.
  • Loading branch information
legoktm committed Feb 12, 2024
1 parent 0b7e94a commit 2b95298
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
PKG_DIR=../client make -C securedrop-builder requirements
PKG_DIR=../export make -C securedrop-builder requirements
PKG_DIR=../log make -C securedrop-builder requirements
PKG_DIR=../proxy make -C securedrop-builder requirements
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git diff --ignore-matching-lines=# --exit-code
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: securedrop-client
Section: unknown
Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Build-Depends: debhelper-compat (= 11), python3-virtualenv
Build-Depends: debhelper-compat (= 11), python3-virtualenv, libssl-dev, pkg-config
Standards-Version: 3.9.8
Homepage: https://github.com/freedomofpress/securedrop-client
X-Python3-Version: >= 3.5
Expand Down Expand Up @@ -33,8 +33,8 @@ Description: Python module and qrexec service to store logs for SecureDrop Works
SecureDrop Workstation project in Qubes.

Package: securedrop-proxy
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends}, libyaml-0-2
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: This is securedrop Qubes proxy service
This package provides the network proxy on Qubes to talk to the SecureDrop server.

Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ override_dh_auto_install:
bash ./debian/setup-venv.sh client
bash ./debian/setup-venv.sh export
bash ./debian/setup-venv.sh log
bash ./debian/setup-venv.sh proxy
cargo build --release --locked
dh_auto_install

override_dh_strip_nondeterminism:
Expand Down
1 change: 1 addition & 0 deletions debian/securedrop-proxy.install
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
proxy/qubes/securedrop.Proxy etc/qubes-rpc/
target/release/securedrop-proxy usr/bin/
1 change: 0 additions & 1 deletion debian/securedrop-proxy.links

This file was deleted.

2 changes: 1 addition & 1 deletion proxy/qubes/securedrop.Proxy
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/usr/bin/sd-proxy /home/user/.securedrop_proxy/sd-proxy.yaml
/usr/bin/securedrop-proxy

0 comments on commit 2b95298

Please sign in to comment.