Revert last commit. Fixes bug #529852.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )

11 files changed, 300 insertions, 1 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 1ee76ab604cf..3d0ec301c58d 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.223 2014/11/19 14:10:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.224 2014/11/20 10:25:15 mrueg Exp $
+
+  20 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
+  +files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.6-r1-courier-imapd.indirect,
+  +files/courier-imap-4.0.6-r1-courier-imapd.rc6,
+  +files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.6-r1-courier-pop3d.indirect,
+  +files/courier-imap-4.0.6-r1-courier-pop3d.rc6,
+  +files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.6-r1-gentoo-pop3d.rc:
+  Revert last commit. Fixes bug #529852.
 
   19 Nov 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Fix e-mail address.
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
new file mode 100644
index 000000000000..0a455d425dc0
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start courier-imapd-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc --pid=${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=${SSLPIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
new file mode 100644
index 000000000000..26e0ba2cd5c0
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
@@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-imapd "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
new file mode 100644
index 000000000000..a30d3cba6e69
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd ]] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start courier-imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc --pid=${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=${PIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
new file mode 100644
index 000000000000..7908e6077256
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start courier-pop3d-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc --pidfile ${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile ${SSLPIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
new file mode 100644
index 000000000000..1a523f24db4f
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
@@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-pop3d "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
new file mode 100644
index 000000000000..cdcca3846287
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start courier-pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc --pidfile ${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
new file mode 100644
index 000000000000..37818cf68fb9
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
@@ -0,0 +1,32 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+ulimit -d ${IMAP_ULIMITD}
+
+export IMAP_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
new file mode 100644
index 000000000000..e00baa020194
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
@@ -0,0 +1,33 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+ulimit -d ${IMAP_ULIMITD}
+
+IMAP_STARTTLS="${IMAPDSTARTTLS}"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
new file mode 100644
index 000000000000..34053b6748db
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
@@ -0,0 +1,30 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+export POP3_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
new file mode 100644
index 000000000000..87925f9a1194
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
@@ -0,0 +1,31 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc,v 1.4 2014/11/20 10:25:15 mrueg Exp $
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+POP3DSTARTTLS="${POP3_STARTTLS}"
+export POP3_STARTTLS POP3DSTARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"