Index: head/net/qt4-network/Makefile =================================================================== --- head/net/qt4-network/Makefile (revision 415855) +++ head/net/qt4-network/Makefile (revision 415856) @@ -1,57 +1,60 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= network DISTVERSION= ${QT4_VERSION} CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module +LICENSE= GPLv3 LGPL21 LGPL3 GFDL +LICENSE_COMB= dual + RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USE_QT4= qmake_build moc_build rcc_build corelib QT_DIST= yes - HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_OPENSSL= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtNetwork.pc ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp + ${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp \ + ${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp .include Index: head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp =================================================================== --- head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (nonexistent) +++ head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (revision 415856) @@ -0,0 +1,21 @@ +--- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-05-07 14:14:44 UTC ++++ src/network/ssl/qsslsocket_openssl.cpp +@@ -267,15 +267,14 @@ init_context: + #endif + break; + case QSsl::SslV3: +- ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error + break; +- case QSsl::SecureProtocols: // SslV2 will be disabled below +- case QSsl::TlsV1SslV3: // SslV2 will be disabled below + case QSsl::AnyProtocol: +- default: + ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); + break; + case QSsl::TlsV1: ++ case QSsl::SecureProtocols: ++ default: + ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); + break; + } Property changes on: head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.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: head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp =================================================================== --- head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (nonexistent) +++ head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (revision 415856) @@ -0,0 +1,25 @@ +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-05-07 14:14:44 UTC ++++ src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -511,9 +511,9 @@ static QPair loadO + libcrypto->setLoadHints(libcrypto->loadHints() | QLibrary::ImprovedSearchHeuristics); + #elif defined(SHLIB_VERSION_NUMBER) + // first attempt: the canonical name is libssl.so. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); + libssl->setLoadHints(QLibrary::ImprovedSearchHeuristics); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + libcrypto->setLoadHints(libcrypto->loadHints() | QLibrary::ImprovedSearchHeuristics); + if (libcrypto->load() && libssl->load()) { + // libssl.so. and libcrypto.so. found +@@ -525,8 +525,8 @@ static QPair loadO + #endif + + // second attempt: find the development files libssl.so and libcrypto.so +- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); ++ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; Property changes on: head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.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