diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-05-28 09:25:34 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-05-28 09:25:34 +0000 |
| commit | c39781a25b70a7fc270969dd7322985aa57eb711 (patch) | |
| tree | bd4e7f490c2aaff8ba2b2474264ecaaca5ef6b92 | |
| parent | Version bump, and remove some old versions (diff) | |
| download | historical-c39781a25b70a7fc270969dd7322985aa57eb711.tar.gz historical-c39781a25b70a7fc270969dd7322985aa57eb711.tar.bz2 historical-c39781a25b70a7fc270969dd7322985aa57eb711.zip | |
Fix bug #21803
| -rw-r--r-- | net-mail/courier-imap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-mail/courier-imap/Manifest | 4 | ||||
| -rw-r--r-- | net-mail/courier-imap/courier-imap-1.7.3.ebuild | 16 |
3 files changed, 15 insertions, 10 deletions
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog index 9a4854b76a24..a84b61c5b6be 100644 --- a/net-mail/courier-imap/ChangeLog +++ b/net-mail/courier-imap/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for net-mail/courier-imap # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.35 2003/05/26 00:17:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.36 2003/05/28 09:25:32 robbat2 Exp $ *courier-imap-1.7.3 (20 May 2003) + 27 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: + Fix bug #21803 + 25 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.3.ebuild: Fix bug #21577 diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index 33c3691c75e4..252b7f8141d3 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -1,9 +1,9 @@ MD5 06dfb4fe4a1bbf623aff59425a2f50a4 courier-imap-1.7.1.ebuild 5249 MD5 ff694f5f5f5e185eaec3a88f3a22354b courier-imap-1.6.2-r1.ebuild 4814 -MD5 0da65b482309a4e56049dd7ffb2fd7fb courier-imap-1.7.3.ebuild 6757 +MD5 1c052fbde5ccb05efa2f42fa1a57354b courier-imap-1.7.3.ebuild 6848 MD5 b64e4760ae2f4c7baacd233614e4f55c courier-imap-1.7.0.ebuild 4955 MD5 2873e8f293f51160a568ac21d7450440 courier-imap-1.7.2.ebuild 6678 -MD5 919f5b50b0a4e3e5be3cf25096f073d9 ChangeLog 6216 +MD5 73bcbcdfbe54fd804bbb4df83a94cdeb ChangeLog 6312 MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006 MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208 MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953 diff --git a/net-mail/courier-imap/courier-imap-1.7.3.ebuild b/net-mail/courier-imap/courier-imap-1.7.3.ebuild index 19b19ac72889..8278129a41a9 100644 --- a/net-mail/courier-imap/courier-imap-1.7.3.ebuild +++ b/net-mail/courier-imap/courier-imap-1.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 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.ebuild,v 1.4 2003/05/26 00:17:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.3.ebuild,v 1.5 2003/05/28 09:25:32 robbat2 Exp $ DESCRIPTION="An IMAP daemon designed specifically for maildirs" SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" @@ -24,11 +24,13 @@ DEPEND="${RDEPEND} dev-lang/perl sys-apps/procps" -#sandbox breaks linking against vpopmail +#userpriv breaks linking against vpopmail VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6` -if [ -n "${VPOPMAIL_DIR}" ]; then - VPOPMAIL_ERROR= - has userpriv ${FEATURES} && [ -d "${VPOPMAIL_DIR}" ] && VPOPMAIL_ERROR=1 +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 src_unpack() { @@ -61,7 +63,7 @@ src_compile() { && myconf="${myconf} --with-db=db" \ || myconf="${myconf} --with-db=gdbm" - if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; then + if [ -n "${VPOPMAIL_INSTALLED}" ]; then myconf="${myconf} --with-authvchkpw" tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`" LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}" @@ -199,7 +201,7 @@ src_install() { use postgres && authmods="${authmods} authpgsql" use pam && authmods="${authmods} authpam" use ldap && authmods="${authmods} authldap" - [ -n "${VPOPMAIL_DIR}" ] && authmods="${authmods} authvchkpw" + [ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw" exeinto /usr/lib/courier-imap/authlib for i in ${authmods}; do [ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i} |