Fix building with -sqlite mysql - bug #459772

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 215 insertions, 16 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/Manifest b/net-libs/courier-authlib/Manifest
index 02baa281237e..7d1c09f66964 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX courier-authlib-0.65.0-sqlite.patch 260 SHA256 40692d6a5492f2702fe7ec1cff2b2a343e084747c4b2e0a0fd8d66b530a94285 SHA512 672ca134aba8a210882a2004fb0ca78d89911aef5bec377e159377c7eb30390edb466f43589e6c58c7c7b81cb7244e05ccfc89b01c1fb48990a3c363213fa0c8 WHIRLPOOL ef6fcbfd2b32008e2b105e8e19cd477b9401a8af75e386adb699f15b115d234418b8b7f092dcd97d7a37df6dafe3212c5e9646457322673ff089cbb30abfda33
+AUX courier-authlib-0.65.0-sqlite.patch 798 SHA256 e5ca1d2240c8606aa4a74f891f1b607e2404858caf6d684535e27f769aa7f0cc SHA512 f9148c23195cb9ec3265fcc86a2c8ea4c0d114046d81e527dd5759f45844b425f5270fcec52fd497e82b8272fa99984e7facb8cca6f696956896ad177c5f81fb WHIRLPOOL 4528dde0adcf66f1c2eedc62ce1c8dfc0a8b2550a843128bad53d6a3f3afc3a70ede3ff2ad6b7d963fa4ef79dddc14e4b818d1d268c7d5a536c71fe3ab5ec05c
 AUX courier-authlib-r1 1107 SHA256 c7d9e1efbbc4a805a08d085cbe1edeaf491e455b0ba265c3a60fda2c3f3c8fbd SHA512 e1bf12da0720af55227953c4cbf48323ad07dfa7fe35df7efd383116c905345b6fcd0d33d83317467397007ce01d48b9a372b93276b25b5ef84ea9a49756bfbe WHIRLPOOL e40e524d3e0a4bdab18cccd7450cfa6c95b35f79fe97c64e8f4615aebe88d87c1d49e59289cfa9f58d07160f90612a873dd828f727fe58d6689a333c442b2e1a
 DIST courier-authlib-0.63.0.tar.bz2 2817119 SHA256 7b961b965c446996fe0eca40ad2e7cc6d47fc9e85944f701c457b1da8c978ac3 SHA512 7ef3922667339a62df38b3e3a5c77951e4f52adda1ff44756345c6b9aacf3039bbb3087042c6354a8c8e1c693adac33ebfea1443b9ec4c2f49e89f4ab7d9b825 WHIRLPOOL 53656d94cc2c4812d730c5bc42f39aae00a99d1dfe9b9072eda04976d684030a47183bf64ff7c7e52263d812de4d33f3a5f5bfcdf344fc84dab279e4da014513
 DIST courier-authlib-0.64.0.tar.bz2 2267236 SHA256 69497dfe8d4110456cc3126350dbcebd7e41ab78505c57793df96ed3fb795039 SHA512 9a1cb195bfa00c02294f87e5e01254108d5b2bc9ae2e32abbb38d9dc0af108748eec4fa365efcc244ec194751b69ef7e26963a1b0315c386758502938421fd80 WHIRLPOOL 117545aff37ba9aaf8d9e5b891c483a06e9d89375905e3a0df640f5f8b04b26cafda194a0f6b2bbcfa0051e8b9d171382e4d6b9d24c9dbffd7c440df04006d1d
@@ -10,23 +10,24 @@ EBUILD courier-authlib-0.63.0-r1.ebuild 5107 SHA256 9bbcabe24d934d4703b9aff3dce8
 EBUILD courier-authlib-0.64.0.ebuild 5119 SHA256 c79c6eaa035e82f9331760ceacc6988a4fbf346319e8b326067b2e81dfc44ba0 SHA512 938c503a480686b13e34ad7c79a0902907eddc2e260cdb0419cfb2daf0e80c3f298b50afbfa7b7bba63b69791f03b86a49d1d43bdc8f2278cbc8b4716ea96346 WHIRLPOOL 20269118f02aef5e95ee695288c394acf04a2a100936663fb286f2554194411b266fd0e9fa0452ff2471469087881d8c03abfde9e177b2dffd977d311f661beb
 EBUILD courier-authlib-0.65.0-r1.ebuild 5316 SHA256 b27a977a74a2014de442e0263d00b05ef27478397361b9ae64d5ec4fe0837ff0 SHA512 2d9a304ab479e26baaf2fcf35de26a91dca76b67cdec46a6d3c4dbc1d06271d340ac60293e2488f922a2748cf27d5bed2955e64dbdacc03be1612c3ff1f0c339 WHIRLPOOL 5b3be1fc615d351e6780e78d5d7441f883c19c5f49965a9bab79c4482c90d32b6de15c53df6902f5aa886cf972b91c437283c5b85a5600a07ae7b418122853ba
 EBUILD courier-authlib-0.65.0-r2.ebuild 5290 SHA256 9ea8259997b190ac6e23f1df64e8a7ec3ec9393d10b22ff1b0eb65c1abebbda1 SHA512 934eda80ff71dee3885195c6cd31c70b01490f259789a31a268ba98c152b2a5dce7a7eb8b9e403bb0ec8d899c28376c9834e3ae5e7be3c682f762ff69058860e WHIRLPOOL bb6a0b5a285dee6884116f46e82e3d740c96362a4c63c1199bed4f5f00e43a516c561a7fd3cea25f41c13304d7259f12c12978e4502ed3b74e3dbc7026b81000
+EBUILD courier-authlib-0.65.0-r3.ebuild 5340 SHA256 7e3fe5dd3bee5c65c685792a0b4533d37a935304f2fa2dde3cd9a9c30573e78a SHA512 c5fc490c097b01605811d985ab882b53d5fc823c98e238477598116fba192488797e8cef1812e63adb3edefcb52dc47c48c3940a6501322db77ff773d426764f WHIRLPOOL 4d53eaee7513b02d7a1989661e57069b79bab960d902e5976e0dd96749eda7768d752afd9eda762979281d3cbaf23d0a341b3f78ce1f42498f8d52846b1dd84c
 EBUILD courier-authlib-0.65.0.ebuild 5128 SHA256 d0bdd07a7666e581c8dab02040b832e3ca6edf9b4c45152a5b98bc53b6389ba9 SHA512 c7641049f27d856a8f2c25584ecaec26bf3fd6c8af5d58bc9fc1e99a2131ab5152b6fe4c329972827a2a2f71bd6edd24c471bf7d1d41c5b34aba665845f3688a WHIRLPOOL 96c679ce849136bf53f790419ed134f86178b4538c71863f0092f5fc7829f8e5ca3e995c16cb0fa4584948ab4a816bd746dbf989075a24f64f8b7de6795bd3af
-MISC ChangeLog 23009 SHA256 d5a5df0b25bc6bb5a6feaa96032b744f7d3db917a70808c08a01a5687d7de35c SHA512 20994c586b6b2f4664259f68d07b1b9413ad18473079e61e3d7dfba9aa5f7db4aa16319c125db7fb1392c189f315300a53977568585ac3b44bfd4cec6f9f9ba3 WHIRLPOOL 2c9b2b1fc7d634ba019bc3209bab69adfe7a8f2ad3c1d8a48f7977f74895b8da397d6ac735ca3bdc7318ff2b2adb76a0616b944c5d339ea51999edc35b1270ed
+MISC ChangeLog 23224 SHA256 26c837024e5b6fad7f3abbfd6b97697992e51dfecb9232e3663f927de41fb9ab SHA512 8ea41e04e1bfef058482e20054d3f62335f27d2f0a9a332a130499df53703e0249629c3b9504c18fa047a4d02feb4ca3c3a64c8f4530116963d39e0d7457d6aa WHIRLPOOL d4faf4c80a44926a99cd07df55b9dfc1ab90becc1cee3735ae1a2ef820c0c0645dc94a70eb8a2386f4aa5ed1755ee4b479b0f976ed629f8146881c73bf0bdee7
 MISC metadata.xml 237 SHA256 a8a93d896577309c559cb95967fe0ebab7ee7201a1c7204eeae6e95ce9375305 SHA512 7dbe4ef965827cf9f1d2f12ba05d24870c98e377687e50174427ab6299896a9e29a35870b049057c075248603d6b5bc5d55aa4202033426fe89c5f71e5363aa2 WHIRLPOOL 751a7e9f576a448c109dcc1bfce1c203a5f3ec518df929863de4ebc87830b952d4789e8d8d583cf211a29fb900769499b3f3f85921d2f0ce71929e53f9bc1f74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRK0K1AAoJEHfx8XVYajsffXwP/iD6hE+o1NWbQBq7AHcqbX5y
-oj5COg46tPJEaC0toPlCa/LVqBJmNyLeXl/Ej31nVjb6inYM2GOpB1jbo0z1Gd+x
-uS/Wl2zimLLhueWMAg9DK6LmB0LgD7xIPKfzPl13Xx76ZvjgWuk3ehQifOnWES7C
-XmLzrHrFvjvEH1O6Sp9QCAhuiwFYMaxv93qDpmSAGj4k+OjVqfFqt3gm2nHwDBDw
-ycZ/IwH2803NR9Rm6R5hROsCbATt2yMVgKrf5HY5Vwh8WpcgIvECId8EVBniGioE
-DXZ2mKnKXKkY+KoRJRwsPVY4BybgeSt50XEyH36aBOfW67axpRg+vcoBdSDvFii6
-m1u4Ft8KdjwSCPaZlPvkRHsamnPH1s2t3CuQHcR3YvO9J7owX2jRHzG/pWLwqu+5
-Nm9relBlb8P2CR8aVy1XusKWkVv8nzPtMW65bZCbhcO3SbcUyI7XM17ddwIRUTMX
-WY8XpjdBrECWyP3gN8jEccTnkAY8b6LxPGrU0Acx9Bw2Sn/yvPBN4w3TB4/5aPIA
-3FFQrAHMbaT7wBr4wmuGupIV6xW1FW7IxYtPQ1byjiM/b5pPKgfzZYtGMyjDby0u
-Ig5f9NjP5Zx/59lSlj1D70lfurrdKmI4tDS60dLEl0eProd/NmXj0cWIJYd0eg96
-O60Yh/0D2fI7gvKfZsrm
-=XrqB
+iQIcBAEBCAAGBQJRMILhAAoJEHfx8XVYajsfC9YP/jszlVlxshqkSVYMwhZl09it
+NpeUZIhpCeKx2RsP1dgaYw28s+VAew9UCds84VRLE+2ETdw3JxaNBHzczHz9gSwq
++/Hu5lF6qHI6VukU3aoGFB0tynVDCv3WCGn3aYzeG+PjECF5t5tT1BloHNWUFelv
+6i+K2O7VQ080tPRS18EvnhEg/yOpLEVYxFdVRFDevJY3JdBF6fiGORxo7j62xQTy
+fS77nGeHdaN8oxm5sEyMhozeQ19ylR/VXSBHK24h8ExbUgp7FwRYQP+2QNrgTew+
++9NgV8B00hC9SvPz2Mhe9V6HsICtk5ZliUVoaQzcFTcUsoYt+oWEATps9jdYZiVf
+L4tearOMLTH1WPKlisJubEX6DCNelH6Pw7dn4/DI3JIjYz/8nV/ati/oHvFRvjQ0
+M4IAdmo0Q/hI1Lfn/fRRA5mW8EZd7bi6MTyY4KATDZBFcuXKz8HAY2GgmSu2L9vR
+EH004jzw4XYFb7i2YzZp9QPYkKUub2hGrClsVNoAD+C0IlrLBs7hAUEVpuW6t8DX
+/341CBKHHE31iZ+nMnd8IzpO2AvUs7Hibp12o7n4Drlv1EjsNVMubjqWfWYF9f+t
+8y2kSCFwuWTpxeM0W2/164xp4rLLmBH2hXSvQLWwn19glrFJmYGDmONSnNV1NXRl
+ZdWKjFTmvEDFwUn+nEmI
+=sXNd
 -----END PGP SIGNATURE-----
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"