Bump to version, bug 162531, thanks to Conrad Kostecki. Add a vpopmail use flag, bug 161754, thanks to Georgi Georgiev.

Package-Manager: portage-2.1.2_rc4-r3

6 files changed, 255 insertions, 5 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index dabd698ed209..66ce364b3497 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.61 2007/01/16 23:04:09 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.62 2007/02/03 20:45:02 masterdriverz Exp $
+
+*courier-authlib-0.59.1 (03 Feb 2007)
+
+  03 Feb 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/0.59.1-configure-db4.patch,
+  +files/0.59.1-remove-obsolete-macro.patch, +courier-authlib-0.59.1.ebuild:
+  Bump to version, bug 162531, thanks to Conrad Kostecki. Add a vpopmail use
+  flag, bug 161754, thanks to Georgi Georgiev.
 
 *courier-authlib-0.58-r1 (16 Jan 2007)
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 3d623c84da81..9d9febc6a647 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -6,6 +6,14 @@ AUX 0.58-remove-obsolete-macro.patch 252 RMD160 f7bffc4956e078c5700394cfa6641df0
 MD5 ad8c997c0b176c6eab39dd38db000d5e files/0.58-remove-obsolete-macro.patch 252
 RMD160 f7bffc4956e078c5700394cfa6641df0c04ba050 files/0.58-remove-obsolete-macro.patch 252
 SHA256 ea6753f82c2b267ff373286f0c0a9e379e30f5d68bfe1df1c375d0a547d12a62 files/0.58-remove-obsolete-macro.patch 252
+AUX 0.59.1-configure-db4.patch 1362 RMD160 3b666b864138d510205154b6c76e37c1df63ab1d SHA1 c8957e4541c83656111e4296b1ca2230ae1b2ebe SHA256 a5d2be1aa015353981b3bb80c1f8b6fbeb3695e340e614b99ddbc879b21b78a8
+MD5 0cfe55c314eaa290f5b7dcf93bace252 files/0.59.1-configure-db4.patch 1362
+RMD160 3b666b864138d510205154b6c76e37c1df63ab1d files/0.59.1-configure-db4.patch 1362
+SHA256 a5d2be1aa015353981b3bb80c1f8b6fbeb3695e340e614b99ddbc879b21b78a8 files/0.59.1-configure-db4.patch 1362
+AUX 0.59.1-remove-obsolete-macro.patch 254 RMD160 268c175e0e75893661c9d17a36265a008469d49d SHA1 1afe4d21d480ab71d58a60cfca03d0a5abef2a3b SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f
+MD5 45da1ba571c0aaff60577e1079052aa4 files/0.59.1-remove-obsolete-macro.patch 254
+RMD160 268c175e0e75893661c9d17a36265a008469d49d files/0.59.1-remove-obsolete-macro.patch 254
+SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f files/0.59.1-remove-obsolete-macro.patch 254
 AUX courier-authlib 1108 RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 SHA1 1f5947fa72560ec7b16cbab9221303a201c281fc SHA256 172dde34bf6fa36b29318bf9f6ed9304fd89f549ba0f9a051831183f06d326c0
 MD5 3bb31318f6e3f50060ccf1735e8ceb55 files/courier-authlib 1108
 RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 files/courier-authlib 1108
@@ -15,6 +23,7 @@ MD5 cfad3388d2325ef441ef30237c0dffde files/initd/courier-authlib 1114
 RMD160 2649ba0e1f8cf6afcf167f56cb47bb392a1f953d files/initd/courier-authlib 1114
 SHA256 1d27f54ab2566ce8fed9501cc603120048c4d2981f1dbed73b53ce2f00325f27 files/initd/courier-authlib 1114
 DIST courier-authlib-0.58.tar.bz2 2006735 RMD160 6474612496cd287f294c7f52239ea853c44e4aa1 SHA1 8bdab3c2e734cc8f47230924ec638ba3609a92a1 SHA256 d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad
+DIST courier-authlib-0.59.1.tar.bz2 2101729 RMD160 3ccd24004411155b5b5bfe959c557a29e58b9826 SHA1 fdf2f254922bf6213b987f37485c0fdd30121db6 SHA256 72d9faf01b9e211142ee25f414b19e6de06de1f040a5338ab19c2770b9289724
 EBUILD courier-authlib-0.58-r1.ebuild 5901 RMD160 ff41574ad3e314cca65bf2b6ce0436d00329962b SHA1 413466fd3bccad20ca14840f16ca327e37ac2ccd SHA256 cd0ab6b293cc9ffb69733b377387e2227f2adb334083f33317daafb442d7f220
 MD5 e7efdf59f424203b7144228f1a47b92e courier-authlib-0.58-r1.ebuild 5901
 RMD160 ff41574ad3e314cca65bf2b6ce0436d00329962b courier-authlib-0.58-r1.ebuild 5901
@@ -23,10 +32,14 @@ EBUILD courier-authlib-0.58.ebuild 5919 RMD160 b063068d09da20627fb7894d12045adc8
 MD5 23965a5bd299f94e2d7d5bc298bd70cb courier-authlib-0.58.ebuild 5919
 RMD160 b063068d09da20627fb7894d12045adc88f33c22 courier-authlib-0.58.ebuild 5919
 SHA256 0294478810b48f30de6c3b46f0c698c308b0d8340b40bac21022ad2a443fe943 courier-authlib-0.58.ebuild 5919
-MISC ChangeLog 10568 RMD160 1ee59cefb61e6938e3d48bf8e23952c213342950 SHA1 610966ab87f35eb90ba20da2a522f3369e118c1f SHA256 0da9b258a4d137d5084b5c03c5040d9378b3cb572b3677591476f06bcd0ea714
-MD5 875cf3587ce3b5001fdf6ad46243883a ChangeLog 10568
-RMD160 1ee59cefb61e6938e3d48bf8e23952c213342950 ChangeLog 10568
-SHA256 0da9b258a4d137d5084b5c03c5040d9378b3cb572b3677591476f06bcd0ea714 ChangeLog 10568
+EBUILD courier-authlib-0.59.1.ebuild 5705 RMD160 8b0dedd78aa1f916c3569ca9634b4eba99a95394 SHA1 abb7331c40ed2e3ba427ea2ec6b5cc9cd30e30bc SHA256 474f885dcea84d958451af3904b7628d1b59d6805a49861edbc56547bee748d3
+MD5 f4cb29c8be5106f773c3719a8ecca14b courier-authlib-0.59.1.ebuild 5705
+RMD160 8b0dedd78aa1f916c3569ca9634b4eba99a95394 courier-authlib-0.59.1.ebuild 5705
+SHA256 474f885dcea84d958451af3904b7628d1b59d6805a49861edbc56547bee748d3 courier-authlib-0.59.1.ebuild 5705
+MISC ChangeLog 10905 RMD160 b62b792444b8f23109410a96ba9b1bd98df1b244 SHA1 8b018b85335ab9a899e72fa964c74108b9ae46b2 SHA256 6f8db59ab5a12b90bdf75086064d799d29047107120dd6c93a37f399757116c9
+MD5 b731f812bf8253016174cc197fa40111 ChangeLog 10905
+RMD160 b62b792444b8f23109410a96ba9b1bd98df1b244 ChangeLog 10905
+SHA256 6f8db59ab5a12b90bdf75086064d799d29047107120dd6c93a37f399757116c9 ChangeLog 10905
 MISC metadata.xml 264 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef SHA1 0801b3c7ed8a52bc3a43092b58ad87a0357b2691 SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367
 MD5 0364b9fe218debf0191624f65e03edd0 metadata.xml 264
 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef metadata.xml 264
@@ -37,3 +50,6 @@ SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/di
 MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58-r1 268
 RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58-r1 268
 SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58-r1 268
+MD5 41a7edca78fa98ac950446906142d105 files/digest-courier-authlib-0.59.1 274
+RMD160 a35094f7fc746e1424936364c978a2a02386a89b files/digest-courier-authlib-0.59.1 274
+SHA256 82d232201778268912fb7901957fbc158c29df197069d0621271474f3d0cc2c9 files/digest-courier-authlib-0.59.1 274
diff --git a/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild
new file mode 100644
index 000000000000..29264ae49fc4
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild,v 1.1 2007/02/03 20:45:02 masterdriverz Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
+
+RESTRICT="userpriv"
+
+RDEPEND="gdbm? ( sys-libs/gdbm )
+	!gdbm? ( sys-libs/db )"
+
+DEPEND="${RDEPEND}
+		>=dev-libs/openssl-0.9.6
+		pam? ( >=sys-libs/pam-0.75 )
+		mysql? ( virtual/mysql )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		postgres? ( >=dev-db/postgresql-7.2 )"
+
+S="${WORKDIR}/${P%%_pre}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		einfo 'Without it, you will not be able to change system login passwords.'
+		einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		einfo 'and others) will work just fine.'
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e "s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	if ! use gdbm; then
+		epatch "${FILESDIR}/${PV}-configure-db4.patch"
+	else
+		epatch "${FILESDIR}/${PV}-remove-obsolete-macro.patch"
+	fi
+
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
+	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
+	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	local myconf
+	myconf="$(use_with pam authpam) $(use_with ldap authldap)"
+
+	if use berkdb; then
+		if use gdbm; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="${myconf} --with-db=db"
+		fi
+	fi
+	use gdbm && myconf="${myconf} --with-db=gdbm"
+
+	if use vpopmail; then
+		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
+		use mysql && ewarn "Building vpopmail support instead of authmysql"
+		use postgres && ewarn "Building vpopmail support instead of authpgsql"
+	else
+		myconf="${myconf} --without-authvchkpw $(use_with mysql authmysql) $(use_with postgres authpgsql)"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	einfo "Configuring courier-authlib: ${myconf}"
+
+	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" \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+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}
+	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 $dir/userdb"
+			cp -v $dir/userdb ${D}/etc/courier/authlib/
+			chmod go-rwx ${D}/etc/courier/authlib/userdb
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake install DESTDIR="${D}" || die "install failed"
+	emake install-migrate DESTDIR="${D}" || die "migrate failed"
+	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
+	emake install-configure DESTDIR="${D}" || die "install-configure failed"
+	rm -vf ${D}/etc/courier/authlib/*.bak
+	chown mail:mail ${D}/etc/courier/authlib/*
+	for y in ${D}/etc/courier/authlib/*.dist ; do
+		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+	dodoc AUTHORS COPYING 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
+	use postgres && dohtml README.authpostgres.html README.authmysql.html
+	if use ldap; then
+		dodoc README.ldap
+		dodir /etc/openldap/schema
+		cp authldap.schema "${D}/etc/openldap/schema/"
+	fi
+	doinitd "${FILESDIR}/initd/courier-authlib" || die "init.d failed"
+}
+
+pkg_postinst() {
+	if [ -e /etc/courier/authlib/userdb ]; then
+		einfo "running makeuserdb"
+		chmod go-rwx /etc/courier/authlib/userdb
+		makeuserdb
+	fi
+
+	# Suggest cleaning out the following old files
+	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
+	if [ ! -z "${list}" ] ; then
+		ewarn "Courier authentication files are now in /etc/courier/authlib/"
+		einfo "The following files are no longer needed and can likely be removed:"
+		einfo " rm $(echo \"${list}\")"
+	fi
+}
diff --git a/net-libs/courier-authlib/files/0.59.1-configure-db4.patch b/net-libs/courier-authlib/files/0.59.1-configure-db4.patch
new file mode 100644
index 000000000000..a784107543e4
--- /dev/null
+++ b/net-libs/courier-authlib/files/0.59.1-configure-db4.patch
@@ -0,0 +1,37 @@
+--- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
++++ configure.in	2007-02-03 19:52:48.000000000 +0000
+@@ -22,7 +22,6 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_SYSCONFTOOL
+ AC_LIBLTDL_INSTALLABLE
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+@@ -264,15 +263,17 @@
+ 
+ if test "$db" != "gdbm"
+ then
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		[ AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		[ AC_CHECK_LIB(db, db_env_create,
+-			[ LIBDB=-ldb; LIBS="-ldb $LIBS"]) ]
+-			)])
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++    do
++ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++    AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++      AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++        AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++    done
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+ fi
+ 
+ LIBS="$saveLIBS"
diff --git a/net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch b/net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch
new file mode 100644
index 000000000000..72a398391aa1
--- /dev/null
+++ b/net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch
@@ -0,0 +1,10 @@
+--- configure.in.orig	2007-01-17 02:15:46.000000000 +0000
++++ configure.in	2007-02-03 19:58:19.000000000 +0000
+@@ -22,7 +22,6 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_SYSCONFTOOL
+ AC_LIBLTDL_INSTALLABLE
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1
new file mode 100644
index 000000000000..ce8150e9da8e
--- /dev/null
+++ b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1
@@ -0,0 +1,3 @@
+MD5 4e7327980724c4c327aace23facd5d59 courier-authlib-0.59.1.tar.bz2 2101729
+RMD160 3ccd24004411155b5b5bfe959c557a29e58b9826 courier-authlib-0.59.1.tar.bz2 2101729
+SHA256 72d9faf01b9e211142ee25f414b19e6de06de1f040a5338ab19c2770b9289724 courier-authlib-0.59.1.tar.bz2 2101729