diff options
| author | mandree <mandree@FreeBSD.org> | 2014-03-24 01:13:52 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2014-03-24 01:13:52 +0800 |
| commit | e03616d76837b0547a2511dce660b73b12cfbdaa (patch) | |
| tree | 2de587b648c77724d685e25cbafa5d5f6cea1b22 /mail | |
| parent | 902785e1ae193e2a92f54791684dcb8def7c035c (diff) | |
| download | freebsd-ports-gnome-e03616d76837b0547a2511dce660b73b12cfbdaa.tar.gz freebsd-ports-gnome-e03616d76837b0547a2511dce660b73b12cfbdaa.tar.zst freebsd-ports-gnome-e03616d76837b0547a2511dce660b73b12cfbdaa.zip | |
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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/Makefile | 1 | ||||
| -rw-r--r-- | mail/trojita-qt4/Makefile | 16 | ||||
| -rw-r--r-- | mail/trojita/Makefile | 32 | ||||
| -rw-r--r-- | mail/trojita/distinfo | 4 | ||||
| -rw-r--r-- | mail/trojita/pkg-plist | 2 |
5 files changed, 44 insertions, 11 deletions
diff --git a/mail/Makefile b/mail/Makefile index f1dd81d426a9..79c6f5c7a3a2 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -717,6 +717,7 @@ SUBDIR += tmda SUBDIR += tpop3d SUBDIR += trojita + SUBDIR += trojita-qt4 SUBDIR += tumgreyspf SUBDIR += uebimiau SUBDIR += up-imapproxy diff --git a/mail/trojita-qt4/Makefile b/mail/trojita-qt4/Makefile new file mode 100644 index 000000000000..10f79822b934 --- /dev/null +++ b/mail/trojita-qt4/Makefile @@ -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" diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index 7a927cccf75d..aad6cd72c869 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -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> diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo index 1450e68f1bd6..708196611610 100644 --- a/mail/trojita/distinfo +++ b/mail/trojita/distinfo @@ -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 diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist index e37bbe50f588..551ef64d4610 100644 --- a/mail/trojita/pkg-plist +++ b/mail/trojita/pkg-plist @@ -16,8 +16,10 @@ share/icons/hicolor/scalable/apps/trojita.svg %%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 |