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

handle ASN1_STRING_get0_data() addition; from jsing

Browse Source
This commit is contained in:
sthen 2018-02-16 12:12:26 +00:00
parent 4b97f1d519
commit 971a4a1cb8
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.122 2018/02/09 09:31:50 sthen Exp $ # $OpenBSD: Makefile,v 1.123 2018/02/16 12:12:26 sthen Exp $
# XXX building this port while a version is already installed on the # XXX building this port while a version is already installed on the
# system will lead to unexpected hidden dependencies!!! # system will lead to unexpected hidden dependencies!!!
@ -18,8 +18,8 @@ PKGNAME-bat= bacula-bat-$V
PKGNAME-mysql= bacula-mysql-$V PKGNAME-mysql= bacula-mysql-$V
PKGNAME-pgsql= bacula-pgsql-$V PKGNAME-pgsql= bacula-pgsql-$V
PKGNAME-sqlite3= bacula-sqlite3-$V PKGNAME-sqlite3= bacula-sqlite3-$V
REVISION-main= 2 REVISION-main= 3
REVISION-server= 1 REVISION-server= 2
CATEGORIES= sysutils CATEGORIES= sysutils

32
sysutils/bacula/patches/patch-src_lib_openssl-compat_h
View File

@ -1,14 +1,40 @@
$OpenBSD: patch-src_lib_openssl-compat_h,v 1.1 2017/11/22 22:35:25 sthen Exp $ $OpenBSD: patch-src_lib_openssl-compat_h,v 1.2 2018/02/16 12:12:26 sthen Exp $
Index: src/lib/openssl-compat.h Index: src/lib/openssl-compat.h
--- src/lib/openssl-compat.h.orig --- src/lib/openssl-compat.h.orig
+++ src/lib/openssl-compat.h +++ src/lib/openssl-compat.h
@@ -1,7 +1,7 @@ @@ -1,13 +1,21 @@
#ifndef __OPENSSL_COPMAT__H__ #ifndef __OPENSSL_COPMAT__H__
#define __OPENSSL_COPMAT__H__ #define __OPENSSL_COPMAT__H__
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
{ {
CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
return 1;
}
+static inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+{
+ return asn1->data;
+}
+#endif
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
static inline void EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
{
EVP_CIPHER_CTX_init(ctx);
@@ -32,11 +40,6 @@ static inline void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
{
EVP_MD_CTX_reset(ctx);
OPENSSL_free(ctx);
-}
-
-static inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
-{
- return asn1->data;
}
#endif