Index: branches/2018Q4/net-im/licq/Makefile =================================================================== --- branches/2018Q4/net-im/licq/Makefile (revision 482775) +++ branches/2018Q4/net-im/licq/Makefile (revision 482776) @@ -1,51 +1,51 @@ # $FreeBSD: head/ports-mgmt/pkg_jail/files/pkg_update 411390 2016-03-19 11:00:57Z dinoex 2 # Created by: Brian Feldman & Matt Heckaman # $FreeBSD$ PORTNAME= base PORTVERSION= ${LICQ_VER} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Popular ICQ-compatible plugin-based program LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:devel/boost-libs BROKEN_sparc64= Does not build: fails to link USES= cmake:noninja iconv ssl USE_CXXSTD= c++98 WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE OPTIONS_DEFINE= NLS GPGME OPTIONS_DEFAULT=GPGME OPTIONS_SUB=yes GPGME_DESC= Build support for gpgme NLS_USES= gettext NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=OFF GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error .include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" pre-configure: ${REINPLACE_CMD} -e 's=!/bin/bash=!${LOCALBASE}/bin/bash=' \ ${WRKSRC}/bin/sidclean.sh post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/licq ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${STAGEDIR}${PREFIX}/bin/sidclean.bash .include Index: branches/2018Q4/net-im/licq/files/patch-licq.cpp =================================================================== --- branches/2018Q4/net-im/licq/files/patch-licq.cpp (nonexistent) +++ branches/2018Q4/net-im/licq/files/patch-licq.cpp (revision 482776) @@ -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 Property changes on: branches/2018Q4/net-im/licq/files/patch-licq.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 482775) +++ branches/2018Q4 (revision 482776) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r482566