authshadow for 71909 and get_libdir for arch

4 files changed, 156 insertions, 15 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 032ac97c0c46..ff4aedb8398c 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.21 2005/01/07 07:18:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.22 2005/01/07 19:48:15 swtaylor Exp $
+
+*courier-authlib-0.52-r1 (07 Jan 2005)
+
+  07 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.52-r1.ebuild:
+  build authshadow (bug 71909) and use /usr/$(get_libdir) for better arch support
 
   06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   courier-authlib-0.52.ebuild:
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 576b3e1b779f..87ea8d0a9db9 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9bb476d7c1b83f421761cbc4c675896d ChangeLog 3198
+MD5 b562036129e9de76d724dd5fa90d0117 courier-authlib-0.52-r1.ebuild 5085
+MD5 57d450126c904e2546ec0639cd668c66 courier-authlib-0.52.ebuild 5052
 MD5 088c1350a14be1b1e72bf88c884abce1 courier-authlib-0.50.20041203.ebuild 5042
+MD5 1cb6145c0b62e746cdef819a4daea4d6 ChangeLog 3406
 MD5 1639b87658242c2406f7f7f8deda7388 metadata.xml 334
-MD5 57d450126c904e2546ec0639cd668c66 courier-authlib-0.52.ebuild 5052
-MD5 6930587c358320ecb1043761d7ff97f1 files/configure-db4.patch 2544
+MD5 a01734679d1906a8886eccdcf66a20f5 files/digest-courier-authlib-0.52 74
+MD5 a01734679d1906a8886eccdcf66a20f5 files/digest-courier-authlib-0.52-r1 74
 MD5 4c7dedb4c21da2d9e4dbc586459de426 files/courier-authlib-initd 1038
 MD5 55e872f718ada612e49cc176cb627db8 files/digest-courier-authlib-0.50.20041203 83
-MD5 a01734679d1906a8886eccdcf66a20f5 files/digest-courier-authlib-0.52 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB3jfTArHZZzCEUG0RAiJhAJ970jKj3b+RzC4y7F1X3opbsYaimgCfdVGw
-QYCTMPlr9MSZHlJbXLCJ0pY=
-=IWYl
------END PGP SIGNATURE-----
+MD5 6930587c358320ecb1043761d7ff97f1 files/configure-db4.patch 2544
diff --git a/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild
new file mode 100644
index 000000000000..41d6ce1e7176
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.52-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 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.52-r1.ebuild,v 1.1 2005/01/07 19:48:15 swtaylor Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="courier authentication library"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+S="${WORKDIR}/${P%%_pre}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~ppc64"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
+
+DEPEND="virtual/libc
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
+		>=dev-libs/openssl-0.9.6
+		pam? ( >=sys-libs/pam-0.75 )
+		mysql? ( >=dev-db/mysql-3.23.36 )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		postgres? ( >=dev-db/postgresql-7.2 )"
+
+RDEPEND="virtual/libc
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db )"
+
+src_unpack() {
+	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
+	unpack ${A}
+	cd ${S}
+	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
+	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	if ! use gdbm ; then
+		epatch ${FILESDIR}/configure-db4.patch
+		export WANT_AUTOCONF="2.5"
+		gnuconfig_update
+		libtoolize --copy --force
+		ebegin "Recreating configure"
+			autoconf ||  die "recreate configure failed"
+		eend $?
+		cd ${S}/bdbobj
+		libtoolize --copy --force
+		ebegin "Recreating bdbobj/configure"
+			autoconf ||  die "recreate bdbobj/configure failed"
+		eend $?
+	fi
+	sed -i -e'/for dir in/a\\t\t\/etc\/courier-imap \\' ${S}/authmigrate.in
+	sed -i -e'/for dir in/a\\t\t\/etc\/courier\/authlib \\' ${S}/authmigrate.in
+}
+
+src_compile() {
+	local myconf
+	myconf="`use_with pam authpam` `use_with ldap authldap`"
+
+	if use berkdb ; then
+		use gdbm && \
+			einfo "Both gdbm and berkdb selected. Using gdbm." || \
+				myconf="${myconf} --with-db=db"
+	fi
+	use gdbm && myconf="${myconf} --with-db=gdbm"
+
+	if [ -f /var/vpopmail/etc/lib_deps ]; then
+		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
+		use mysql && ewarn "vpopmail found. authmysql will not be built."
+		use postgres && ewarn "vpopmail found. authpgsql will not be built."
+	else
+		myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	ewarn "${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 "bad ./configure"
+	emake || die "Compile problem"
+}
+
+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
+}
+
+src_install() {
+	dodir /var/lib/courier/authdaemon
+	dodir /etc/courier/authlib
+	dodir /etc/init.d
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake install DESTDIR="${D}" || die "install"
+	emake install-migrate DESTDIR="${D}" || die "migrate"
+	emake install-configure DESTDIR="${D}" || die "configure"
+	rm ${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
+	use ldap && dodoc authldap.schema
+	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
+	use postgres && dohtml README.authpostgres.html
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
+}
+
+pkg_postinst() {
+	# Suggest cleaning out the following old files
+	list="`find /etc/courier -type f -maxdepth 1 | 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}\" | xargs echo`"
+	fi
+}
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.52-r1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.52-r1
new file mode 100644
index 000000000000..2f1822863523
--- /dev/null
+++ b/net-libs/courier-authlib/files/digest-courier-authlib-0.52-r1
@@ -0,0 +1 @@
+MD5 2ad6837c1eec7582f8634c320f45b2dc courier-authlib-0.52.tar.bz2 1965591