Date: Thu, 10 Sep 2020 07:45:48 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548184 - in head/games/ldmud: . files Message-ID: <202009100745.08A7jmBc065816@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Sep 10 07:45:48 2020 New Revision: 548184 URL: https://svnweb.freebsd.org/changeset/ports/548184 Log: - Allow to build against contemporary versions of OpenSSL - Add missing license information, remove useless comment Added: head/games/ldmud/files/patch-pkg-openssl.c (contents, props changed) Modified: head/games/ldmud/Makefile Modified: head/games/ldmud/Makefile ============================================================================== --- head/games/ldmud/Makefile Thu Sep 10 05:06:53 2020 (r548183) +++ head/games/ldmud/Makefile Thu Sep 10 07:45:48 2020 (r548184) @@ -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 Added: head/games/ldmud/files/patch-pkg-openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/ldmud/files/patch-pkg-openssl.c Thu Sep 10 07:45:48 2020 (r548184) @@ -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() */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009100745.08A7jmBc065816>