net-libs/courier-authlib: version bump to 0.66.4

Also remove unused vpopmail use flag and unneeded RESTRICT="userpriv",
see bug #516584.

2 files changed, 148 insertions, 0 deletions

diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 1d46d1ece01e..0bb69b1f3874 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,3 +1,4 @@
 DIST courier-authlib-0.65.0.tar.bz2 2303751 SHA256 db3e34ee2b075897864c44aaae924388c74b32ed40b83f0fcf8626a060c1ea47 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38 WHIRLPOOL d86ad93ebe701f0742e83988ad14bb750c98ada952fbc6422641840b0074b8f285ca41c0f6458b79c36196a435c99c76d767e8cf3fdf3110107b25112712887a
 DIST courier-authlib-0.66.1.tar.bz2 2299965 SHA256 8f89166f57c8e59f445fe0135da92b95f1c4417896d01eda5e2e94d8ff878fe8 SHA512 d2b0c9c92c0af8c596fd9b14337034e2859c4540b5b20523e8dfbec78f54021104b6864c7f3488f518ebfff488b38bdbc26690763175940d12019f5cbc482b33 WHIRLPOOL 345f458ca19d8892784fa56a72658f50faa65ea7094f590b0fe9880f085e32a2609a25fad76f083bbe0bd278b39db582e3defef3212089b3a3a54d58149ef593
 DIST courier-authlib-0.66.3.tar.bz2 2085083 SHA256 033402a86e334999eaf17c1b722d6f6cc1961fccb5d2ee88342dfd6c5d534961 SHA512 09d97c8efc79d84437feefca13f5161c0e113864b9c971a4a980b359c9c14699f8d07eac6b52ac0a7d30f9770656e672f64c3445ecf4dcad88f51a427310d530 WHIRLPOOL 4763eaadf6da2cd014f68638a8e2b6be6f00bb64234251c65b0de3af821e2484232919a52bac515fccefa1967ff0c4b3d79516d769ce73c0f2ac57802b6818f9
+DIST courier-authlib-0.66.4.tar.bz2 2192331 SHA256 a874fa50e83d9b1385f97a47879af781a1aa09f49cdaa7d77e7ea3e5983a4a26 SHA512 0987bc9d33a013ae842e0ea3e4e83ef9d6196c2f923a6970e049a36b8ccddbf0c4465c43c7e27d6718480e981f573795f6417478de1ff685264f3439e8dffdc9 WHIRLPOOL 4140435ab87bb73613c4561bbc0108a55697d179701dae890a8133e8cef49fb1b131894bf3feb4f292801cb33f7b577cbc6d4ee268852d56e546e0e80e81ba83
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
new file mode 100644
index 000000000000..e9076dbbdfb9
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib user
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+		=net-libs/courier-unicode-1.3
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( dev-db/postgresql:= )
+		sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--libexecdir=/usr/$(get_libdir)/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+	dodoc AUTHORS ChangeLog* INSTALL NEWS README
+	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+	if use mysql ; then
+		dodoc README.authmysql.myownquery
+		dohtml README.authmysql.html
+	fi
+	if use postgres ; then
+		dohtml README.authpostgres.html README.authmysql.html
+	fi
+	if use ldap ; then
+		dodoc README.ldap
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		dohtml README.authsqlite.html README.authmysql.html
+	fi
+	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}