From owner-svn-ports-head@freebsd.org Sat Oct 20 15:41:32 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42AB9FE989A; Sat, 20 Oct 2018 15:41:32 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDCBD764C0; Sat, 20 Oct 2018 15:41:31 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E8A582000C; Sat, 20 Oct 2018 15:41:31 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9KFfVFT046425; Sat, 20 Oct 2018 15:41:31 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9KFfVXQ046424; Sat, 20 Oct 2018 15:41:31 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201810201541.w9KFfVXQ046424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 20 Oct 2018 15:41:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482566 - in head/net-im/licq: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/net-im/licq: . files X-SVN-Commit-Revision: 482566 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2018 15:41:32 -0000 Author: dinoex Date: Sat Oct 20 15:41:31 2018 New Revision: 482566 URL: https://svnweb.freebsd.org/changeset/ports/482566 Log: - fix OpenSSL 1.1.x build Added: head/net-im/licq/files/patch-licq.cpp (contents, props changed) Modified: head/net-im/licq/Makefile Modified: head/net-im/licq/Makefile ============================================================================== --- head/net-im/licq/Makefile Sat Oct 20 15:41:15 2018 (r482565) +++ head/net-im/licq/Makefile Sat Oct 20 15:41:31 2018 (r482566) @@ -4,7 +4,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} Added: head/net-im/licq/files/patch-licq.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/licq/files/patch-licq.cpp Sat Oct 20 15:41:31 2018 (r482566) @@ -0,0 +1,52 @@ +--- src/licq.cpp.orig 2014-06-01 19:16:42 UTC ++++ src/licq.cpp +@@ -89,6 +89,19 @@ using std::string; + extern SSL_CTX *gSSL_CTX; + extern SSL_CTX *gSSL_CTX_NONICQ; + ++# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100001L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) ++static int ++DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) ++{ ++ dh->p=p; ++ if (q != NULL) ++ dh->q=q; ++ dh->g=g; ++ return 1; /* success */ ++} ++# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */ ++ + // AUTOGENERATED by dhparam + static DH *get_dh512() + { +@@ -104,12 +117,14 @@ static DH *get_dh512() + 0x02, + }; + DH *dh; ++ BIGNUM *dhp_bn, *dhg_bn; ++ + + if ((dh=DH_new()) == NULL) return(NULL); +- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); +- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); +- if ((dh->p == NULL) || (dh->g == NULL)) +- { DH_free(dh); return(NULL); } ++ dhp_bn = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL); ++ dhg_bn = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL); ++ if ((dhp_bn == NULL) || (dhg_bn == NULL) || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) ++ { DH_free(dh); BN_free(dhp_bn); BN_free(dhg_bn); return(NULL); } + return(dh); + } + +@@ -610,8 +625,8 @@ bool CLicq::Init(int argc, char **argv) + #ifdef USE_OPENSSL + // Initialize SSL + SSL_library_init(); +- gSSL_CTX = SSL_CTX_new(TLSv1_method()); +- gSSL_CTX_NONICQ = SSL_CTX_new(TLSv1_method()); ++ gSSL_CTX = SSL_CTX_new(SSLv23_method()); ++ gSSL_CTX_NONICQ = SSL_CTX_new(SSLv23_method()); + #if OPENSSL_VERSION_NUMBER >= 0x00905000L + SSL_CTX_set_cipher_list(gSSL_CTX, "ADH:@STRENGTH"); + #else