version bump; use new qmail.eclass; ebuild cleanup

Package-Manager: portage-2.1.4.4

5 files changed, 240 insertions, 23 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 71c586886f17..cc97a004fc1f 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/vpopmail
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.83 2007/09/16 08:16:28 hollow Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.84 2008/04/06 17:37:38 hollow Exp $
+
+*vpopmail-5.4.25 (06 Apr 2008)
+
+  06 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/vpopmail.clearopensmtp, -files/vpopmail.conf,
+  +vpopmail-5.4.25.ebuild:
+  version bump; use new qmail.eclass; ebuild cleanup
 
 *vpopmail-5.4.20 (16 Sep 2007)
 
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 3ee0273aaee5..e9c74ee6ce59 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,14 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99vpopmail 64 RMD160 c5587e2065da076bdd33c5b97139029936a26637 SHA1 5bc3f3ae1938c9951d0003b47d04154996596f25 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4
 AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 RMD160 691f03e6a7eee4597ef7615720618bccd2c8439f SHA1 dc5a5e9e2323346bb2687049d9d3a68ac1fec866 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085
 AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4
-AUX vpopmail.clearopensmtp 235 RMD160 9cb47b507e22f25ed27b56e00593d93724f00625 SHA1 e8e1790c514cea8bc8684ded85325a698d38a0bf SHA256 c98c52414e5fbc6f02b0e146546f464613ac483a2c81e5ee11ee154cdceb8883
-AUX vpopmail.conf 466 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 SHA1 69f150647054d1b275f75004050e223fd2643034 SHA256 66d50ec6ba176cab96934ebc696d880d2d60d5767e19464cab54f85e54ac421e
 DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
 DIST vpopmail-5.4.19a.tar.gz 489109 RMD160 cc4c952b850bee9c6c10429dca59cce681287838 SHA1 fe1cb0e0eecf5a6c41930626e5eb29c361bc44ba SHA256 e124c596645bbdc3924b2b73339558a6d80aa61cfa4a0044939d240bae8ae66e
 DIST vpopmail-5.4.20.tar.gz 500268 RMD160 99379d788c3422a076e95b1ec0064cd7336f6765 SHA1 fc1c98ef3b93d945215f9cdc9f7c9a3041d8eaf2 SHA256 fa564a73007acbf81092c030329eac1394e981484c195a51a5c8bfbf7ed3f97e
+DIST vpopmail-5.4.25.tar.gz 504184 RMD160 57142cca0617bd95ef2e5f4aa74ab5fa0844d6df SHA1 ce62415fbd338b80f1962a477d94276f622756d0 SHA256 41aa61094fd4bb02cca71fa01815b37b470e8e299bb99a64995189e15ff7142b
 EBUILD vpopmail-5.4.16.ebuild 7570 RMD160 f47ab2d506ea05a92f7087d57a8002631e4a4773 SHA1 0d420e5593e31810d59270257e3211367dd9d043 SHA256 dc3a8bcadd0a3c9b8ac2f8bef113004fc413078ae0a33712abb6aa6b84862049
 EBUILD vpopmail-5.4.19.ebuild 6889 RMD160 733b9fdf3b5f9f96b5e636f7168ea86c75306a38 SHA1 9486a00a5a4e4e3c2de5c4204cdea43ede5f1192 SHA256 70e278c198dc8f906fa0544196101cbe296d204ea5630176186888795af9830d
 EBUILD vpopmail-5.4.20.ebuild 6888 RMD160 63b857e3e72300f8eee9103c2a25cd87605aaa5d SHA1 610ca8cd14464c95f790db6d2699ce878033f771 SHA256 cee73964df9afc0798c4bb460d6e30500579d253586665bcab28fdd561549989
-MISC ChangeLog 13388 RMD160 7dc755ceb15118d005af5d3ad656b13e3374defb SHA1 c79320c17dc880b9a7a4ec33d3493920b7c821fd SHA256 020dba9f579e65a9d804077328c3fc207de129a80a99b5373e7833748ca8b589
+EBUILD vpopmail-5.4.25.ebuild 6688 RMD160 6a0f9f87c1f270ad269391c1f47bf484bfe40e6a SHA1 c58add7cc36161fe54fc7ed521a9036ede783569 SHA256 dfca35d3cbd4fba5f47b8d56a9b5df35646aa504214ef5b9951b4883d9dbd8d1
+MISC ChangeLog 13606 RMD160 196bdf2df002c259c2a10419b56af7c40f7e9c6f SHA1 a65a60274efef78a27e367d6e718d6ab5929135b SHA256 397efc0eb114c036543b8e726fd2ba86e81a0edf738afb8b758f5acf3edf9361
 MISC metadata.xml 253 RMD160 70832184fd802ef3eb31d9402ec9dd7e6cf13a85 SHA1 d739b49808e925f057320dd0638c9869bc43ac7d SHA256 d6dc3563367c333b1d108804be0d00711f6f77429ada8ebd973cb073c6e60f2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH+QpnmPFBzbX68WERAothAJ9beA16FMIW4ei+5Q20GKpcPp3DEACfayrE
+mizh8ojQe3dHNJCdOxtpDSI=
+=uoKb
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/files/vpopmail.clearopensmtp b/net-mail/vpopmail/files/vpopmail.clearopensmtp
deleted file mode 100644
index 5e10332ed7da..000000000000
--- a/net-mail/vpopmail/files/vpopmail.clearopensmtp
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/files/vpopmail.clearopensmtp,v 1.2 2004/07/18 04:06:17 dragonheart Exp $
-# clean open smtp relays that vpopmail might have
-/var/vpopmail/bin/clearopensmtp 2>&1 > /dev/null
diff --git a/net-mail/vpopmail/files/vpopmail.conf b/net-mail/vpopmail/files/vpopmail.conf
deleted file mode 100644
index c3f04461bc84..000000000000
--- a/net-mail/vpopmail/files/vpopmail.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/files/vpopmail.conf,v 1.3 2004/07/14 23:53:36 agriffis Exp $
-
-# Spaces and tabs are fine. Just don't use them
-# In the password or usernames
-
-MYSQL_UPDATE_SERVER	localhost
-MYSQL_UPDATE_USER	vpopmail
-MYSQL_UPDATE_PASSWD	secret
-
-MYSQL_READ_SERVER	localhost
-MYSQL_READ_USER		vpopmail
-MYSQL_READ_PASSWD	secret
diff --git a/net-mail/vpopmail/vpopmail-5.4.25.ebuild b/net-mail/vpopmail/vpopmail-5.4.25.ebuild
new file mode 100644
index 000000000000..3c9a043ba6ab
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.25.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.25.ebuild,v 1.1 2008/04/06 17:37:38 hollow Exp $
+
+inherit autotools eutils fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(getent passwd vpopmail | cut -d: -f6)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_compile() {
+	vpopmail_set_homedir
+
+	if use mysql; then
+		authopts=" \
+			--enable-auth-module=mysql \
+			--enable-libs=/usr/include/mysql \
+			--enable-libdir=/usr/lib/mysql \
+			--enable-sql-logging \
+			--enable-valias \
+			--disable-mysql-replication \
+			--enable-mysql-limits"
+	else
+		authopts="--enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcp-rules-prog \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	make DESTDIR="${D}" install || die "make install failed"
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc AUTHORS ChangeLog FAQ INSTALL README*
+	dohtml 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
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	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 ${VPOP_HOME}/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."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+}