fix malloc definitions, wrt #93776. version bump to 1.8. some header fixes

(Portage version: 2.0.51.19)

8 files changed, 306 insertions, 6 deletions

diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog
index 7d63dd68f9e5..86518422d559 100644
--- a/net-mail/cyrus-imspd/ChangeLog
+++ b/net-mail/cyrus-imspd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/cyrus-imspd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.8 2004/06/24 23:21:06 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.9 2005/05/26 12:20:17 ferdy Exp $
+
+*cyrus-imspd-1.8 (26 May 2005)
+*cyrus-imspd-1.7b-r1 (26 May 2005)
+
+  26 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/cyrus-imspd-1.8-gentoo.patch, +cyrus-imspd-1.7b-r1.ebuild,
+  +cyrus-imspd-1.8.ebuild:
+  fix malloc definitions, wrt #93776. version bump to 1.8
 
   10 Jun 2004; Aron Griffis <agriffis@gentoo.org> cyrus-imspd-1.7b.ebuild:
   Fix use invocation
diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest
index f539f080a540..50e9553b797e 100644
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -1,9 +1,14 @@
-MD5 e250c74086357a83c2ed58a62360c816 cyrus-imspd-1.7b.ebuild 2205
-MD5 0c25f9e8b81ec5977b35bebf506064de ChangeLog 2851
+MD5 7e432a8029a07bb2fde1c670b700e5b3 cyrus-imspd-1.8.ebuild 1891
+MD5 e9a6f4e359555f00d5364d02a1256efb cyrus-imspd-1.7b-r1.ebuild 2314
+MD5 a68bf9865b1032233b23b33b190d5af2 cyrus-imspd-1.7b.ebuild 2205
+MD5 5ce99b008cece736f8ef00f5901d3c61 ChangeLog 3125
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 bbf3166bc707a84443c5e396c1d6d6f9 files/cyrus-imspd-db4.patch 3446
 MD5 aa6f51b5cf7fcffd8af00e26c81c2eed files/imspd.conf 156
 MD5 8f70724bab4710bb09eb1026bbabea9c files/imspd.rc6 1079
 MD5 d97f9081cc542625ba06e672f58e7377 files/cyrus-imspd-gentoo.patch 4188
+MD5 6668ddce9fff0f5a87c414ebab289448 files/digest-cyrus-imspd-1.8 68
 MD5 adc977a90b3413642a62ac95c658f3ed files/digest-cyrus-imspd-1.7b 69
+MD5 adc977a90b3413642a62ac95c658f3ed files/digest-cyrus-imspd-1.7b-r1 69
+MD5 e98cef6cedfbfa85f5b7a199a1366a7b files/cyrus-imspd-1.8-gentoo.patch 4220
 MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild
new file mode 100644
index 000000000000..2ebcb1ac528b
--- /dev/null
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild,v 1.1 2005/05/26 12:20:17 ferdy Exp $
+
+inherit eutils gnuconfig ssl-cert
+
+DESCRIPTION="Internet Message Support Protocol (IMSP) server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${PN}-v${PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="kerberos ldap ssl"
+
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.3
+	>=dev-libs/cyrus-imap-dev-2.1.14
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? ( >=net-misc/stunnel-4 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake
+	sys-devel/libtool
+	sys-devel/gnuconfig"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/cyrus-imspd-db4.patch"
+	epatch "${FILESDIR}/cyrus-imspd-gentoo.patch"
+
+	# Cyrus 2.2.x has an extra library.
+	if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
+		sed -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
+			-i "${S}/imsp/Makefile.in" \
+			-i "${S}/cmulocal/libcyrus.m4" || die "sed failed"
+	fi
+
+	export WANT_AUTOCONF=2.5
+	touch config.{guess,sub}
+	gnuconfig_update
+
+	# Recreate configure.
+	ebegin "Recreating configure"
+	rm -f configure acconfig.h
+	aclocal -I cmulocal && autoheader && autoconf || \
+		die "recreate configure failed"
+	eend $?
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} `use_with ldap ldap ldap`"
+	myconf="${myconf} `use_enable kerberos gssapi`"
+
+	econf \
+		--without-krb \
+		--with-auth=unix \
+		${myconf} || die "econf failed"
+
+	# Fix some malloc definitions
+	sed -i -e \
+		's~extern char \*malloc()~extern void *malloc()~g' imsp/*.c
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	newsbin imsp/cyrus-imspd imspd
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/imspd.rc6" imspd
+	insinto /etc/conf.d
+	newins "${FILESDIR}/imspd.conf" imspd
+
+	keepdir /var/imsp{,/user}
+
+	if use ssl ; then
+		insinto /etc/stunnel
+		newins "${FILESDIR}/stunnel.conf" imspd.conf
+
+		dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
+		insinto /etc/ssl/imspd
+		docert server
+	fi
+
+	dodoc README imsp/options.sample notes/*
+}
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild
index 621849029bb0..ed09a5d309f9 100644
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild,v 1.8 2004/06/24 23:21:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild,v 1.9 2005/05/26 12:20:17 ferdy Exp $
 
 inherit eutils gnuconfig ssl-cert
 
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
new file mode 100644
index 000000000000..84814774e097
--- /dev/null
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild,v 1.1 2005/05/26 12:20:17 ferdy Exp $
+
+inherit eutils gnuconfig ssl-cert
+
+DESCRIPTION="Internet Message Support Protocol (IMSP) server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${PN}-v${PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="kerberos ldap ssl"
+
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.3
+	>=dev-libs/cyrus-imap-dev-2.1.14
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? ( >=net-misc/stunnel-4 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake
+	sys-devel/libtool
+	sys-devel/gnuconfig"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# Cyrus 2.2.x has an extra library.
+	if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
+		sed -i -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
+			"${S}/imsp/Makefile.in" \
+			"${S}/cmulocal/libcyrus.m4" || die "sed failed"
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_with ldap) \
+		$(use_enable kerberos gssapi) \
+		--without-krb \
+		--with-auth=unix || \
+			die "econf failed"
+
+	# Fix some malloc definitions
+	sed -i -e \
+		's~extern char \*malloc()~extern void *malloc()~g' imsp/*.c
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	newsbin imsp/cyrus-imspd imspd
+
+	newinitd "${FILESDIR}/imspd.rc6" imspd
+	newconfd "${FILESDIR}/imspd.conf" imspd
+
+	keepdir /var/imsp{,/user}
+
+	if use ssl ; then
+		insinto /etc/stunnel
+		newins "${FILESDIR}/stunnel.conf" imspd.conf
+
+		dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
+		insinto /etc/ssl/imspd
+		docert server
+	fi
+
+	dodoc README imsp/options.sample notes/*
+}
diff --git a/net-mail/cyrus-imspd/files/cyrus-imspd-1.8-gentoo.patch b/net-mail/cyrus-imspd/files/cyrus-imspd-1.8-gentoo.patch
new file mode 100644
index 000000000000..894ba4af766c
--- /dev/null
+++ b/net-mail/cyrus-imspd/files/cyrus-imspd-1.8-gentoo.patch
@@ -0,0 +1,114 @@
+diff -ruN cyrus-imspd-v1.7a-vanilla/Makefile.in cyrus-imspd-v1.7a/Makefile.in
+--- cyrus-imspd-v1.7a-vanilla/Makefile.in	1997-10-28 19:12:07.000000000 -0800
++++ cyrus-imspd-v1.7a/Makefile.in	2003-09-10 13:24:02.000000000 -0700
+@@ -21,7 +21,7 @@
+ # SOFTWARE.
+ # 
+ 
+-SUBDIRS = lib imsp @EXTRA_SUBDIRS@
++SUBDIRS = imsp @EXTRA_SUBDIRS@
+ 
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in cyrus-imspd-v1.7a/imsp/Makefile.in
+--- cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in	2000-12-17 19:37:53.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/Makefile.in	2003-09-10 13:25:06.000000000 -0700
+@@ -48,8 +48,8 @@
+ 
+ DEFS = @DEFS@ $(DEFINES)
+ CPPFLAGS = -I.. -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ 
+-LIBS = @LIBS@
+-DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
++LIBS = @LIBS@ -L/usr/lib -lcyrus
++DEPLIBS = @DEPLIBS@
+ 
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/abook.c cyrus-imspd-v1.7a/imsp/abook.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/abook.c	2000-12-17 17:47:03.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/abook.c	2003-09-10 13:27:47.000000000 -0700
+@@ -108,7 +108,7 @@
+     
+     /* get the ACL */
+     if (!acl && sdb_get(abooks, name, SDB_ICASE, &acl) < 0) return (0);
+-    if (acl) mask = acl_myrights(auth_get_state(id), acl);
++    if (acl) mask = cyrus_acl_myrights(auth_get_state(id), acl);
+ 
+     /* check for administrator */
+     if (auth_level(id) == AUTH_ADMIN) mask |= ACL_ALL;
+@@ -700,7 +700,7 @@
+ 		    strcpy(tmpacl, "\t");
+ 		    tmpc = name[osrclen];
+ 		    name[osrclen] = '\0';
+-		    acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
++		    cyrus_acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
+ 		    name[osrclen] = tmpc;
+ 		}
+ 		value = tmpacl;
+@@ -932,7 +932,7 @@
+ 		strcpy(acl, "\t");
+ 		tmpc = name[ownerlen];
+ 		name[ownerlen] = '\0';
+-		acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
++		cyrus_acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
+ 		name[ownerlen] = tmpc;
+ 	    }
+ 	} else {
+@@ -941,9 +941,9 @@
+ 	}
+ 	/* update acl */
+ 	if (acl
+-	    && acl_set(&acl, ident, ACL_MODE_SET, 
+-		       rights ? acl_strtomask(rights) : 0L, 
+-		       NULL, NULL) == 0) {
++	    && cyrus_acl_set(&acl, ident, ACL_MODE_SET, 
++		             rights ? cyrus_acl_strtomask(rights) : 0L, 
++		             NULL, NULL) == 0) {
+ 	    if (sdb_set(abooks, name, SDB_ICASE, acl) == 0) {
+ 		result = AB_SUCCESS;
+ 	    }
+@@ -966,7 +966,7 @@
+     char *name, *rights;
+ {
+     /* some more error checking might be in order... */
+-    acl_masktostr(abook_rights(id, name, NULL), rights);
++    cyrus_acl_masktostr(abook_rights(id, name, NULL), rights);
+ 
+     return (AB_SUCCESS);
+ }
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/authize.c cyrus-imspd-v1.7a/imsp/authize.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/authize.c	2003-08-06 09:56:53.000000000 -0700
++++ cyrus-imspd-v1.7a/imsp/authize.c	2003-09-10 13:28:11.000000000 -0700
+@@ -122,7 +122,7 @@
+ 
+     /* Get an authentication state from the libcyrus "auth" module
+      * (not to be confused the the IMSP authize module in this file).
+-     * This is needed for acl_myrights(). 
++     * This is needed for cyrus_acl_myrights(). 
+      * Free id->state in case this isn't the first authentication this session.
+      */
+     if (id->state)
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/bb.c cyrus-imspd-v1.7a/imsp/bb.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/bb.c	2000-02-10 14:10:21.000000000 -0800
++++ cyrus-imspd-v1.7a/imsp/bb.c	2003-09-10 13:28:37.000000000 -0700
+@@ -385,7 +385,7 @@
+     struct auth_state *id;
+     char *name, *acl;
+ {
+-    long rights = acl_myrights(id, acl);
++    long rights = cyrus_acl_myrights(id, acl);
+     char *user = auth_username(id);
+     int len = strlen(user);
+ 
+diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c cyrus-imspd-v1.7a/imsp/imsp_server.c
+--- cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c	2003-08-06 09:56:54.000000000 -0700
++++ cyrus-imspd-v1.7a/imsp/imsp_server.c	2003-09-10 13:30:25.000000000 -0700
+@@ -1273,7 +1273,7 @@
+ 		    defacl = malloc(defacllen);
+ 		    if (defacl) {
+ 			snprintf(acl = defacl, defacllen, "%s\t%s\t", user,
+-				acl_masktostr(ACL_ALL, rbuf));
++				cyrus_acl_masktostr(ACL_ALL, rbuf));
+ 		    }
+ 		}
+ 	    }
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1 b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1
new file mode 100644
index 000000000000..0eb1f0da70b0
--- /dev/null
+++ b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1
@@ -0,0 +1 @@
+MD5 58aed9741f975e29f364e7e604ddc5e9 cyrus-imspd-v1.7b.tar.gz 636760
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.8 b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.8
new file mode 100644
index 000000000000..7fafc3aef498
--- /dev/null
+++ b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.8
@@ -0,0 +1 @@
+MD5 90de37a522f308186ca545596f6cafbb cyrus-imspd-v1.8.tar.gz 650596