Date: Sun, 23 Mar 2014 17:13:53 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348873 - in head/mail: . trojita trojita-qt4 Message-ID: <201403231713.s2NHDrwe001369@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Mar 23 17:13:52 2014 New Revision: 348873 URL: http://svnweb.freebsd.org/changeset/ports/348873 QAT: https://qat.redports.org/buildarchive/r348873/ Log: Security upgrade of mail/trojita to 0.4.1 to fix CVE-2014-2567 Add Qt 5 toolkit support. Create a new slave port mail/trojita-qt4 for Qt 4 toolkit support and connect it in mail/Makefile. Convert to bzip2 USES. Patch search path for linguisttools binaries. PR: 187370 Submitted by: Marco Bröder (maintainer) Security: CVE-2014-2567 Security: 36f9ac43-b2ac-11e3-8752-080027ef73ec Added: head/mail/trojita-qt4/ head/mail/trojita-qt4/Makefile (contents, props changed) Modified: head/mail/Makefile head/mail/trojita/Makefile head/mail/trojita/distinfo head/mail/trojita/pkg-plist Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sun Mar 23 17:10:43 2014 (r348872) +++ head/mail/Makefile Sun Mar 23 17:13:52 2014 (r348873) @@ -717,6 +717,7 @@ SUBDIR += tmda SUBDIR += tpop3d SUBDIR += trojita + SUBDIR += trojita-qt4 SUBDIR += tumgreyspf SUBDIR += uebimiau SUBDIR += up-imapproxy Added: head/mail/trojita-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/trojita-qt4/Makefile Sun Mar 23 17:13:52 2014 (r348873) @@ -0,0 +1,16 @@ +# Created by: Marco Broeder <marco.broeder@posteo.eu> +# $FreeBSD$ + +PKGNAMESUFFIX= -qt4 + +MAINTAINER= marco.broeder@posteo.eu +COMMENT= Fast cross-platform IMAP e-mail client using Qt 4 toolkit + +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual + +CONFLICTS_INSTALL= trojita-[0-9]* + +MASTERDIR= ${.CURDIR}/../trojita + +.include "${MASTERDIR}/Makefile" Modified: head/mail/trojita/Makefile ============================================================================== --- head/mail/trojita/Makefile Sun Mar 23 17:10:43 2014 (r348872) +++ head/mail/trojita/Makefile Sun Mar 23 17:13:52 2014 (r348873) @@ -2,30 +2,44 @@ # $FreeBSD$ PORTNAME= trojita -PORTVERSION= 0.3.96 -PORTREVISION= 1 +PORTVERSION= 0.4.1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/src/ MAINTAINER= marco.broeder@posteo.eu -COMMENT= Fast cross-platform Qt IMAP e-mail client +COMMENT= Fast cross-platform IMAP e-mail client using Qt 5 toolkit LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USE_BZIP2= yes USE_LDCONFIG= yes -USES= cmake compiler:c++11-lib desktop-file-utils +USES= cmake compiler:c++11-lib desktop-file-utils tar:bzip2 CMAKE_ARGS+= -DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make \ - -DWITH_QT5:STRING=OFF -DWITH_TESTS:STRING=OFF - -USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build \ - sql-sqlite3 webkit + -DWITH_DESKTOP:STRING=ON -DWITH_HARMATTAN:STRING=OFF \ + -DWITH_RAGEL:STRING=OFF -DWITH_SHARED_PLUGINS:STRING=ON \ + -DWITH_TESTS:STRING=OFF -DWITH_ZLIB:STRING=ON HAS_CONFIGURE= yes INSTALLS_ICONS= yes +.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" +CONFLICTS_INSTALL= trojita-[0-9]* +CMAKE_ARGS+= -DWITH_QT5:STRING=OFF +USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build \ + corelib dbus gui network opengl sql sql-sqlite3 webkit +.else +CONFLICTS_INSTALL= trojita-qt4-[0-9]* +CMAKE_ARGS+= -DWITH_QT5:STRING=ON +USE_QT5= buildtools_build linguisttools_build qmake_build \ + qmldevtools_build core dbus gui network opengl printsupport \ + qml quick sql sql-sqlite3 webkit widgets +.endif + +post-patch: + ${REINPLACE_CMD} -e 's|$${LINGUIST_PATH}/bin|${QT_BINDIR}|g' \ + ${WRKSRC}/cmake/FindQt5LinguistForTrojita.cmake + post-install: .include <bsd.port.mk> Modified: head/mail/trojita/distinfo ============================================================================== --- head/mail/trojita/distinfo Sun Mar 23 17:10:43 2014 (r348872) +++ head/mail/trojita/distinfo Sun Mar 23 17:13:52 2014 (r348873) @@ -1,2 +1,2 @@ -SHA256 (trojita-0.3.96.tar.bz2) = f085dba2a33eed61282bdde05b0151138fbc820a7bfe4655758e1d63f31af7f1 -SIZE (trojita-0.3.96.tar.bz2) = 1068542 +SHA256 (trojita-0.4.1.tar.bz2) = 68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de +SIZE (trojita-0.4.1.tar.bz2) = 1219460 Modified: head/mail/trojita/pkg-plist ============================================================================== --- head/mail/trojita/pkg-plist Sun Mar 23 17:10:43 2014 (r348872) +++ head/mail/trojita/pkg-plist Sun Mar 23 17:13:52 2014 (r348873) @@ -16,8 +16,10 @@ share/icons/hicolor/scalable/apps/trojit %%DATADIR%%/locale/trojita_common_gl.qm %%DATADIR%%/locale/trojita_common_hu.qm %%DATADIR%%/locale/trojita_common_ia.qm +%%DATADIR%%/locale/trojita_common_it.qm %%DATADIR%%/locale/trojita_common_lt.qm %%DATADIR%%/locale/trojita_common_mr.qm +%%DATADIR%%/locale/trojita_common_nb.qm %%DATADIR%%/locale/trojita_common_nl.qm %%DATADIR%%/locale/trojita_common_pl.qm %%DATADIR%%/locale/trojita_common_pt.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403231713.s2NHDrwe001369>