remove 1.7.3-r1, add new revision of 2.1.2 with QA fixes for bug #48362

5 files changed, 67 insertions, 21 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 793ae5542d60..5b0a80512f91 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.63 2004/04/20 02:08:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.64 2004/04/20 02:15:21 robbat2 Exp $
+
+*courier-imap-2.1.2-r2 (19 Apr 2004)
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r2.ebuild:
+  remove 1.7.3-r1, add new revision of 2.1.2 with QA fixes for bug #48362
 
   19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
   courier-imap-3.0.2.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 96b0c2f3f228..b2830e67e11b 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,7 +1,7 @@
 MD5 dadb0919aaf8fc52bdc274fa03df20e4 courier-imap-2.1.2-r1.ebuild 7707
-MD5 8edf753f88ecf6a5f29351d5578a83b3 courier-imap-1.7.3-r1.ebuild 6883
 MD5 a35de126e005d4903c2ca440013ae54b courier-imap-3.0.2.ebuild 7879
-MD5 a6cadea05d7f09e004afa6b86372706d ChangeLog 10349
+MD5 98a1d27c2e2113cb1178692ffe51e16f courier-imap-2.1.2-r2.ebuild 7862
+MD5 588d0c32d98f9196890219f332e9ebb5 ChangeLog 10577
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
 MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
 MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
@@ -14,7 +14,6 @@ MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 61
 MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
 MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
 MD5 34fd568907a3ac25a568218739bfdc98 files/authdaemond.conf 447
 MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
 MD5 e7896a8a408e549c618fb0d97db414b8 files/courier-pop3d-ssl.rc6 1216
@@ -24,6 +23,7 @@ MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
 MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r2 72
 MD5 bd4b555f9ce4c637f4d683182b596cdc files/authdaemond.rc6 964
 MD5 550901e019a6aab49111f0960237d419 files/courier-pop3d.rc6 961
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild b/net-mail/courier-imap/courier-imap-2.1.2-r2.ebuild
index ac22897d65bd..533e531f211d 100644
--- a/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.2-r2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild,v 1.5 2004/02/22 16:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r2.ebuild,v 1.1 2004/04/20 02:15:21 robbat2 Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="x86 ppc ~sparc ~mips ~alpha ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 gdbm ldap berkdb mysql pam nls postgres"
+IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
 PROVIDE="virtual/imapd"
 # not compatible with >=sys-libs/db-4
 RDEPEND="virtual/glibc
@@ -20,27 +20,42 @@ RDEPEND="virtual/glibc
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0"
+	>=dev-tcltk/expect-5.33.0
+	fam? ( app-admin/fam )
+	selinux? ( sec-policy/selinux-courier-imap )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	dev-lang/perl
 	sys-apps/procps"
 
 #userpriv breaks linking against vpopmail
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
+RESTRICT="nouserpriv nomirror"
+
 VPOPMAIL_INSTALLED=
-VPOPMAIL_ERROR=
-[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
-if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	has userpriv "${FEATURES}" && VPOPMAIL_ERROR=1
-fi
+VPOPMAIL_DIR=
+export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+
+vpopmail_setup() {
+	VPOPMAIL_DIR=`grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6`
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
+	# patch to fix db4.0 detection as db4.1
+	# bug #27517, patch needs to go upstream
+	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
+	epatch ${FILESDIR}/courier-imap-2.1.1-db40vs41.patch
+
+	cd ${S}
 	# explicitly use db3 over db4
-	if [ -n "`use berkdb`" ]; then
+	if use berkdb; then
 		sed -i -e 's,-ldb,-ldb-3.2,g' configure
 		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
 		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
@@ -49,28 +64,37 @@ src_unpack() {
 
 	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
 	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
+
+	epatch ${FILESDIR}/${PN}-2.1.2-removerpm.patch
+	epatch ${FILESDIR}/${P}-res_query.patch
+	cd ${S}/authlib
+	aclocal
+	autoconf
 }
 
 src_compile() {
-	[ -n "${VPOPMAIL_ERROR}" ]  && die "FEATURES=\"userpriv\" breaks the compile with vpopmail. For the moment, the only workaround is 'FEATURES=\"-userpriv -usersandbox\" emerge ${PN}'"
+	vpopmail_setup
 
 	local myconf
 	myconf="${myconf} `use_with pam authpam`"
 	myconf="${myconf} `use_with ldap authldap`"
 	myconf="${myconf} `use_with mysql authmysql`"
 	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} "
+	# the --with-ipv6 is broken
+	#myconf="${myconf} --with-ipv6"
+	use ipv6 || myconf="${myconf} --without-ipv6"
 	use berkdb \
 		&& myconf="${myconf} --with-db=db" \
 		|| myconf="${myconf} --with-db=gdbm"
 
 	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
+		einfo "vpopmail found"
 		myconf="${myconf} --with-authvchkpw"
 		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
 		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
 		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
 	else
+		einfo "vpopmail not found"
 		myconf="${myconf} --without-authvchkpw"
 	fi
 
@@ -82,7 +106,7 @@ src_compile() {
 		myconf="${myconf} --disable-unicode"
 	fi
 
-	myconf="${myconf} debug=true"
+	use debug && myconf="${myconf} debug=true"
 
 	local cachefile
 	cachefile=${WORKDIR}/config.cache
@@ -93,6 +117,20 @@ src_compile() {
 	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
 	LDFLAGS=`echo ${LDFLAGS} | xargs`
 
+	# fix for bug #27528
+	# they really should use a better way to detect redhat
+	myconf="${myconf} --without-redhat"
+
+	# bug #29879 - FAM support
+	if has_version 'app-admin/fam' && [ -z "`use fam`" ]; then
+		ewarn "FAM will be detected by the package and support will be enabled"
+		ewarn "The package presently provides no way to disable fam support if you don't want it"
+	fi
+
+	# fix for non-x86 platforms, bug #38606
+	# courier-imap doesn't respect just --host=$CHOST without --build
+	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
+
 	# Do the actual build now
 	LDFLAGS="${LDFLAGS}" econf \
 		--disable-root-check \
@@ -119,6 +157,8 @@ src_compile() {
 }
 
 src_install() {
+	vpopmail_setup
+
 	dodir /var/lib/courier-imap /etc/pam.d
 	make install DESTDIR=${D} || die
 
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.3-r1 b/net-mail/courier-imap/files/digest-courier-imap-1.7.3-r1
deleted file mode 100644
index 62ae7d4053ec..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.7.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 130ec4c5851cb43c70646618b1ee32e8 courier-imap-1.7.3.tar.bz2 1236018
diff --git a/net-mail/courier-imap/files/digest-courier-imap-2.1.2-r2 b/net-mail/courier-imap/files/digest-courier-imap-2.1.2-r2
new file mode 100644
index 000000000000..3c3d5e57a7a6
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-2.1.2-r2
@@ -0,0 +1 @@
+MD5 d77ef5d3c90fd0a70b333a44e0ead0a2 courier-imap-2.1.2.tar.bz2 1306638