Page MenuHomeFreeBSD
Files F168176893

D8824.id23394.diff
No OneTemporary
Actions

D8824.id23394.diff
View Options

Index: irc/hexchat/Makefile
===================================================================
--- irc/hexchat/Makefile
+++ irc/hexchat/Makefile
@@ -76,10 +76,10 @@
SOCKS_CONFIGURE_ENABLE= socks
TEXTFE_CONFIGURE_ENABLE=textfe
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-WITH_OPENSSL_PORT= yes
+.if ${SSL_DEFAULT} == base
+IGNORE_FreeBSD_9= Requires newer OpenSSL
.endif
.if ${PORT_OPTIONS:MCA_BUNDLE}
@@ -100,4 +100,4 @@
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: irc/hexchat/files/patch-src__common__ssl.c
===================================================================
--- irc/hexchat/files/patch-src__common__ssl.c
+++ irc/hexchat/files/patch-src__common__ssl.c
@@ -1,5 +1,23 @@
--- src/common/ssl.c.orig 2016-12-10 14:30:51 UTC
+++ src/common/ssl.c
+@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *ce
+ return 1;
+
+ alg = OBJ_obj2nid (algor->algorithm);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
+ #else
+ sign_alg = X509_get_signature_nid (peer_cert);
+@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
+
+ SSL_set_fd (ssl, sd);
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ method = ctx->method;
+ #else
+ method = SSL_CTX_get_ssl_method (ctx);
@@ -328,7 +328,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver
__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
return (err_buf);

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 5:42 PM (9 h, 21 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37406391
Default Alt Text
D8824.id23394.diff (1 KB)

Event Timeline