From owner-svn-ports-all@freebsd.org Fri Aug 28 06:53:54 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 253DC3CFD82; Fri, 28 Aug 2020 06:53:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bd9L95fXnz45hf; Fri, 28 Aug 2020 06:53:53 +0000 (UTC) (envelope-from danfe@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 A677E10F77; Fri, 28 Aug 2020 06:53:53 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07S6rrAg099756; Fri, 28 Aug 2020 06:53:53 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07S6rrpY099755; Fri, 28 Aug 2020 06:53:53 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202008280653.07S6rrpY099755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 28 Aug 2020 06:53:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546708 - in head/net-im/climm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/net-im/climm: . files X-SVN-Commit-Revision: 546708 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 06:53:54 -0000 Author: danfe Date: Fri Aug 28 06:53:53 2020 New Revision: 546708 URL: https://svnweb.freebsd.org/changeset/ports/546708 Log: Allow to build against contemporary versions of OpenSSL. Added: head/net-im/climm/files/ head/net-im/climm/files/patch-src_io_io__openssl.c (contents, props changed) Modified: head/net-im/climm/Makefile Modified: head/net-im/climm/Makefile ============================================================================== --- head/net-im/climm/Makefile Fri Aug 28 06:09:24 2020 (r546707) +++ head/net-im/climm/Makefile Fri Aug 28 06:53:53 2020 (r546708) @@ -25,11 +25,6 @@ XMPP_DESC= Enable XMPP Jabber support .include -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct dh_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct dh_st' -.endif - .if ${PORT_OPTIONS:MOTR} CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-otr Added: head/net-im/climm/files/patch-src_io_io__openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/climm/files/patch-src_io_io__openssl.c Fri Aug 28 06:53:53 2020 (r546708) @@ -0,0 +1,25 @@ +--- src/io/io_openssl.c.orig 2010-03-20 14:13:15 UTC ++++ src/io/io_openssl.c +@@ -96,10 +96,22 @@ static DH *get_dh512() + DH *dh; + + if ((dh=DH_new()) == NULL) return(NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10100005L ++ BIGNUM *p, *g; ++ ++ p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); ++ g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); ++ if (p == NULL || g == NULL) { ++ BN_free(p); BN_free(g); ++ DH_free(dh); return(NULL); ++ } else ++ DH_set0_pqg(dh, p, NULL, g); ++#else + 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); } ++#endif + return(dh); + } + /* END AUTOGENERATED */