Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 May 2015 18:28:14 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387179 - in head/mail/davmail: . files
Message-ID:  <201505231828.t4NISEUF011721@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Sat May 23 18:28:13 2015
New Revision: 387179
URL: https://svnweb.freebsd.org/changeset/ports/387179

Log:
  mail/davmail: 4.5.1 -> 4.6.1
  
  Fixes potential CVE-2014-3566 vulnerability
  
  DavMail 4.6.1
  Bugfix release to fix recent regression with Office 365,
  also includes a few Linux and IMAP enhancements.
  
  Linux:
  - RPM: exclude Growl library from RPM package
  - Add genericname to desktop entry
  - RPM: Fix warning the init script refers to runlevel 4 which is
    admin defined. No distribution script must use it
  - Detect and log message for Unity users
  - RPM: Fix JAVA HOME detection for openSUSE_13.2
  - RPM: update spec file from OpenSuse build by Dmitri Bachtin and
    Achim Herwig
  
  SWT:
  - SWT: improve tray init, preload image and add a delay on first message
  
  Enhancements:
  - Add a few more logging statements
  
  IMAP:
  - Fix #36 Endless loop when using IMAP IDLE feature with SSL sockets,
    replaced thread sleep with a short timeout on socket read
  
  EWS:
  - EWS: update checkEndPointUrl, send get root folder request instead
    of static wsdl request no longer available on Office365
  
  DavMail 4.6.0
  Bugfix release with many IMAP enhancements over EWS, implement batch
  move items, also includes a brand new generic OSX package to handle
  new OSX java behaviour.
  
  OSX:
  - OSX: refactor OSX package based on universalJavaApplicationStub
  - Replace Java application stub with
    https://github.com/tofi86/universalJavaApplicationStub/blob/master/src/universalJavaApplicationStub
  
  Doc:
  - Doc: update OSX setup documentation
  - Doc: additional Linux instructions for Ubuntu 14
  - Fix #31 A typo in davmail.properties example
  
  EWS:
  - EWS: improve main calendar folder test
  - EWS: fix batch move
  - EWS: Adjust paged search for folders
  - EWS: implement batch move items
  - EWS: improve folder paged search
  - Prepare batch move implementation
  - EWS: force NTLM in direct EWS mode
  - EWS: implement batch move method
  - EWS: switch to GetMethod to check endpoint
  - EWS: take paging into account in appendSubFolders
  - EWS: fix ErrorExceededFindCountLimit on FindFolder requests
  - EWS: avoid NullPointerException in fixAttendees
  
  Linux:
  - Allow Java 8 and default jre in debian package
  
  IMAP:
  - IMAP: fix 587 log and skip broken messages
  
  Caldav
  - Caldav: fix #98 Support of Contacts in CardDav REPORT
  - Fix #35 duplicates in updated reoccurring events
  
  Enhancements
  - From audit: remove throws statement
  - Adjust KerberosHelper logging message
  - Fix for #534 Kerberos Authentication doesn't seem to be work cross domain
  
  LDAP:
  - LDAP: reset icon after search
  
  PR:		198297
  Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>
  Approved by:	<john.c.prather@gmail.com> (maintainer (timeout))

Deleted:
  head/mail/davmail/files/patch-src__etc__davmail.properties
Modified:
  head/mail/davmail/Makefile
  head/mail/davmail/distinfo
  head/mail/davmail/files/patch-build.xml
  head/mail/davmail/pkg-plist

Modified: head/mail/davmail/Makefile
==============================================================================
--- head/mail/davmail/Makefile	Sat May 23 18:25:50 2015	(r387178)
+++ head/mail/davmail/Makefile	Sat May 23 18:28:13 2015	(r387179)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.5.1
+PORTVERSION=	4.6.1
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -14,11 +14,12 @@ LICENSE=	GPLv2
 
 USES=		dos2unix tar:tgz
 DOS2UNIX_FILES=	build.xml
+NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2303
+REVISION=	2343
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -46,9 +47,9 @@ do-install:
 		-not -name "*.rpm" \
 		-not -name "*.desktop" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
-	@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
-	@${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
+	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
+	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
 		${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
-	@${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>

Modified: head/mail/davmail/distinfo
==============================================================================
--- head/mail/davmail/distinfo	Sat May 23 18:25:50 2015	(r387178)
+++ head/mail/davmail/distinfo	Sat May 23 18:28:13 2015	(r387179)
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-4.5.1-2303.tgz) = 2621a5cbc81c06d0345ec05c93664a052e2e9d2d2bfda8e731a8fb94fd70f752
-SIZE (davmail-src-4.5.1-2303.tgz) = 22670415
+SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e
+SIZE (davmail-src-4.6.1-2343.tgz) = 22659201

Modified: head/mail/davmail/files/patch-build.xml
==============================================================================
--- head/mail/davmail/files/patch-build.xml	Sat May 23 18:25:50 2015	(r387178)
+++ head/mail/davmail/files/patch-build.xml	Sat May 23 18:28:13 2015	(r387179)
@@ -1,6 +1,6 @@
---- build.xml.orig	2013-04-23 16:50:41.883412959 +0200
-+++ build.xml	2013-04-23 16:51:32.230415374 +0200
-@@ -58,7 +58,7 @@
+--- build.xml.orig	2015-05-23 02:27:12 UTC
++++ build.xml
+@@ -59,7 +59,7 @@
      </target>
  
      <target name="defaultrelease" unless="is.svn">
@@ -9,3 +9,14 @@
      </target>
  
      <target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease">
+@@ -138,8 +138,8 @@
+                 toFile="dist/davmail.desktop"
+                 name="DavMail"
+                 comment="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
+-                exec="davmail"
+-                icon="/usr/share/davmail/davmail.png"
++                exec="/usr/local/bin/davmail"
++                icon="/usr/local/share/java/davmail/davmail.png"
+                 categories="Network;"
+                 genericname="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
+                 />

Modified: head/mail/davmail/pkg-plist
==============================================================================
--- head/mail/davmail/pkg-plist	Sat May 23 18:25:50 2015	(r387178)
+++ head/mail/davmail/pkg-plist	Sat May 23 18:28:13 2015	(r387179)
@@ -14,6 +14,7 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar
@@ -24,8 +25,6 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns
 %%JAVASHAREDIR%%/davmail/davmail.jar
 %%JAVASHAREDIR%%/davmail/davmail.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505231828.t4NISEUF011721>