Fix building with -sqlite mysql - bug #459772

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

3 files changed, 199 insertions, 1 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 969f7c426b03..01c6ac9bc059 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.144 2013/02/25 10:53:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.145 2013/03/01 10:28:40 eras Exp $
+
+*courier-authlib-0.65.0-r3 (01 Mar 2013)
+
+  01 Mar 2013; Eray Aslan <eras@gentoo.org> +courier-authlib-0.65.0-r3.ebuild,
+  files/courier-authlib-0.65.0-sqlite.patch:
+  Fix building with -sqlite mysql - bug #459772
 
   25 Feb 2013; Eray Aslan <eras@gentoo.org> courier-authlib-0.65.0-r2.ebuild:
   Do not require mysql for sqlite
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
new file mode 100644
index 000000000000..2e709588fd32
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 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.65.0-r3.ebuild,v 1.1 2013/03/01 10:28:40 eras Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib user
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 mysql pam postgres sqlite static-libs 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-8.4 )
+		sqlite? ( dev-db/sqlite:3 )"
+
+# vpopmail support removed upstream
+REQUIRED_USE="( !vpopmail )"
+
+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
+}
+
+src_prepare() {
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}/m4" || die
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+		m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+	epatch "${FILESDIR}/${P}-sqlite.patch"
+	eautoreconf
+}
+
+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 -f "${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
+
+	# 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/files/courier-authlib-0.65.0-sqlite.patch b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
index 60a0d53ed165..d6c6480a38b2 100644
--- a/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
+++ b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
@@ -9,3 +9,27 @@
  then
  	SQLITE_LIBS=""
  	SQLITE_CFLAGS=""
+--- authsqlite.h	2012-10-03 19:54:10.000000000 +0300
++++ authsqlite.h	2013-03-01 12:03:16.834315060 +0200
+@@ -6,7 +6,9 @@
+ #include	<string.h>
+ #include	<sys/types.h>
+ #include	<sqlite3.h>
++/*
+ #include	<errmsg.h>
++*/
+ 
+ struct authsqliteuserinfo {
+ 	char *username;
+--- authsqlitelib.c	2012-10-04 05:48:21.000000000 +0300
++++ authsqlitelib.c	2013-03-01 12:03:00.801437111 +0200
+@@ -10,7 +10,9 @@
+ #include	<ctype.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
++/*
+ #include	<mysql.h>
++*/
+ #include	<time.h>
+ 
+ #include	"authsqlite.h"