svn commit: r387975 - in branches/2015Q2/mail/davmail: . files

[Kurt Jaeger]

Author: pi
Date: Sat May 30 17:52:07 2015
New Revision: 387975
URL: https://svnweb.freebsd.org/changeset/ports/387975

Log:
  mail/davmail: Security update to 4.6.1
  
  MFH: r387179, r387243
  
  PR:		198297
  Security:	CVE-2014-3566
  Approved by:	ports-secteam

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

Modified: branches/2015Q2/mail/davmail/Makefile
==============================================================================
--- branches/2015Q2/mail/davmail/Makefile	Sat May 30 17:03:01 2015	(r387974)
+++ branches/2015Q2/mail/davmail/Makefile	Sat May 30 17:52:07 2015	(r387975)
@@ -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: branches/2015Q2/mail/davmail/distinfo
==============================================================================
--- branches/2015Q2/mail/davmail/distinfo	Sat May 30 17:03:01 2015	(r387974)
+++ branches/2015Q2/mail/davmail/distinfo	Sat May 30 17:52:07 2015	(r387975)
@@ -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: branches/2015Q2/mail/davmail/files/patch-build.xml
==============================================================================
--- branches/2015Q2/mail/davmail/files/patch-build.xml	Sat May 30 17:03:01 2015	(r387974)
+++ branches/2015Q2/mail/davmail/files/patch-build.xml	Sat May 30 17:52:07 2015	(r387975)
@@ -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">

Modified: branches/2015Q2/mail/davmail/pkg-plist
==============================================================================
--- branches/2015Q2/mail/davmail/pkg-plist	Sat May 30 17:03:01 2015	(r387974)
+++ branches/2015Q2/mail/davmail/pkg-plist	Sat May 30 17:52:07 2015	(r387975)
@@ -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