Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade linux/Arch builds to use libssl3. #156

Merged
merged 1 commit into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ build-x86_64-linux-musl:

# Build OpenSSL statically
- apt-get install -y build-essential wget musl-tools
- wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1k.tar.gz
- tar xzvf openssl-1.1.1k.tar.gz
- cd openssl-1.1.1k
- wget https://www.openssl.org/source/openssl-3.0.8.tar.gz
- tar xzvf openssl-3.0.8.tar.gz
- cd openssl-3.0.8
- ./config no-async -fPIC --openssldir=/usr/local/ssl --prefix=/usr/local
- make
- make install
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ An optional password may be specified, and a default file lifetime of 1 \
remain online forever. This provides a secure platform to share your files."""
priority = "standard"
license-file = ["LICENSE", "3"]
depends = "$auto, libssl1.1, ca-certificates, xclip"
depends = "$auto, libssl3, ca-certificates, xclip"
maintainer-scripts = "pkg/deb"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion pkg/aur/ffsend-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ arch=('x86_64' 'i686')
provides=('ffsend')
conflicts=('ffsend')
depends=('ca-certificates')
makedepends=('cargo' 'cmake' 'openssl>=1.0')
makedepends=('cargo' 'cmake' 'openssl')
optdepends=('xclip: clipboard support')

prepare() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/aur/ffsend/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source=("$url/-/archive/v$pkgver/ffsend-v$pkgver.tar.gz") # automatically set in
sha256sums=('SKIP') # automatically set in CI, see: /.gitlab-ci.yml
arch=('x86_64' 'i686')
depends=('ca-certificates')
makedepends=('cargo' 'cmake' 'openssl>=1.0')
makedepends=('cargo' 'cmake' 'openssl')
optdepends=('xclip: clipboard support')

prepare() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ parts:
plugin: rust
build-attributes: [no-system-libraries]
build-packages: [make, cmake, pkg-config, libssl-dev]
stage-packages: [libssl1.0.0, xclip]
stage-packages: [libssl3, xclip]