From 5fd2eac6ebee158ea1e76c4d94aa28cbd0aba3a2 Mon Sep 17 00:00:00 2001 From: Christian Sarre Date: Wed, 12 Apr 2023 13:59:56 +0300 Subject: [PATCH] Upgrade to libssl3/openssl3. --- .gitlab-ci.yml | 6 +++--- Cargo.toml | 2 +- pkg/aur/ffsend-git/PKGBUILD | 2 +- pkg/aur/ffsend/PKGBUILD | 2 +- pkg/snap/snapcraft.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80289f9..ed67208 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Cargo.toml b/Cargo.toml index d677594..c8dad34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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]] diff --git a/pkg/aur/ffsend-git/PKGBUILD b/pkg/aur/ffsend-git/PKGBUILD index 41fa975..43b240f 100644 --- a/pkg/aur/ffsend-git/PKGBUILD +++ b/pkg/aur/ffsend-git/PKGBUILD @@ -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() { diff --git a/pkg/aur/ffsend/PKGBUILD b/pkg/aur/ffsend/PKGBUILD index 09a6c68..410585a 100644 --- a/pkg/aur/ffsend/PKGBUILD +++ b/pkg/aur/ffsend/PKGBUILD @@ -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() { diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml index 23452ad..8770705 100644 --- a/pkg/snap/snapcraft.yaml +++ b/pkg/snap/snapcraft.yaml @@ -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]