add conversion script to -r9, and do version bump to new stable version.

8 files changed, 262 insertions, 23 deletions

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index a4a06d6d4029..ce5d85be867d 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,12 +1,11 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/Manifest,v 1.28 2004/01/05 06:07:29 robbat2 Exp $
-MD5 25a76d617426d9b8ecfd020b80ba6016 vpopmail-5.2.1-r9.ebuild 7435
-MD5 23d5189f50d18117f8e65ab1b027df9c vpopmail-5.2.1-r6.ebuild 6370
-MD5 0d0b597b0be51f05b73072576b2c64a9 vpopmail-5.2.1-r8.ebuild 6700
-MD5 aaf66be4381a990e8302ed581c24db1c vpopmail-5.2.1-r5.ebuild 6075
-MD5 2d8e2997eba816fe24562bbc068e5b12 vpopmail-5.2.2.ebuild 7442
-MD5 4d0603212359169055062f5010d6f200 ChangeLog 4156
+MD5 5443addd95a5209dd13ee83bbf16d819 vpopmail-5.2.1-r9.ebuild 7543
+MD5 b09c41caa57b71f3ff0d5b3b72f391df vpopmail-5.2.1-r6.ebuild 6370
+MD5 85284bfbd826bf6d7a71964ebc4e7364 vpopmail-5.2.1-r8.ebuild 6700
+MD5 44cf067ba08236bd4af259e3f7b10cd0 vpopmail-5.2.1-r5.ebuild 6075
+MD5 72d77df2bd42df6372f4ffd290aef8e0 vpopmail-5.2.2.ebuild 7459
+MD5 6e738be2fc56750c2e5f65d2304370e6 ChangeLog 4366
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 122d629b4ce8f06e71f75215bd143fdb vpopmail-5.2.1-r7.ebuild 6369
+MD5 090a1fcc2d26d12157e39af0ff6a7f87 vpopmail-5.2.1-r7.ebuild 6369
 MD5 c8f37f4f0e61e7c848351d7e4a38478f files/vpopmail-Maildir-dotmaildir-fix.sh 931
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
 MD5 ceafe640132b1326bbc71949e8bccd1c files/vpopmail-5.2.1-gcc33mysql.diff 554
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.2 b/net-mail/vpopmail/files/digest-vpopmail-5.2.2
new file mode 100644
index 000000000000..befa612f58c1
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.2.2
@@ -0,0 +1,2 @@
+MD5 57253be349b25bfd5b86083ffcd42283 vpopmail-5.2.2.tar.gz 280075
+MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
index 16dae6341a03..4af2516e334b 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.6 2003/12/26 02:00:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.7 2004/01/05 06:07:29 robbat2 Exp $
 
 IUSE="mysql ipalias"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
index c63e62373e37..fb4297026855 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.10 2003/12/08 22:31:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.11 2004/01/05 06:07:29 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
index 96f126861eb6..715465b73d92 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.2 2003/12/08 22:31:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.3 2004/01/05 06:07:29 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
index 31acc89f8fd1..77a884bc4a79 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.2 2003/12/08 22:31:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.3 2004/01/05 06:07:29 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
index c090b73ac357..54adffe1fd4a 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.1 2003/12/26 01:56:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.2 2004/01/05 06:07:29 robbat2 Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -74,6 +74,12 @@ src_unpack() {
 	for i in vchkpw.c vconvert.c vdelivermail.c vpopbull.c vpopmail.c vqmaillocal.c vuserinfo.c; do
 		sed -e 's|Maildir|.maildir|g' -i $i || die "Failed to change s/Maildir/.maildir/g in $i"
 	done
+
+	# the configure script tries to force root and make directories not using ${D}
+	cp configure configure.orig
+	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
+	mv --force configure.new configure
+	chmod u+x configure
 }
 
 src_compile() {
@@ -91,16 +97,14 @@ src_compile() {
 			--enable-mysql-replication=n" \
 		|| myopts="${myopts} --enable-mysql=n"
 
-	# the configure script tries to force root and make directories not using ${D}
-	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
-	mv --force configure.new configure
-	chmod u+x configure
-
 	# Bug 20127
 	use clearpasswd &&
 		myopts="${myopts} --enable-clear-passwd=y" ||
 		myopts="${myopts} --enable-clear-passwd=n"
 
+	addpredict /var/vpopmail/etc/lib_deps
+	addpredict /var/vpopmail/etc/inc_deps
+
 	econf ${myopts} --sbindir=/usr/sbin \
 		--bindir=/usr/bin \
 		--sysconfdir=${VPOP_HOME}/etc \
diff --git a/net-mail/vpopmail/vpopmail-5.2.2.ebuild b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
new file mode 100644
index 000000000000..a752bab922bf
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2.ebuild,v 1.1 2004/01/05 06:07:29 robbat2 Exp $
+
+IUSE="mysql ipalias clearpasswd"
+
+inherit eutils gnuconfig
+
+# TODO: all ldap, sybase support
+HOMEPAGE="http://www.inter7.com/vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
+SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
+	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc"
+DEPEND_COMMON="net-mail/qmail
+	mysql? ( >=dev-db/mysql-3.23* )"
+DEPEND="sys-apps/sed
+		sys-apps/ucspi-tcp
+		${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+	 	 virtual/cron"
+
+# Define vpopmail home dir in /etc/password if different
+VPOP_DEFAULT_HOME="/var/vpopmail"
+VPOP_HOME="$VPOP_DEFAULT_HOME"
+
+# This makes sure the variable is set, and that it isn't null.
+vpopmail_set_homedir() {
+	VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
+	if [ -z "$VPOP_HOME" ]; then
+		echo -ne "\a"
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	if [ -z `getent group vpopmail` ]; then
+		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
+	fi
+	if [ -z `getent passwd vpopmail` ]; then
+		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
+		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
+		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
+	fi
+	upgradewarning
+}
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
+
+	if use mysql; then
+		einfo "Applying MySQL patch..."
+		# Thanks to Nicholas Jones (carpaski@gentoo.org)
+		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
+	fi
+
+	for i in vchkpw.c vconvert.c vdelivermail.c vpopbull.c vpopmail.c vqmaillocal.c vuserinfo.c; do
+		sed -e 's|Maildir|.maildir|g' -i $i || die "Failed to change s/Maildir/.maildir/g in $i"
+	done
+
+	gnuconfig_update
+
+	# the configure script tries to force root and make directories not using ${D}
+	cp configure configure.orig
+	#sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
+	sed -e '1304,1311d' -e '1582,1589d' -e '2129d' -e '2364d' -e '2371d' -i configure
+}
+
+src_compile() {
+	vpopmail_set_homedir
+
+	use ipalias && myopts="${myopts} --enable-ip-alias-domains=y" \
+		|| myopts="${myopts} --enable-ip-alias-domains=n"
+
+	use mysql && myopts="${myopts} --enable-mysql=y \
+			--enable-libs=/usr/include/mysql \
+			--enable-sqllibdir=/usr/lib/mysql \
+			--enable-mysql-logging=y \
+			--enable-auth-logging=y \
+			--enable-valias=y \
+			--enable-mysql-replication=n" \
+		|| myopts="${myopts} --enable-mysql=n"
+
+	# Bug 20127
+	use clearpasswd &&
+		myopts="${myopts} --enable-clear-passwd=y" ||
+		myopts="${myopts} --enable-clear-passwd=n"
+
+	addpredict /var/vpopmail/etc/lib_deps
+	addpredict /var/vpopmail/etc/inc_deps
+
+	econf ${myopts} --sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-qmaildir=/var/qmail \
+		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
+		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
+		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-many-domains=y \
+		--enable-vpopgroup=vpopmail \
+		--enable-file-locking=y \
+		--enable-file-sync=y \
+		--enable-md5-passwords=y \
+		--enable-defaultquota=30000000,1000C \
+		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
+		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
+		--enable-logging=y \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext
+
+	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> ${S}/config.h
+
+	emake || die "Make failed."
+}
+
+src_install () {
+	vpopmail_set_homedir
+
+	make DESTDIR=${D} install-strip || die
+
+	into /var/vpopmail
+	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	# Install documentation.
+	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
+	dodoc README README.* RELEASE.NOTES UPGRADE.*
+	dodoc doc/doc_html/* doc/man_html/*
+	rm -rf ${D}/${VPOP_HOME}/doc
+	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
+
+	# Create /etc/vpopmail.conf
+	if use mysql; then
+		einfo "Installing vpopmail mysql configuration file"
+		dodir /etc
+		insinto /etc
+		doins ${FILESDIR}/vpopmail.conf
+		fowners vpopmail:vpopmail /etc/vpopmail.conf
+		fperms 600 /etc/vpopmail.conf
+	fi
+
+	# Install a proper cronjob instead of the old nastiness
+	einfo "Installing cronjob"
+	dodir /etc/cron.hourly
+	insinto /etc/cron.hourly
+	doins ${FILESDIR}/vpopmail.clearopensmtp
+	fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	insinto /etc/env.d
+	doins ${FILESDIR}/99vpopmail
+
+	# Configure b0rked. We'll do this manually
+	echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
+	local libs_extra
+	use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
+	echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
+
+	einfo "Locking down vpopmail permissions"
+	# secure things more, i don't want the vpopmail user being able to write this stuff!
+	chown -R root:root ${D}${VPOP_HOME}/{bin,etc,include}
+
+}
+
+pkg_preinst() {
+	vpopmail_set_homedir
+
+	# Keep DATA
+	keepdir ${VPOP_HOME}/domains
+
+	# This is a workaround until portage handles binary packages+users better.
+	pkg_setup
+
+	upgradewarning
+}
+
+pkg_postinst() {
+	einfo "Performing post-installation routines for ${P}."
+
+	if use mysql; then
+		echo
+		einfo "You have 'mysql' turned on in your USE"
+		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		echo
+		einfo "First log into mysql as your mysql root user and pass. Then:"
+		einfo "> create database vpopmail;"
+		einfo "> use mysql;"
+		einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		einfo "  vpopmail@localhost identified by 'your password';"
+		einfo "> flush privileges;"
+		echo
+		einfo "If you have problems with vpopmail not accepting mail properly,"
+		einfo "please ensure that /etc/vpopmail.conf is chmod 600 and"
+		einfo "owned by vpopmail:vpopmail"
+	fi
+	# do this for good measure
+	if [ -e /etc/vpopmail.conf ]; then
+		chmod 600 /etc/vpopmail.conf
+		chown vpopmail:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	einfo "The vpopmail DATA will NOT be removed automatically."
+	einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+}