[Midnightbsd-cvs] mports [24732] trunk/security/trousers: update libressl patch

[laffer1 at midnightbsd.org]

Revision: 24732
          http://svnweb.midnightbsd.org/mports/?rev=24732
Author:   laffer1
Date:     2018-11-28 09:14:43 -0500 (Wed, 28 Nov 2018)
Log Message:
-----------
update libressl patch

Modified Paths:
--------------
    trunk/security/trousers/Makefile
    trunk/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c
    trunk/security/trousers/pkg-descr

Modified: trunk/security/trousers/Makefile
===================================================================
--- trunk/security/trousers/Makefile	2018-11-28 14:12:29 UTC (rev 24731)
+++ trunk/security/trousers/Makefile	2018-11-28 14:14:43 UTC (rev 24732)
@@ -11,7 +11,7 @@
 
 LICENSE=	bsd3
 
-BUILD_DEPENDS=	tpm-emulator>=0.7.4_1:${PORTSDIR}/emulators/tpm-emulator
+BUILD_DEPENDS=	tpm-emulator>=0.7.4_1:emulators/tpm-emulator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix autoreconf gmake iconv libtool pkgconfig ssl
@@ -29,6 +29,8 @@
 		RANLIB=:
 MAKE_ENV=	ICONV_LIB=${ICONV_LIB} \
 		ICONV_PREFIX=${ICONV_PREFIX}
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
 PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"

Modified: trunk/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c
===================================================================
--- trunk/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c	2018-11-28 14:12:29 UTC (rev 24731)
+++ trunk/security/trousers/files/patch-src_trspi_crypto_openssl_rsa.c	2018-11-28 14:14:43 UTC (rev 24732)
@@ -5,7 +5,7 @@
  #endif
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100001L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  static int
  RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
  {

Modified: trunk/security/trousers/pkg-descr
===================================================================
--- trunk/security/trousers/pkg-descr	2018-11-28 14:12:29 UTC (rev 24731)
+++ trunk/security/trousers/pkg-descr	2018-11-28 14:14:43 UTC (rev 24732)
@@ -1,4 +1,4 @@
 TrouSerS is an CPL (Common Public License) licensed Trusted Computing
 Software Stack. It is mostly compliant with the TSS 1.2 specification.
 
-WWW: http://sourceforge.net/projects/trousers
+WWW: https://sourceforge.net/projects/trousers/