Rev bump for new init script. Fixes #103104

(Portage version: 2.0.51.22-r2)

5 files changed, 187 insertions, 12 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index a60a97393a87..bd4e81032ffc 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.38 2005/07/26 23:57:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.39 2005/08/24 08:37:13 uberlord Exp $
+
+*courier-authlib-0.57-r1 (24 Aug 2005)
+
+  24 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  files/courier-authlib-initd, +courier-authlib-0.57-r1.ebuild:
+  Rev bump for new init script. Fixes #103104
 
 *courier-authlib-0.57 (26 Jul 2005)
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 8172ea98e348..2d6b489ac229 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,16 +1,18 @@
+MD5 c02fd230688d2f9a2d0f4e8b45a3898e courier-authlib-0.57-r1.ebuild 6089
 MD5 ead53e30977f8d368de26fae5a67ad32 courier-authlib-0.53.ebuild 5903
-MD5 f8e2293e9807a0b229675d9a92f9cffa courier-authlib-0.55.20050320.ebuild 6099
-MD5 d59c188617d2aed926a0d49c1fb91f96 courier-authlib-0.55.ebuild 6057
+MD5 616ebeb89647092c49a7c841274a5c6a courier-authlib-0.54.20050224.ebuild 6027
 MD5 c02fd230688d2f9a2d0f4e8b45a3898e courier-authlib-0.57.ebuild 6089
-MD5 57ce08c86fc4d6f703643907b7b11d2d courier-authlib-0.56.ebuild 6093
 MD5 c6e3401720cff4d2d54cb58647b60530 ChangeLog 6328
-MD5 616ebeb89647092c49a7c841274a5c6a courier-authlib-0.54.20050224.ebuild 6027
+MD5 f8e2293e9807a0b229675d9a92f9cffa courier-authlib-0.55.20050320.ebuild 6099
 MD5 1639b87658242c2406f7f7f8deda7388 metadata.xml 334
+MD5 d59c188617d2aed926a0d49c1fb91f96 courier-authlib-0.55.ebuild 6057
+MD5 57ce08c86fc4d6f703643907b7b11d2d courier-authlib-0.56.ebuild 6093
+MD5 6e65833bdee16e15f91159a26ed558c3 files/courier-authlib-initd 1049
+MD5 7742690b928fbdc37bd9011257f78abd files/digest-courier-authlib-0.54.20050224 83
 MD5 73d603079009e02b50f27fcaaf0ee3c0 files/digest-courier-authlib-0.53 74
-MD5 ed30e0c7061ff7899634145ce73d7b92 files/digest-courier-authlib-0.55 74
-MD5 6fa78b5922594232cd149eb6d6e02b5a files/digest-courier-authlib-0.56 74
-MD5 535d72419715dfcd4a6c00fd8708c63e files/digest-courier-authlib-0.57 74
+MD5 535d72419715dfcd4a6c00fd8708c63e files/digest-courier-authlib-0.57-r1 74
 MD5 752436d0238327674728feeee973d102 files/digest-courier-authlib-0.55.20050320 83
-MD5 8d2d19af5d844966d5d9157eb3dd2f80 files/courier-authlib-initd 1051
-MD5 7742690b928fbdc37bd9011257f78abd files/digest-courier-authlib-0.54.20050224 83
+MD5 535d72419715dfcd4a6c00fd8708c63e files/digest-courier-authlib-0.57 74
 MD5 6930587c358320ecb1043761d7ff97f1 files/configure-db4.patch 2544
+MD5 6fa78b5922594232cd149eb6d6e02b5a files/digest-courier-authlib-0.56 74
+MD5 ed30e0c7061ff7899634145ce73d7b92 files/digest-courier-authlib-0.55 74
diff --git a/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
new file mode 100644
index 000000000000..e06db0e71fe2
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
@@ -0,0 +1,166 @@
+# 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.57-r1.ebuild,v 1.1 2005/08/24 08:37:13 uberlord Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="courier authentication library"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "$SRC_URI" ] && 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="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
+RESTRICT="nouserpriv"
+
+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 )"
+
+filter-flags '-fomit-frame-pointer'
+
+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 elibc_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@@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
+}
+
+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 has_version 'net-mail/vpopmail' ; 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"
+
+	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 "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
+}
+
+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
+	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
+		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; \
+		chmod go-rwx ${D}/etc/courier/authlib/userdb ; continue )
+	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"
+	emake install-migrate DESTDIR="${D}" || die "migrate"
+	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
+	emake install-configure DESTDIR="${D}" || die "configure"
+	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
+	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
+	use postgres && dohtml README.authpostgres.html README.authmysql.html
+	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
+		cp authldap.schema ${D}/etc/openldap/schema/ )
+	dodir /etc/init.d
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
+}
+
+pkg_postinst() {
+	[ -e /etc/courier/authlib/userdb ] && \
+		( einfo "running makeuserdb" ; chmod go-rwx /etc/courier/authlib/userdb \
+		; makeuserdb )
+	# 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/courier-authlib-initd b/net-libs/courier-authlib/files/courier-authlib-initd
index 56b16eef34f5..295b7b9b2448 100644
--- a/net-libs/courier-authlib/files/courier-authlib-initd
+++ b/net-libs/courier-authlib/files/courier-authlib-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-initd,v 1.4 2005/02/05 02:55:32 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-initd,v 1.5 2005/08/24 08:37:13 uberlord Exp $
 depend() {
 	need net
 	provide authdaemond
@@ -27,7 +27,7 @@ start() {
 	setauth
 	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env -- - $logger -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+		/usr/bin/env $logger -- -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
 	eend $?
 }
 
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1
new file mode 100644
index 000000000000..4bb6d17ccd98
--- /dev/null
+++ b/net-libs/courier-authlib/files/digest-courier-authlib-0.57-r1
@@ -0,0 +1 @@
+MD5 af146ac84f0c3ee00006af50b4415d8a courier-authlib-0.57.tar.bz2 2006138