From owner-svn-ports-all@freebsd.org Wed Nov 27 17:04:01 2019 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 49A431B1E41; Wed, 27 Nov 2019 17:04:01 +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) server-signature RSA-PSS (4096 bits) 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 47NRv50sXbz4JRx; Wed, 27 Nov 2019 17:04:01 +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 DC94C188ED; Wed, 27 Nov 2019 17:04:00 +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 xARH40fW088105; Wed, 27 Nov 2019 17:04:00 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xARH40ME088103; Wed, 27 Nov 2019 17:04:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201911271704.xARH40ME088103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 27 Nov 2019 17:04:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518512 - in head/net-p2p/linuxdcpp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/net-p2p/linuxdcpp: . files X-SVN-Commit-Revision: 518512 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.29 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: Wed, 27 Nov 2019 17:04:01 -0000 Author: danfe Date: Wed Nov 27 17:04:00 2019 New Revision: 518512 URL: https://svnweb.freebsd.org/changeset/ports/518512 Log: - Allow to build against contemporary versions of OpenSSL and set missing INSTALLS_ICONS as reported by portlint(1) - Revert WITH_DEBUG part of the r512774 as explained by mat@: WITH_DEBUG means the port will be built with debugging symbols and will not be stripped. So before, if WITH_DEBUG was set, it was built with all debugging bells and whistles. Now, it only adds debug=1 to MAKE_ARGS, and it gets stripped in the end. WITH_DEBUG must not be set by port options, it is a user-facing variable. PR: 233972 Added: head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp (contents, props changed) Modified: head/net-p2p/linuxdcpp/Makefile Modified: head/net-p2p/linuxdcpp/Makefile ============================================================================== --- head/net-p2p/linuxdcpp/Makefile Wed Nov 27 17:02:54 2019 (r518511) +++ head/net-p2p/linuxdcpp/Makefile Wed Nov 27 17:04:00 2019 (r518512) @@ -17,22 +17,18 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp: USES= compiler:c++11-lang gettext gnome iconv localbase:ldflags \ pkgconfig scons ssl tar:bzip2 USE_GNOME= libglade2 +INSTALLS_ICONS= yes PORTDOCS= * DESTDIRNAME= FAKE_ROOT -OPTIONS_DEFINE= NOTIFY DEBUG DOCS +OPTIONS_DEFINE= NOTIFY DOCS OPTIONS_DEFAULT=NOTIFY NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_MAKE_ARGS_OFF= libnotify=0 -DEBUG_MAKE_ARGS=debug=1 - -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= member access into incomplete type 'dh_st' -BROKEN_FreeBSD_13= member access into incomplete type 'dh_st' +.if defined(WITH_DEBUG) +MAKE_ARGS+= debug=1 .endif post-patch: @@ -43,4 +39,4 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include +.include Added: head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp Wed Nov 27 17:04:00 2019 (r518512) @@ -0,0 +1,26 @@ +--- dcpp/CryptoManager.cpp.orig 2011-04-17 17:57:09 UTC ++++ dcpp/CryptoManager.cpp +@@ -107,12 +107,20 @@ CryptoManager::CryptoManager() + }; + + if(dh) { +- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); +- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ BIGNUM *p, *g; + +- if (!dh->p || !dh->g) { ++ p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0); ++ g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0); ++ ++ if (!p || !g) { + dh.reset(); + } else { ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ dh->p = p; ++ dh->g = g; ++#else ++ DH_set0_pqg(dh, p, NULL, g); ++#endif + SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_tmp_dh(serverContext, (DH*)dh);