sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 10:26:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Allow to build against contemporary versions of OpenSSL and set

Browse source 
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
This commit is contained in:
Alexey Dokuchaev 2019-11-27 17:04:00 +00:00
parent 946629842a
commit f231709c64
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=518512
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net-p2p/linuxdcpp/Makefile
View file

@ -17,22 +17,18 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
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>

26
net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp Normal file
View file

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