9 files changed, 188 insertions, 126 deletions
diff --git a/net-mail/davmail-bin/ChangeLog b/net-mail/davmail-bin/ChangeLog
index 8d64534..caa98f6 100644
--- a/net-mail/davmail-bin/ChangeLog
+++ b/net-mail/davmail-bin/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*davmail-bin-4.1.0-r1 (03 Jan 2013)
+
+  03 Jan 2013; Sven Eden <sven.eden@gmx.de> +davmail-4.1.0-r1.ebuild,
+  +files/davmail.conf,
+  +files/davmail.properties,
+  +files/davmail.init:
+  Added changes from the davmail-3.9.8.ebuild created by Jiri Tyr and
+  posted in bug #351417.
+
+  03 Jan 2013; Sven Eden <sven.eden@gmx.de> -davmail-4.1.0.ebuild,
+  -files/initd,
+  -files/davmail.desktop:
+  Removed obsolete files.
+
 *davmail-bin-4.1.0 (28 Sep 2012)
 
   28 Sep 2012; Sven Eden <sven.eden@gmx.de> +davmail-4.1.0.ebuild,
diff --git a/net-mail/davmail-bin/Manifest b/net-mail/davmail-bin/Manifest
index e9dc80d..530c5a4 100644
--- a/net-mail/davmail-bin/Manifest
+++ b/net-mail/davmail-bin/Manifest
@@ -1,8 +1,8 @@
-AUX davmail.desktop 211 SHA256 3f6a7ec2a20f4148452212733a238b89ba709d94f1231e3b8fb993ab0d77a222 SHA512 e04dd84fa00189f1a667bf6cdb4bd853fb8cd39083b82d1f2dc3fd89fe75af72f3c49728070600184aa2f831044bccc2b484dd468a636e4fe20fa7df5a0b42f6 WHIRLPOOL c8b639e2f905718d49a465733e83f25f9aaacdf66fa9634be0de88b41f16278080de69e134523a12189fcf3407f5693f08b75d6280ce7cb3da9c63f1a3e527b7
+AUX davmail.conf 99 SHA256 2a622cba80470e2288dc99a99b357c18f8df8ac60bcee1625aaed2ffd381d6bf SHA512 fc99a9e54d738a679b946e3c17663ef2c7974eba43011e8bdc980654a2f3a216005cd67328f650f35577b8d00ea2dd0ad393604407b9dec81362371ea4b3cdc1 WHIRLPOOL 07c38b07392bef36c246ebf171b4a734a84788d6ac2393af721f91aa5d6dbda09050e9f8e0929768f75b98399cf784abcb069c3377ee2a0049bb9454033931cd
+AUX davmail.init 611 SHA256 ac25bb25a8d5e6848db13ddd968156da7a2f260b1fe6e9bcd56b4138e2643a59 SHA512 0743eb5256f6545023218af63736eb5f857ae8c64551c64f41eff947f1d94246f05e68c2fa97aa903899f0a1434f31c8d3a635b91cac3f24e15afe431f78967f WHIRLPOOL 364faa2c3ce5730806605f85a112ee15ffc9dda904fb74a7227d7623b58242e45627eeb1c2b0a54d56ddda885f6bcac23fe220b4e12ed5c96a33632e43883675
 AUX davmail.png 4218 SHA256 b50a1e8d9ac3e20acf88f77d9524f986041282e9f6ae120c78ee64cf6a20df7e SHA512 da600b141df1144c17ae0362f20ff06019986aa73cabeae088da2ae8c917f2e043b127799abc7587011358bcc366fbd2257115e64e02fc0669aefdd05c6581be WHIRLPOOL 1c2e4d8d8f5b318878eedbb7676ee5622429fe0a08d2598fc2cba75daa08b3844afabc87360b9f8d6e00aa419f5d5268e738f598b7793efc992cb22144014550
-AUX initd 737 SHA256 9ed1aa645383983e609943886765228daef6505f32484d29af2bc7bf5663ef6a SHA512 db76816deffdc00a14e2ccbf5c16fdd16e22376ed3f4f03b621b1121919a95db0e022005b0df9fd4aa6d6212b5cfac634144db8fa9041d49a2e0bfd83a7e8b5b WHIRLPOOL d976cd77c83f0462ac6fe535d76d5bae152f8fe2f2a52e15dac16ef523152bcb215158f7f2defe896cb8ae317dc72d8cc51b72fba764f1ea8c0466ccdf5ffae2
-DIST davmail-linux-x86-4.1.0-2042.tgz 6475141 SHA256 b09625ca6ff71e8d462e9ce4a14df326ec6977000ba4537d34e5451dab5cbc46 SHA512 4d1b0b29b92298920e8843da3233bb0fac85458c2c8d6bca08ab5092f51de7fc0b8a9b6c07c831a4caee6b415e9afb6a2247c7010031f20dd939b992bf7c6722 WHIRLPOOL 457a10afd2c6c6172a8b77095fcc76044f2cadbceccf9e1f69eb5c2a63a2ad9c8de8bf22d3b31d44f220f4fd5590d18a1c2799d73894c37dc8b87f5f7429975d
+AUX davmail.properties 1290 SHA256 2929fc3fbdc32de64ebb0b5f59623d6f12272764dff95dc6673e4276d313530e SHA512 af7403a99a5014b35163801a818c141ab7d0427f660900e15e16724ab1d05b4f346389584ff4537692d9f48f31a191a77f4b55d2960e694cfc00f2d00ba8ded6 WHIRLPOOL f5aa54f5570c63cd2fbcf6537fe5c3cf9f6f69800cc4a642c9a7ea6068e38f281c1eb5b85362807cd13d2fe318fe0463a1dc06b34a49ee774d8c38a6e91f1734
 DIST davmail-linux-x86_64-4.1.0-2042.tgz 6621416 SHA256 a5aea7380e77c53e3649ca76cf7ef90c5a10f31a714b73df9cbb9ef9bd1f800b SHA512 73a8b00f15601606b2d3239b73199da67ab2d2bed75ca84b5af1a4eb652f14d95d630d66b10ab6894899c1ade96ebe51ce3d149fb11463fd2888e875dcd34cdf WHIRLPOOL e68dd826b49a46b842b95a6bc2122392e7dd31b7f023ff26df598acb6437f4ae847e53b7d8e1cb518b5911f59cd86f1dd3059f64d54d2206e4528a82a25f48a9
-EBUILD davmail-bin-4.1.0.ebuild 1778 SHA256 281af8402b56d15274fdfd825ecb63cdfc8e0155c33407baad157bae69a17a13 SHA512 b1370a69632618887abe777f1de314f9f12f34fcb8b50e8f687de9d95666308aa349af5dfcf5c66327ed2084c6257e02fa22b5f1a6923407cb4f57527bb5a508 WHIRLPOOL a34be09a8fc34ee17f96e455f6137983789a6a635c406a465116ad11e4a49b164211047d0f6c254c0b301bf94c72bcf032a2820e14948fc53848c37a763dd34f
-MISC ChangeLog 1624 SHA256 5053085525aedc3d73a5cf88e2c8d79da57bfdc0f4ae0777894ff5882ab5090c SHA512 a2e06e4d0d6ae0a16a3a5a6ad48d55a72d8787ae3cf33896c7f51543c431e24dda45bcd5798285572fc71a3485ef2bc1ce24d812f449738ca59454b16b7037c4 WHIRLPOOL 5dca62264156305030e859cbfc0045be8ab21e6d321a0336e4ca6a6a555810681784fdee2a316c0058d8f1a118aa0870642aaaa566e66ba70ab5b15fb57ebd40
+EBUILD davmail-bin-4.1.0-r1.ebuild 1841 SHA256 59983782689168c1ed6a7d2f3749c7534b35cfd022d37fa36a1c6569df196e66 SHA512 2240f4c1c9c267998b31aace03c3b6e9180db3b4b0aa2d22f3427bdec5a77e69c51c43398b76afa50bcee81becf348edaf4a744bf585281a5a9a48409f53160c WHIRLPOOL 63b80430c6cb41df31f2f28d7299196c38e6167edf923bae45e7f0380fc4d8a6ab9db6ab42b4e56bd370ff5b76dbc13d79ab5c046cf80e81cb9c3f6aa4baf251
+MISC ChangeLog 2038 SHA256 5e196b7b24d2eb199bcc1ee777861dd602aa369cb6b1e4a64a71c78ef533b8c4 SHA512 d685443214092725e82183fe497b970c17f064eb8f3d0f5ffe8415ef6b94b6e68344750d89644ebb296ece2dfa9db16e714c74e96f92b68c710fc960badfddbc WHIRLPOOL 512d778e401520441a102e8b938785ca2fb3f495c73efc41d508076aa362e9846347904bfa3c200abefb51bc145f38d0254f684374c6edd06504b91d2956690e
 MISC metadata.xml 512 SHA256 65eeddc3377134a494f194ad22d9212463c65ce9addcd3276781829cdc0abd09 SHA512 22e303c78d2e44c1c75d93abd9f89a0f5d9f35216fb7ff664e4ff77d95fe80d4cfc9ca6f89785b63f083f015eb043a54bf5c7c5058468c7841f4dde2c1cf124e WHIRLPOOL 72d4ef08546c63b7d14eb0b5ce2f46bd0e8c4226986938b0ed04c872e226d6a2457ce6999f0e5848055e88b809842d3f8893d96e96c9633701d49ae79f1d0bb1
diff --git a/net-mail/davmail-bin/davmail-bin-4.1.0-r1.ebuild b/net-mail/davmail-bin/davmail-bin-4.1.0-r1.ebuild
new file mode 100644
index 0000000..eda75cd
--- /dev/null
+++ b/net-mail/davmail-bin/davmail-bin-4.1.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit eutils java-pkg-2
+
+MY_REV="2042"
+MY_PN="davmail"
+
+if use x86 ; then
+	MY_P="${MY_PN}-linux-x86"
+else
+	MY_P="${MY_PN}-linux-x86_64"
+fi
+
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-${PV}-${MY_REV}.tgz"
+DESCRIPTION="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
+HOMEPAGE="http://davmail.sourceforge.net/"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+DEPEND="|| (
+	virtual/jre:1.6
+	virtual/jdk:1.6
+	)
+  !net-mail/davmail"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}-${PV}-${MY_REV}"
+
+pkg_setup() {
+  if use server ; then
+    enewuser davmail -1 -1 /dev/null
+  fi
+}
+
+src_install() {
+	cd "${S}"
+
+	# libraries
+	java-pkg_dojar lib/*.jar
+	java-pkg_dojar ${MY_PN}.jar
+
+	# icon
+	doicon "${FILESDIR}"/${MY_PN}.png
+
+	# create wrapper script for the client
+	java-pkg_dolauncher ${MY_PN} --main ${MY_PN}.DavGateway --java_args ""
+
+	# desktop entry
+	make_desktop_entry ${MY_PN} "DavMail" /usr/share/pixmaps/${MY_PN}.png "Network"
+
+	if use server ; then
+		# log file
+		touch ${MY_PN}.log
+		insinto /var/log
+		doins ${MY_PN}.log
+		fowners ${MY_PN} /var/log/${MY_PN}.log
+
+		# config files
+		insinto /etc
+		doins "${FILESDIR}"/${MY_PN}.properties
+		newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+		newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	if use server ; then
+		elog
+		elog "You have chosen to run ${MY_PN} as a system service. You will need to"
+		elog "modify /etc/${MY_PN}.properties to serve your needs."
+		elog
+		elog "You may find it easier to run the ${MY_PN}, configure it via the GUI"
+		elog "and copy the resulting ~/.${MY_PN}.properties to /etc. Make sure you"
+		elog "set ${MY_PN}.server=true and ${MY_PN}.allowRemote=true."
+		elog
+	fi
+}
diff --git a/net-mail/davmail-bin/davmail-bin-4.1.0.ebuild b/net-mail/davmail-bin/davmail-bin-4.1.0.ebuild
deleted file mode 100644
index ef347ba..0000000
--- a/net-mail/davmail-bin/davmail-bin-4.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit eutils
-
-MY_REV="2042"
-MY_PN="davmail"
-MY_P="${MY_PN}-linux-x86"
-SRC_URI="x86? (
-                 mirror://sourceforge/${MY_PN}/${MY_P}-${PV}-${MY_REV}.tgz
-              )
-       amd64? (
-                 mirror://sourceforge/${MY_PN}/${MY_P}_64-${PV}-${MY_REV}.tgz
-              )"
-DESCRIPTION="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
-HOMEPAGE="http://davmail.sourceforge.net/"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="menu server"
-
-DEPEND="|| ( virtual/jre:1.6 virtual/jdk:1.6 )
-  !net-mail/davmail"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-  if use server ; then
-    enewuser davmail -1 -1 /dev/null
-  fi
-}
-
-src_install() {
-  if use x86 ; then
-    S="${S}-${PV}-${MY_REV}"
-  else
-    S="${S}_64-${PV}-${MY_REV}"
-	fi
-  cd "${S}"
-  # Fix the script BASE=
-  sed -i -e "s@BASE=.*@BASE=/opt/davmail@" davmail.sh
-  dodir "/opt/$MY_PN"
-  cp -a * "${D}/opt/$MY_PN"
-  dodir "/opt/bin"
-  dosym "/opt/$MY_PN/davmail.sh" "/opt/bin/davmail.sh"
-
-  if use menu; then
-    domenu "${FILESDIR}"/davmail.desktop
-    doicon "${FILESDIR}"/davmail.png
-  fi
-
-  if use server ; then
-    insinto /etc
-    doins "${FILESDIR}"/davmail.properties
-    newinitd "${FILESDIR}"/davmail.init davmail
-    newconfd "${FILESDIR}"/davmail.confd davmail
-  fi
-}
-
-pkg_postinst() {
-  if use server ; then
-    elog "You have chosen to run davmail as a system service."
-    elog "You will need to modify /etc/davmail.properties"
-    elog "to service your needs. You may find it easier to"
-    elog "run the davmail.sh, configure it via the GUI and"
-    elog "copy the resulting ~/.davmail.properties to /etc."
-  fi
-}
-
diff --git a/net-mail/davmail-bin/files/davmail.conf b/net-mail/davmail-bin/files/davmail.conf
new file mode 100644
index 0000000..f183b09
--- /dev/null
+++ b/net-mail/davmail-bin/files/davmail.conf
@@ -0,0 +1,3 @@
+# /etc/conf.d/davmail: config file for /etc/init.d/davmail
+
+DAVMAIL_CONF="/etc/davmail.properties"
diff --git a/net-mail/davmail-bin/files/davmail.desktop b/net-mail/davmail-bin/files/davmail.desktop
deleted file mode 100644
index e573c5a..0000000
--- a/net-mail/davmail-bin/files/davmail.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=DavMail Gateway
-Comment=Exchange connector
-Icon=davmail
-Terminal=false
-Categories=Network;Email;
-Exec=/opt/bin/davmail.sh
diff --git a/net-mail/davmail-bin/files/davmail.init b/net-mail/davmail-bin/files/davmail.init
new file mode 100644
index 0000000..ec6d6c3
--- /dev/null
+++ b/net-mail/davmail-bin/files/davmail.init
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+
+PN="davmail"
+USER="${PN}"
+PID_FILE="/var/run/${PN}.pid"
+RUN_FILE="/usr/bin/${PN}"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e ${DAVMAIL_CONF} ]; then
+		eerror "You need to have a valid configuration file at ${DAVMAIL_CONF}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting DavMail gateway"
+
+	start-stop-daemon --start --user ${USER} \
+	--pidfile ${PID_FILE} --make-pidfile --background \
+	--exec ${RUN_FILE} -- ${DAVMAIL_CONF}
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down DavMail gateway"
+	start-stop-daemon --stop --user ${USER} --pidfile ${PID_FILE}
+	eend $?
+}
diff --git a/net-mail/davmail-bin/files/davmail.properties b/net-mail/davmail-bin/files/davmail.properties
new file mode 100644
index 0000000..0f946a8
--- /dev/null
+++ b/net-mail/davmail-bin/files/davmail.properties
@@ -0,0 +1,48 @@
+#DavMail settings
+davmail.allowRemote=true
+davmail.bindAddress=
+davmail.caldavAlarmSound=
+davmail.caldavEditNotifications=false
+davmail.caldavPastDelay=90
+davmail.caldavPort=1080
+davmail.defaultDomain=
+davmail.disableUpdateCheck=true
+davmail.enableEws=false
+davmail.enableProxy=false
+davmail.forceActiveSyncUpdate=false
+davmail.imapAutoExpunge=true
+davmail.imapIdleDelay=
+davmail.imapPort=1143
+davmail.keepDelay=30
+davmail.ldapPort=1389
+davmail.logFilePath=/var/log/davmail.log
+davmail.popPort=1110
+davmail.proxyHost=
+davmail.proxyPassword=
+davmail.proxyPort=
+davmail.proxyUser=
+davmail.sentKeepDelay=90
+davmail.server=true
+davmail.server.certificate.hash=
+davmail.showStartupBanner=false
+davmail.smtpPort=1025
+davmail.ssl.clientKeystoreFile=
+davmail.ssl.clientKeystorePass=
+davmail.ssl.clientKeystoreType=
+davmail.ssl.keyPass=
+davmail.ssl.keystoreFile=
+davmail.ssl.keystorePass=
+davmail.ssl.keystoreType=
+davmail.ssl.nosecurecaldav=false
+davmail.ssl.nosecureimap=false
+davmail.ssl.nosecureldap=false
+davmail.ssl.nosecurepop=false
+davmail.ssl.nosecuresmtp=false
+davmail.ssl.pkcs11Config=
+davmail.ssl.pkcs11Library=
+davmail.url=
+davmail.useSystemProxies=false
+log4j.logger.davmail=DEBUG
+log4j.logger.httpclient.wire=WARN
+log4j.logger.org.apache.commons.httpclient=WARN
+log4j.rootLogger=WARN
diff --git a/net-mail/davmail-bin/files/initd b/net-mail/davmail-bin/files/initd
deleted file mode 100644
index a6df7dd..0000000
--- a/net-mail/davmail-bin/files/initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-
-CONFIG="/etc/${SVCNAME}.properties"
-PIDFILE="/var/run/${SVCNAME}.pid"
-SUFFIX="${SVCNAME#*.}"
-
-if [[ "${SVCNAME}" == "${SUFFIX}" ]]; then
-	SUFFIX=""
-else
-	SUFFIX=" (${SUFFIX})"
-fi
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting DavMail${SUFFIX} gateway"
-
-	if ! $(grep -Fl "davmail.server=true" "${CONFIG}" &> /dev/null); then
-		eend 1 "Ensure that ${CONFIG} has the line davmail.server=true"
-		return 1
-	fi
-
-	start-stop-daemon --start --user davmail --chdir /var/log/davmail \
-		--make-pidfile --pidfile "${PIDFILE}" --background \
-		--exec /usr/bin/davmail -- "${CONFIG}"
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping DavMail${SUFFIX} gateway"
-	start-stop-daemon --stop --user davmail --pidfile "${PIDFILE}"
-	eend $?
-}