haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

libp11: Bump version for OpenSSL changes.

Browse Source
This commit is contained in:
Augustin Cavalier
2020-06-06 13:44:21 -04:00
parent 25b60f3657
commit 89bdb338ce
2 changed files with 5 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-libs/libp11/libp11-0.4.7.recipe → dev-libs/libp11/libp11-0.4.10.recipe
View File

@@ -2,20 +2,20 @@ SUMMARY="A PKCS#11 wrapper library"
DESCRIPTION="libp11 is a library implementing a thin layer on top of PKCS#11 \
API to make using PKCS#11 implementations easier."
HOMEPAGE="https://github.com/opensc/libp11"
COPYRIGHT="2016-2017 Michał Trojnara
COPYRIGHT="2016-2019 Michał Trojnara
2015-2016 Nikos Mavrogiannopoulos
2007-2009 Andreas Jellinghaus
2011 Martin Paljak"
LICENSE="GNU LGPL v2.1"
REVISION="2"
REVISION="1"
SOURCE_URI="$HOMEPAGE/releases/download/libp11-$portVersion/libp11-$portVersion.tar.gz"
CHECKSUM_SHA256="32e486d4279e09174b63eb263bc840016ebfa80b0b154390c0539b211aec0452"
PATCHES="libp11-$portVersion.patchset"
CHECKSUM_SHA256="639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4"
#PATCHES="libp11-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="2.${portVersion#0.}"
libVersion="3.4.2"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="

47
dev-libs/libp11/patches/libp11-0.4.7.patchset
View File

@@ -1,47 +0,0 @@
From dc5ab0ea306e78dbca393058bdad03b23afa1ca5 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Tue, 5 Jun 2018 16:26:43 +0000
Subject: C89 fixes for gcc2 compatibility.
diff --git a/src/p11_ec.c b/src/p11_ec.c
index 37025d4..57bedf8 100644
--- a/src/p11_ec.c
+++ b/src/p11_ec.c
@@ -252,12 +252,13 @@ static void pkcs11_set_ex_data_ec(EC_KEY* ec, PKCS11_KEY* key)
static void pkcs11_update_ex_data_ec(PKCS11_KEY* key)
{
EVP_PKEY* evp = key->evp_key;
+ EC_KEY* ec;
if (evp == NULL)
return;
if (EVP_PKEY_base_id(evp) != EVP_PKEY_EC)
return;
- EC_KEY* ec = EVP_PKEY_get1_EC_KEY(evp);
+ ec = EVP_PKEY_get1_EC_KEY(evp);
pkcs11_set_ex_data_ec(ec, key);
EC_KEY_free(ec);
}
diff --git a/src/p11_rsa.c b/src/p11_rsa.c
index efa40d4..966b962 100644
--- a/src/p11_rsa.c
+++ b/src/p11_rsa.c
@@ -243,12 +243,13 @@ static void pkcs11_set_ex_data_rsa(RSA* rsa, PKCS11_KEY* key)
static void pkcs11_update_ex_data_rsa(PKCS11_KEY* key)
{
EVP_PKEY* evp = key->evp_key;
+ RSA* rsa;
if (evp == NULL)
return;
if (EVP_PKEY_base_id(evp) != EVP_PKEY_RSA)
return;
- RSA* rsa = EVP_PKEY_get1_RSA(evp);
+ rsa = EVP_PKEY_get1_RSA(evp);
pkcs11_set_ex_data_rsa(rsa, key);
RSA_free(rsa);
}
--
2.17.1