haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-24 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

libp11: bump to 0.4.7, add debuginfo, add gcc2 patch. (#2649)

Browse Source
This commit is contained in:
fbrosson
2018-06-05 16:40:42 +00:00
parent 4eaa8d3d95
commit 1b3313c03d
2 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dev-libs/libp11/libp11-0.4.4.recipe → dev-libs/libp11/libp11-0.4.7.recipe
View File

@@ -7,16 +7,20 @@ COPYRIGHT="2016-2017 Michał Trojnara
2007-2009 Andreas Jellinghaus 2007-2009 Andreas Jellinghaus
2011 Martin Paljak" 2011 Martin Paljak"
LICENSE="GNU LGPL v2.1" LICENSE="GNU LGPL v2.1"
REVISION="3" REVISION="1"
SOURCE_URI="$HOMEPAGE/releases/download/libp11-$portVersion/libp11-$portVersion.tar.gz" SOURCE_URI="$HOMEPAGE/releases/download/libp11-$portVersion/libp11-$portVersion.tar.gz"
CHECKSUM_SHA256="93d2741df04f7f1561962746943a056ca81582fecb59d0c4304e7e97a0902722" CHECKSUM_SHA256="32e486d4279e09174b63eb263bc840016ebfa80b0b154390c0539b211aec0452"
PATCHES="libp11-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="2.${portVersion#0.}"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES=" PROVIDES="
libp11$secondaryArchSuffix = $portVersion libp11$secondaryArchSuffix = $portVersion
lib:libp11$secondaryArchSuffix = 2.4.4 compat >= 2 lib:libp11$secondaryArchSuffix = $libVersionCompat
lib:libpkcs11$secondaryArchSuffix lib:libpkcs11$secondaryArchSuffix
lib:pkcs11$secondaryArchSuffix lib:pkcs11$secondaryArchSuffix
" "
@@ -27,7 +31,7 @@ REQUIRES="
PROVIDES_devel=" PROVIDES_devel="
libp11${secondaryArchSuffix}_devel = $portVersion libp11${secondaryArchSuffix}_devel = $portVersion
devel:libp11$secondaryArchSuffix = 2.4.4 compat >= 2 devel:libp11$secondaryArchSuffix = $libVersionCompat
" "
REQUIRES_devel=" REQUIRES_devel="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
@@ -51,6 +55,14 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
" "
TEST_REQUIRES="
cmd:softhsm2_util
"
defineDebugInfoPackage libp11$secondaryArchSuffix \
"$libDir"/engines/pkcs11.so \
"$libDir"/libp11.so.$libVersion
enginesDir=$libDir/engines enginesDir=$libDir/engines
BUILD() BUILD()
@@ -75,5 +87,6 @@ INSTALL()
TEST() TEST()
{ {
LIBRARY_PATH="$sourceDir/src/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
make check make check
} }

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

@@ -0,0 +1,47 @@
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