svn commit: r518512 - in head/net-p2p/linuxdcpp: . files

[Alexey Dokuchaev]

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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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);