cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "allow building against libressl" (upstream git commit

Browse Source 
7b9bd6003082a60bbc4452f048ca8a7b839025f1), and remove local workaround.
This commit is contained in:
dcoppa 2016-09-30 13:48:38 +00:00
parent 836c27bc19
commit dcd5c5b478
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/opensc/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.39 2016/09/20 12:56:15 dcoppa Exp $
# $OpenBSD: Makefile,v 1.40 2016/09/30 13:48:38 dcoppa Exp $
COMMENT= set of libraries and utilities to access smart cards
VERSION= 0.16.0
DISTNAME= OpenSC-${VERSION}
PKGNAME= opensc-${VERSION}
REVISION= 5
REVISION= 6
GH_ACCOUNT= OpenSC
GH_PROJECT= ${GH_ACCOUNT}
GH_TAGNAME= ${VERSION}
@ -38,7 +38,7 @@ CONFIGURE_ARGS= --enable-static \
--sysconfdir=${SYSCONFDIR} \
--enable-sm \
--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/PCSC -DOPENSSL_NO_STATIC_ENGINE"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/PCSC"
FAKE_FLAGS= mandir="${PREFIX}/man/" \
sysconfdir="${PREFIX}/share/examples/opensc/"

19
security/opensc/patches/patch-src_pkcs11_openssl_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_pkcs11_openssl_c,v 1.1 2016/09/30 13:48:38 dcoppa Exp $
commit 7b9bd6003082a60bbc4452f048ca8a7b839025f1
Author: Leonardo Brondani Schenkel <leonardo@schenkel.net>
Date: Mon Sep 26 14:54:58 2016 +0200
openssl: allow building against libressl
--- src/pkcs11/openssl.c.orig Fri Sep 30 15:33:03 2016
+++ src/pkcs11/openssl.c Fri Sep 30 15:33:38 2016
@@ -180,7 +180,7 @@ sc_pkcs11_register_openssl_mechanisms(struct sc_pkcs11
e = ENGINE_by_id("gost");
if (!e)
{
-#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
+#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST) && !defined(LIBRESSL_VERSION_NUMBER)
ENGINE_load_gost();
e = ENGINE_by_id("gost");
#else