Skip to content
Draft
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
12 changes: 0 additions & 12 deletions openssl/0002-Support-MSYS2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,3 @@
return $lib;
}

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 421fd89..640db8c 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -21,6 +21,7 @@ my $x509hash = "-subject_hash";
my $crlhash = "-hash";
my $verbose = 0;
my $symlink_exists=eval {symlink("",""); 1};
+$symlink_exists=0;
my $removelinks = 1;

## Parse flags.
11 changes: 0 additions & 11 deletions openssl/0004-Override-engines-directory.patch

This file was deleted.

14 changes: 4 additions & 10 deletions openssl/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pkgname=('openssl' 'libopenssl' 'openssl-devel' 'openssl-docs')
# Note: always rebuild openssh after updating openssl pkgver,
# it does strict version checks at runtime
pkgver=3.6.2
pkgver=4.0.0
pkgrel=1
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64')
Expand All @@ -17,13 +17,11 @@ makedepends=('gcc' 'tar' 'perl' 'diffutils' 'nasm')
noextract=(${pkgname}-${pkgver}.tar.gz)
source=("https://github.com/openssl/openssl/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
'0001-Use-usr-ssl-as-ca-dir-instead-of-.-demoCA.patch'
'0002-Support-MSYS2.patch'
'0004-Override-engines-directory.patch')
sha256sums=('aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f'
'0002-Support-MSYS2.patch')
sha256sums=('c32cf49a959c4f345f9606982dd36e7d28f7c58b19c2e25d75624d2b3d2f79ac'
'SKIP'
'7ff3213d8d085238695f076d254f16d15b16a9baca1f9393c1bed0057006da2c'
'b73a45cf26830bbb3c110a8f9e042ea5c71a9627204d5d172b04c43aff5b0f1a'
'345350546bf55dd069133e0c56b2c5f7e037db237a30f7ad38159bd61b6d4daf')
'f643ea30404c7ff0f4984c23b7b868fc58318427bd9d5f8116aef4621a5ba592')
# https://openssl-library.org/source/index.html
validpgpkeys=(
'BA5473A2B0587B07FB27CF2D216094DFD0CB81EF' # openssl@openssl.org
Expand All @@ -35,7 +33,6 @@ prepare() {

patch -p1 -i ${srcdir}/0001-Use-usr-ssl-as-ca-dir-instead-of-.-demoCA.patch
patch -p1 -i ${srcdir}/0002-Support-MSYS2.patch
patch -p1 -i ${srcdir}/0004-Override-engines-directory.patch
}

build() {
Expand Down Expand Up @@ -77,7 +74,6 @@ package_openssl() {

mkdir -p ${pkgdir}/usr/bin
cp -f ${srcdir}/dest/usr/bin/*.exe ${pkgdir}/usr/bin/
cp -f ${srcdir}/dest/usr/bin/c_rehash ${pkgdir}/usr/bin/
mkdir -p ${pkgdir}/usr/share/man
cp -rf ${srcdir}/dest/usr/share/man/man1 ${pkgdir}/usr/share/man
cp -rf ${srcdir}/dest/usr/share/man/man5 ${pkgdir}/usr/share/man
Expand All @@ -99,8 +95,6 @@ package_libopenssl() {
cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/

mkdir -p ${pkgdir}/usr/lib/openssl
cp -rf ${srcdir}/dest/usr/lib/openssl/engines-3 ${pkgdir}/usr/lib/openssl/
chmod -R 755 ${pkgdir}/usr/lib/openssl/engines-3

cp -rf ${srcdir}/dest/usr/lib/ossl-modules ${pkgdir}/usr/lib/
chmod -R 755 ${pkgdir}/usr/lib/ossl-modules
Expand Down
Loading