Fixes perl issues - just a mod to the building of the perl module

6 files changed, 444 insertions, 3 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 61bc68a60c9b..3c9015b8202b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.11 2002/09/23 17:29:34 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.12 2002/09/30 22:25:04 mcummings Exp $
+
+<<<<<<< ChangeLog
+*cyrus-imapd-2.1.9-r2 (30 Sep 2002)
+
+  12 Sep 2002; <mcummings@gentoo.org> cyrus-imapd-2.1.5-r2 :
+  Corrected syntax for perl portion
 
 *cyrus-imapd-2.1.9 (10 Sep 2002)
 
@@ -17,6 +23,7 @@
   Version bump.  Cleaned up the ebuild even more.  Added a patch to
   bypass the -I/usr/include gcc problem.  Added kerberos use flag.
 
+>>>>>>> 1.9
 *cyrus-imapd-2.1.5-r1 (13 Aug 2002)
 
   22 Aug 2002; Nick Hadaway <raker@gentoo.org> cyrus-imapd-2.1.5-r1.ebuild :
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..9533e0fb0ad7
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild,v 1.1 2002/09/30 22:25:04 mcummings Exp $
+
+inherit perl-module
+inherit perl-post
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+PROVIDE="virtual/imapd"
+RDEPEND="virtual/glibc
+	afs? ( >=net-fs/openafs-1.2.2 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+    perl? ( >=sys-devel/perl-5.6.1 )
+	>=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/cyrus-sasl-2.1.2
+	>=sys-apps/tcp-wrappers-7.6"
+DEPEND="virtual/glibc
+	afs? ( >=net-fs/openafs-1.2.2 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+    perl? ( >=sys-devel/perl-5.6.1 )
+	>=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/cyrus-sasl-2.1.2
+	>=sys-apps/tcp-wrappers-7.6
+	net-mail/mailbase"
+
+
+# recommended: flex, maybe: net-snmp, postfix, perl?, afs, inn, tcl (cyradm)
+	
+pkg_setup() {
+	
+	if ! grep -q ^cyrus: /etc/passwd ; then
+		useradd -c cyrus -d /usr/cyrus -g mail -s /bin/false -u 96 cyrus \
+			|| die "problem adding user cyrus"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${WORKDIR}
+	patch -p0 < ${FILESDIR}/e2fsprogs-et.diff
+}
+
+src_compile() {
+
+	local myconf
+	
+	use afs || myconf="--without-afs"
+	use snmp || myconf="${myconf} --without-ucdsnmp"
+	use ssl || myconf="${myconf} --without-openssl"
+    	use perl || myconf="${myconf} --without-perl --disable-cyradm"
+
+
+	./configure \
+		--prefix=/usr \
+		--without-krb \
+		--without-gssapi \
+		--enable-listext \
+		--disable-cyradm \
+		--with-cyrus-group=mail \
+		--enable-shared \
+		--enable-netscapehack \
+		--with-com_err=yes \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	# make depends break with -f... in CFLAGS
+	make depend CFLAGS="" || die "make depend problem"
+
+	make || die "compile problem"
+
+}
+
+src_install () {
+	# remove perl subdirs from beeing installed
+	sed "s:SUBDIRS = imap sieve:SUBDIRS =:" ${S}/perl/Makefile > ${S}/perl/Makefile.install
+	mv ${S}/perl/Makefile ${S}/perl/Makefile.orig
+	mv ${S}/perl/Makefile.install ${S}/perl/Makefile
+
+	emake DESTDIR=${D} install || die
+
+	# Remove the developer stuff (-> dev-libs/cyrus-imap-devel)
+	rm -rf ${D}usr/include ${D}usr/lib
+
+	# Remove the manpages (wrong place)
+	rm -rf ${D}usr/man
+	
+	mkdir ${D}etc
+	cp ${FILESDIR}/imapd.conf ${D}etc/imapd.conf
+	cp ${FILESDIR}/cyrus.conf ${D}etc/cyrus.conf
+	mkdir ${D}etc/pam.d
+	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
+
+	mkdir ${D}var ${D}var/log
+	touch ${D}var/log/imapd.log
+	touch ${D}var/log/auth.log
+
+   	mkdir -m 0750 ${D}var/imap
+   	chown -R cyrus.mail ${D}var/imap 
+   	mkdir -m 0755 ${D}var/imap/db
+        chown -R cyrus.mail ${D}var/imap/db
+   	mkdir -m 0755 ${D}var/imap/log
+        chown -R cyrus.mail ${D}var/imap/log
+   	mkdir -m 0755 ${D}var/imap/msg
+        chown -R cyrus.mail ${D}var/imap/msg
+   	mkdir -m 0755 ${D}var/imap/user
+        chown -R cyrus.mail ${D}var/imap/user
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/user/$i ; done
+   	mkdir -m 0755 ${D}var/imap/proc
+        chown -R cyrus.mail ${D}var/imap/proc
+   	mkdir -m 0755 ${D}var/imap/quota
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/quota/$i ; done
+	mkdir -m 0755 ${D}var/imap/sieve
+        chown -R cyrus.mail ${D}var/imap/sieve
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/sieve/$i ; done
+   	mkdir -m 0755 ${D}var/imap/socket
+        chown -R cyrus.mail ${D}var/imap/socket
+
+	mkdir ${D}var/spool
+	mkdir -m 0750 ${D}var/spool/imap
+        chown -R cyrus.mail ${D}var/spool/imap
+	mkdir -m 0755 ${D}var/spool/imap/stage.
+        chown -R cyrus.mail ${D}var/spool/imap/stage.
+	# For hashimapspool
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
+	    chown -R cyrus.mail ${D}var/spool/imap/$i ; done
+
+
+	doman man/*.?
+	# remove man-pages from packet net-mail/cyrus-imapd-admin
+	rm ${D}usr/share/man/man1/installsieve.1.gz ${D}usr/share/man/man1/sieveshell.1.gz
+
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc ${D}usr/share/doc/${PF}/html
+	
+	cp -r contrib tools ${D}usr/share/doc/${PF}
+	# Remove the CVS directories
+	find 2>/dev/null ${D}usr/share/doc/ -type d -name CVS -exec rm -rf '{}' \;
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6 cyrus
+
+	if use perl ; then
+		export DESTDIR=${D}
+		cd ${S}/perl/imap
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
+		perl-module_src_install
+        cd ${S}/perl/sieve/acap
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
+		perl-module_src_install
+        cd ${S}/perl/sieve/managesieve
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
+		perl-module_src_install
+	fi
+
+}
+
+pkg_postinst() {
+
+	perl-post_pkg_postinst
+	ewarn "*****************************************************************"
+	ewarn "* WARNING: If you change the fs-type of /var/imap or            *"
+	ewarn "* /var/spool/imap you should read step 9 of                     *"
+	ewarn "* /usr/share/doc/${P}/html/install-configure.html. *"
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ewarn "* Setting /var/imap/user/* and /var/imap/quota/* to synchronous *"
+		ewarn "* updates.                                                      *"
+		chattr +S /var/imap/user /var/imap/user/* /var/imap/quota /var/imap/quota/*
+	fi
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ewarn "* Setting /var/spool/imap/* to synchronous updates.             *"
+		chattr +S /var/spool/imap /var/spool/imap/*
+	fi
+	ewarn "* If the queue directory of the mail daemon resides on an ext2  *"
+	ewarn "* or ext3 partition you need to set it manually to update       *"
+	ewarn "* synchronously. E.g. 'chattr +S /var/spool/mqueue'.            *"
+	ewarn "*****************************************************************"
+
+	einfo "*****************************************************************"
+	einfo "* NOTE: For correct logging add                                 *"
+	einfo "*         local6.* /var/log/imapd.log                           *"
+	einfo "*         auth.debug /var/log/auth.log                          *"
+	einfo "*       to /etc/syslog.conf.                                     *"
+	einfo "*****************************************************************"
+
+	if [ "'use ssl'" ]; then
+		ewarn "*****************************************************************"
+		ewarn "* WARNING: Read the section about SSL and TLS of                *"
+		ewarn "* /usr/share/doc/${P}/html/install-configure.html. *"
+		ewarn "* about installing the needed keys.                             *"
+		ewarn "*****************************************************************"
+	fi
+
+}
+
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..ebc6cac62aa8
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild,v 1.1 2002/09/30 22:25:04 mcummings Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+PROVIDE="virtual/imapd"
+DEPEND="virtual/glibc
+	afs? ( >=net-fs/openafs-1.2.2 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+    	perl? ( >=sys-devel/perl-5.6.1 )
+	kerberos? ( >=app-crypt/krb5-1.2.5 )
+	>=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/cyrus-sasl-2.1.2
+	>=sys-apps/tcp-wrappers-7.6
+	net-mail/mailbase"
+RDEPEND="${DEPEND}"
+
+# recommended: flex, maybe: net-snmp, postfix, perl?, afs, inn, tcl (cyradm)
+	
+pkg_setup() {
+	
+	if ! grep -q ^cyrus: /etc/passwd ; then
+		useradd -c cyrus -d /usr/cyrus -g mail -s /bin/false -u 96 cyrus \
+			|| die "problem adding user cyrus"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch < ${FILESDIR}/config.diff || die "patch failed"
+
+}
+
+src_compile() {
+
+	local myconf
+	
+	use afs && myconf="--with-afs" \
+		|| myconf="--without-afs"
+
+	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
+		|| myconf="${myconf} --without-ucdsnmp"
+
+	use ssl && myconf="${myconf} --with-openssl=/usr" \
+		|| myconf="${myconf} --without-openssl"
+
+    	use perl && myconf="${myconf} --with-perl --enable-cyradm" \
+		|| myconf="${myconf} --without-perl --disable-cyradm"
+
+	use kerberos && myconf="${myconf} --with-krb --with-auth=krb" \
+		|| myconf="${myconf} --without-krb --with-auth=unix"
+
+	econf \
+		--enable-listext \
+		--with-cyrus-group=mail \
+		--enable-netscapehack \
+		--with-com_err=yes \
+		${myconf} || die "bad ./configure"
+
+	# make depends break with -f... in CFLAGS
+	make depend CFLAGS="" || die "make depend problem"
+
+	make || die "compile problem"
+
+}
+
+src_install () {
+	# remove perl subdirs from beeing installed
+	sed "s:SUBDIRS = imap sieve:SUBDIRS =:" ${S}/perl/Makefile > ${S}/perl/Makefile.install
+	mv ${S}/perl/Makefile ${S}/perl/Makefile.orig
+	mv ${S}/perl/Makefile.install ${S}/perl/Makefile
+
+	# Install!
+	make DESTDIR=${D} install || die
+
+	# Fix manpage stuff
+	rm -rf ${D}usr/man
+	doman man/*.?
+
+	mkdir ${D}etc
+	cp ${FILESDIR}/imapd.conf ${D}etc/imapd.conf
+	cp ${FILESDIR}/cyrus.conf ${D}etc/cyrus.conf
+	mkdir ${D}etc/pam.d
+	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
+
+	mkdir ${D}var ${D}var/log
+	touch ${D}var/log/imapd.log
+	touch ${D}var/log/auth.log
+
+   	mkdir -m 0750 ${D}var/imap
+   	chown -R cyrus.mail ${D}var/imap 
+   	mkdir -m 0755 ${D}var/imap/db
+        chown -R cyrus.mail ${D}var/imap/db
+   	mkdir -m 0755 ${D}var/imap/log
+        chown -R cyrus.mail ${D}var/imap/log
+   	mkdir -m 0755 ${D}var/imap/msg
+        chown -R cyrus.mail ${D}var/imap/msg
+   	mkdir -m 0755 ${D}var/imap/user
+        chown -R cyrus.mail ${D}var/imap/user
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/user/$i ; done
+   	mkdir -m 0755 ${D}var/imap/proc
+        chown -R cyrus.mail ${D}var/imap/proc
+   	mkdir -m 0755 ${D}var/imap/quota
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/quota/$i ; done
+	mkdir -m 0755 ${D}var/imap/sieve
+        chown -R cyrus.mail ${D}var/imap/sieve
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
+	    chown -R cyrus.mail ${D}var/imap/sieve/$i ; done
+   	mkdir -m 0755 ${D}var/imap/socket
+        chown -R cyrus.mail ${D}var/imap/socket
+
+	mkdir ${D}var/spool
+	mkdir -m 0750 ${D}var/spool/imap
+        chown -R cyrus.mail ${D}var/spool/imap
+	mkdir -m 0755 ${D}var/spool/imap/stage.
+        chown -R cyrus.mail ${D}var/spool/imap/stage.
+	# For hashimapspool
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
+	    chown -R cyrus.mail ${D}var/spool/imap/$i ; done
+
+
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc ${D}usr/share/doc/${PF}/html
+	cp -r contrib tools ${D}usr/share/doc/${PF}
+
+	# Remove the CVS directories
+	find 2>/dev/null ${D}usr/share/doc/ -type d -name CVS -exec rm -rf '{}' \;
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6 cyrus
+
+	if use perl ; then
+		export DESTDIR=${D}
+		cd ${S}/perl/imap
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_install 
+        cd ${S}/perl/sieve/acap
+		perl-module_src_prep
+		perl-module_src_compile
+        perl-module_src_install
+        cd ${S}/perl/sieve/acap/managesieve
+		perl-module_src_prep
+		perl-module_src_compile
+        perl-module_src_install
+	fi
+
+	# remove empty log files installed by default
+	rm ${D}/var/log/{auth,imapd}.log
+
+}
+
+pkg_postinst() {
+
+	ewarn "*****************************************************************"
+	ewarn "* WARNING: If you change the fs-type of /var/imap or            *"
+	ewarn "* /var/spool/imap you should read step 9 of                     *"
+	ewarn "* /usr/share/doc/${P}/html/install-configure.html. *"
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ewarn "* Setting /var/imap/user/* and /var/imap/quota/* to synchronous *"
+		ewarn "* updates.                                                      *"
+		chattr +S /var/imap/user /var/imap/user/* /var/imap/quota /var/imap/quota/*
+	fi
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ewarn "* Setting /var/spool/imap/* to synchronous updates.             *"
+		chattr +S /var/spool/imap /var/spool/imap/*
+	fi
+	ewarn "* If the queue directory of the mail daemon resides on an ext2  *"
+	ewarn "* or ext3 partition you need to set it manually to update       *"
+	ewarn "* synchronously. E.g. 'chattr +S /var/spool/mqueue'.            *"
+	ewarn "*****************************************************************"
+
+	einfo "*****************************************************************"
+	einfo "* NOTE: For correct logging add                                 *"
+	einfo "*         local6.* /var/log/imapd.log                           *"
+	einfo "*         auth.debug /var/log/auth.log                          *"
+	einfo "*       to /etc/syslog.conf.                                     *"
+	einfo "*****************************************************************"
+
+	if [ "'use ssl'" ]; then
+		ewarn "*****************************************************************"
+		ewarn "* WARNING: Read the section about SSL and TLS of                *"
+		ewarn "* /usr/share/doc/${P}/html/install-configure.html. *"
+		ewarn "* about installing the needed keys.                             *"
+		ewarn "*****************************************************************"
+	fi
+
+}
+
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild
index 4bfebd6c435c..d62451aed5b4 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild,v 1.2 2002/09/16 18:35:47 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild,v 1.3 2002/09/30 22:25:04 mcummings Exp $
 
 inherit perl-module
 
@@ -149,8 +149,19 @@ src_install () {
 	if use perl ; then
 		export DESTDIR=${D}
 		cd ${S}/perl/imap
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
 		perl-module_src_install 
-        cd ${S}/perl/sieve
+        cd ${S}/perl/sieve/acap
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
+        perl-module_src_install
+        cd ${S}/perl/sieve/acap/managesieve
+		perl-module_src_prep
+		perl-module_src_compile
+		perl-module_src_test
         perl-module_src_install
 	fi
 
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2
new file mode 100644
index 000000000000..0ef6f5ee45b9
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2
@@ -0,0 +1 @@
+MD5 86eb126e818f998cf7ff2e1fe1a09cb3 cyrus-imapd-2.1.5.tar.gz 1627592
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1
new file mode 100644
index 000000000000..4613b3ff368d
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1
@@ -0,0 +1 @@
+MD5 09e9a5ad1d20c0650b3787b951d2e86f cyrus-imapd-2.1.9.tar.gz 1633031