Merge branch 'sarrchri-linux-libssl3' into master

See https://github.com/timvisee/ffsend/pull/156
This commit is contained in:
timvisee 2023-05-18 23:00:57 +02:00
commit f06b639542
No known key found for this signature in database
GPG key ID: B8DB720BC383E172
5 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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]]

View file

@ -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() {

View file

@ -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() {

View file

@ -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]