courier-authlib: remove bash-ism from init script

(Portage version: 2.1.9.14/cvs/Linux x86_64)

5 files changed, 53 insertions, 417 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 5d475d62e1ec..67216fbeed29 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.110 2010/07/16 09:15:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.111 2010/10/10 18:35:37 hanno Exp $
+
+*courier-authlib-0.63.0-r1 (10 Oct 2010)
+
+  10 Oct 2010; Hanno Boeck <hanno@gentoo.org>
+  +courier-authlib-0.63.0-r1.ebuild, +files/courier-authlib-r1:
+  Remove bash-ism from init script, see #340174, thanks to Alec Moskvin for
+  patch.
 
   16 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   courier-authlib-0.63.0.ebuild:
diff --git a/net-libs/courier-authlib/courier-authlib-0.60.6.ebuild b/net-libs/courier-authlib/courier-authlib-0.60.6.ebuild
deleted file mode 100644
index 3f0b8544ce5e..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.60.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2010 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.60.6.ebuild,v 1.13 2010/06/17 20:51:52 patrick Exp $
-
-inherit eutils flag-o-matic autotools libtool
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~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 mysql pam postgres vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-DEPEND="${RDEPEND}
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )"
-
-pkg_setup() {
-	enewuser mail -1 -1 /var/spool/mail
-
-	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
-
-	if use vpopmail ; then
-		eerror
-		eerror "vpopmail support has been removed, it's unmaintained upstream and will be"
-		eerror "removed with the next release."
-		eerror
-		eerror "Please remove vpopmail USE-flag."
-		die "vpopmail support removed"
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use gdbm ; then
-		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
-	else
-		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
-	fi
-
-	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' authmigrate.in || die "sed failed"
-	sed -i -e"s|@@INDENT@@|		|g" authmigrate.in || die "sed failed"
-	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
-
-	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
-		|| die "fixing libltdl call failed"
-
-	local d
-	for d in $(find -name configure.in) ; do
-		[[ ${d} == */libltdl/* ]] && continue
-		cd "${S}"/${d%configure.in}
-		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `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"
-
-	myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-
-	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 userdb at: ${dir}/userdb"
-			cp -f "${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 DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
-	rm -f "${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 -f "${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 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/"
-	fi
-	doinitd "${FILESDIR}/${PN}" || die "doinitd 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/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.61.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.61.1.ebuild
deleted file mode 100644
index 78d5c5354de6..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.61.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2010 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.61.1.ebuild,v 1.2 2010/06/17 20:51:52 patrick Exp $
-
-inherit eutils flag-o-matic autotools libtool
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 mysql pam postgres vpopmail"
-
-RESTRICT="userpriv
-	!berkdb? ( test )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-		!gdbm? ( sys-libs/db )"
-
-DEPEND="${RDEPEND}
-		>=dev-libs/openssl-0.9.6
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )"
-
-pkg_setup() {
-	enewuser mail -1 -1 /var/spool/mail
-
-	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
-
-	if use vpopmail ; then
-		eerror
-		eerror "vpopmail support has been removed, it's unmaintained upstream and will be"
-		eerror "removed with the next release."
-		eerror
-		eerror "Please remove vpopmail USE-flag."
-		die "vpopmail support removed"
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use gdbm ; then
-		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
-	else
-		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
-	fi
-
-	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a\\t\t/etc/courier-imap \\' authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a\\t\t/etc/courier/authlib \\' authmigrate.in || die "sed failed"
-	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
-
-	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
-		|| die "fixing libltdl call failed"
-
-	local d
-	for d in $(find -name configure.in) ; do
-		[[ ${d} == */libltdl/* ]] && continue
-		cd "${S}"/${d%configure.in}
-		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `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"
-
-	myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
-
-	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 userdb at: ${dir}/userdb"
-			cp -f "${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 DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
-	rm -f "${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 -f "${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 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/"
-	fi
-	doinitd "${FILESDIR}/${PN}" || die "doinitd 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/"
-		elog "The following files are no longer needed and can likely be removed:"
-		elog " rm $(echo \"${list}\")"
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.61.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.63.0-r1.ebuild
index 0d7b41c739a9..c81df6b3d61f 100644
--- a/net-libs/courier-authlib/courier-authlib-0.61.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.63.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 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.61.0.ebuild,v 1.2 2010/06/17 20:51:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.63.0-r1.ebuild,v 1.1 2010/10/10 18:35:37 hanno Exp $
 
-inherit eutils flag-o-matic autotools libtool
+inherit eutils flag-o-matic
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )"
+		postgres? ( >=dev-db/postgresql-base-8.4 )"
 
 pkg_setup() {
 	enewuser mail -1 -1 /var/spool/mail
@@ -47,34 +47,6 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use gdbm ; then
-		epatch "${FILESDIR}/0.59.2-configure-db4.patch"
-	else
-		epatch "${FILESDIR}/0.59.2-remove-obsolete-macro.patch"
-	fi
-
-	sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a\\t\t/etc/courier-imap \\' authmigrate.in || die "sed failed"
-	sed -i -e'/for dir in/a\\t\t/etc/courier/authlib \\' authmigrate.in || die "sed failed"
-	sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
-
-	sed -i -e 's:AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_CONVENIENCE:' configure.in \
-		|| die "fixing libltdl call failed"
-
-	local d
-	for d in $(find -name configure.in) ; do
-		[[ ${d} == */libltdl/* ]] && continue
-		cd "${S}"/${d%configure.in}
-		AT_NO_RECURSIVE="yes" AT_NOELIBTOOLIZE="yes" eautoreconf
-	done
-
-	elibtoolize
-}
-
 src_compile() {
 	filter-flags -fomit-frame-pointer
 
@@ -145,7 +117,6 @@ src_install() {
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
 	emake DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
 	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
 	emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
 	rm -f "${D}"/etc/courier/authlib/*.bak
@@ -171,7 +142,7 @@ src_install() {
 		dodir /etc/openldap/schema
 		cp -f authldap.schema "${D}/etc/openldap/schema/"
 	fi
-	doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
+	newinitd "${FILESDIR}/${PN}-r1" "${PN}" || die "doinitd failed"
 }
 
 pkg_postinst() {
diff --git a/net-libs/courier-authlib/files/courier-authlib-r1 b/net-libs/courier-authlib/files/courier-authlib-r1
new file mode 100644
index 000000000000..10bb8b625b9e
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-r1
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2010 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-r1,v 1.1 2010/10/10 18:35:37 hanno Exp $
+
+depend() {
+	need net
+	provide authdaemond
+}
+
+checkconfig() {
+	if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+		eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
+		return 1
+	fi
+}
+
+setauth() {
+	. /etc/courier/authlib/authdaemonrc
+	AUTHLIB="/usr/lib/courier/courier-authlib"
+	AUTHDAEMOND="authdaemond"
+	pidfile="/var/run/authdaemon.pid"
+	logger="/usr/sbin/courierlogger"
+	export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
+}
+
+start() {
+	checkconfig || return 1
+	setauth
+	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+		/usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+	eend $?
+}
+
+stop() {
+	setauth
+	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --stop --pidfile "${pidfile}"
+	eend $?
+}