mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

- Allow to build against contemporary versions of OpenSSL

Browse Source 
- Add missing license information, remove useless comment
This commit is contained in:
Alexey Dokuchaev 2020-09-10 07:45:48 +00:00
parent b1d08859fa
commit bdc69039fd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=548184
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
games/ldmud/Makefile
View File

@ -12,6 +12,9 @@ MASTER_SITES= http://www.bearnip.com/ftp/mud/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Modern version of the LPMud game driver
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKRSC}/COPYRIGHT
BUILD_DEPENDS= help2man:misc/help2man
LIB_DEPENDS= libpcre.so:devel/pcre
@ -45,17 +48,11 @@ SQLITE_CONFIGURE_ENABLE=use-sqlite
.include <bsd.port.options.mk>
.if ${SSL_DEFAULT} == base
BROKEN_FreeBSD_12= incomplete definition of type 'struct rsa_st'
BROKEN_FreeBSD_13= incomplete definition of type 'struct rsa_st'
.endif
.if ${PORT_OPTIONS:MMYSQL}
LDFLAGS+= -L${LOCALBASE}/lib/mysql
.endif
post-install:
# # Install mudlib and other directories
@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}/var/log/${PORTNAME} \
${STAGEDIR}/var/run/${PORTNAME}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ldmud

63
games/ldmud/files/patch-pkg-openssl.c Normal file
View File

@ -0,0 +1,63 @@
--- pkg-openssl.c.orig 2011-02-26 21:05:07 UTC
+++ pkg-openssl.c
@@ -164,7 +164,7 @@ tls_verify_callback(int preverify_ok, X509_STORE_CTX *
char buf[512];
printf("%s tls_verify_callback(%d, ...)\n", time_stamp(), preverify_ok);
- X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, sizeof buf);
+ X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get_current_cert(ctx)), buf, sizeof buf);
printf("depth %d: %s\n", X509_STORE_CTX_get_error_depth(ctx), buf);
}
return MY_TRUE;
@@ -801,10 +801,10 @@ tls_check_certificate (interactive_t *ip, Bool more)
break;
}
/* extension name */
- len = OBJ_obj2txt(buf, sizeof buf, ext->object, 1),
+ len = OBJ_obj2txt(buf, sizeof buf, X509_EXTENSION_get_object(ext), 1),
put_c_n_string(&(extensions->item[3 * i]), (char *)buf, len);
- len = OBJ_obj2txt(buf, sizeof buf, ext->object, 0),
+ len = OBJ_obj2txt(buf, sizeof buf, X509_EXTENSION_get_object(ext), 0),
put_c_n_string(&(extensions->item[3 * i + 1]), (char *)buf, len);
/* extension values */
@@ -1050,20 +1050,38 @@ calc_digest (digest_t md, void *dest, size_t destlen,
errorf("OpenSSL wasn't configured to provide the hmac() method.\n");
/* NOTREACHED */
#else
+# if OPENSSL_VERSION_NUMBER < 0x10100005L
HMAC_CTX ctx;
HMAC_Init(&ctx, key, keylen, md);
HMAC_Update(&ctx, msg, msglen);
HMAC_Final(&ctx, dest, NULL);
+# else
+ HMAC_CTX *ctx = HMAC_CTX_new();
+
+ HMAC_Init(ctx, key, keylen, md);
+ HMAC_Update(ctx, msg, msglen);
+ HMAC_Final(ctx, dest, NULL);
+ HMAC_CTX_free(ctx);
+# endif
#endif
}
else
{
+#if OPENSSL_VERSION_NUMBER < 0x10100005L
EVP_MD_CTX ctx;
EVP_DigestInit(&ctx, md);
EVP_DigestUpdate(&ctx, msg, msglen);
EVP_DigestFinal(&ctx, dest, NULL);
+#else
+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+
+ EVP_DigestInit(ctx, md);
+ EVP_DigestUpdate(ctx, msg, msglen);
+ EVP_DigestFinal(ctx, dest, NULL);
+ EVP_MD_CTX_free(ctx);
+#endif
}
} /* calc_digest() */