Date: Tue, 8 Sep 2020 14:25:18 +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: r547986 - in head/net/libarms: . files Message-ID: <202009081425.088EPIeO025945@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Sep 8 14:25:18 2020 New Revision: 547986 URL: https://svnweb.freebsd.org/changeset/ports/547986 Log: - Unbreak the build against modern versions of OpenSSL - Convert to USES+=localbase, define LICENSE (BSD2CLAUSE) Added: head/net/libarms/files/ head/net/libarms/files/patch-libarms_ssl.c (contents, props changed) Modified: head/net/libarms/Makefile Modified: head/net/libarms/Makefile ============================================================================== --- head/net/libarms/Makefile Tue Sep 8 14:22:38 2020 (r547985) +++ head/net/libarms/Makefile Tue Sep 8 14:25:18 2020 (r547986) @@ -11,24 +11,17 @@ MASTER_SITES= https://dev.smf.jp/dl/ \ MAINTAINER= shigeru@iij.ad.jp COMMENT= SMFv2/ARMS client library for C +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libexpat.so:textproc/expat2 +USES= gmake libtool localbase ssl GNU_CONFIGURE= yes -USES= gmake libtool ssl USE_LDCONFIG= yes -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include - -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct x509_store_ctx_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct x509_store_ctx_st' -.endif - post-configure: @${REINPLACE_CMD} 's|$${datarootdir}/doc/$${PACKAGE_TARNAME}|${DOCSDIR}|' \ ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/net/libarms/files/patch-libarms_ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libarms/files/patch-libarms_ssl.c Tue Sep 8 14:25:18 2020 (r547986) @@ -0,0 +1,37 @@ +--- libarms/ssl.c.orig 2012-01-24 02:47:27 UTC ++++ libarms/ssl.c +@@ -162,6 +162,7 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX * + { + char cn[256]; + const char *errmsg = NULL; ++ int error; + + X509_NAME_oneline( + X509_get_subject_name( +@@ -171,13 +172,15 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX * + X509_get_issuer_name( + X509_STORE_CTX_get_current_cert(ctx)), cn, sizeof(cn)); + ++ error = X509_STORE_CTX_get_error(ctx); ++ + if (!ok) { +- switch (ctx->error) { ++ switch (error) { + case X509_V_ERR_CERT_NOT_YET_VALID: + case X509_V_ERR_CERT_HAS_EXPIRED: + /* XXX: ignore Validity Not Before/Not After field */ + ok = 1; +- ctx->error = X509_V_OK; ++ X509_STORE_CTX_set_error(ctx, X509_V_OK); + break; + + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: +@@ -187,7 +190,7 @@ arms_ssl_servercert_verify_cb(int ok, X509_STORE_CTX * + break; + + default: +- errmsg = X509_verify_cert_error_string(ctx->error); ++ errmsg = X509_verify_cert_error_string(error); + break; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009081425.088EPIeO025945>