sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak the build against modern versions of OpenSSL

Browse source 
- Convert to USES+=localbase, define LICENSE (BSD2CLAUSE)
This commit is contained in:
Alexey Dokuchaev 2020-09-08 14:25:18 +00:00
parent 5cda30202e
commit 361c9fd49e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=547986
2 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net/libarms/Makefile
View file

@ -11,24 +11,17 @@ MASTER_SITES= https://dev.smf.jp/dl/ \
MAINTAINER= shigeru@iij.ad.jp MAINTAINER= shigeru@iij.ad.jp
COMMENT= SMFv2/ARMS client library for C COMMENT= SMFv2/ARMS client library for C
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:textproc/expat2 LIB_DEPENDS= libexpat.so:textproc/expat2
USES= gmake libtool localbase ssl
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USES= gmake libtool ssl
USE_LDCONFIG= yes 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: post-configure:
@${REINPLACE_CMD} 's|$${datarootdir}/doc/$${PACKAGE_TARNAME}|${DOCSDIR}|' \ @${REINPLACE_CMD} 's|$${datarootdir}/doc/$${PACKAGE_TARNAME}|${DOCSDIR}|' \
${WRKSRC}/Makefile ${WRKSRC}/Makefile
.include <bsd.port.post.mk> .include <bsd.port.mk>

37
net/libarms/files/patch-libarms_ssl.c Normal file
View file

@ -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;
}