version bump. fixes #162348, #161765, #182192 and hopefully #126809, #149267 too

Package-Manager: portage-2.1.3_rc9

6 files changed, 243 insertions, 19 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index fa939b7e2b52..435350b51b37 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.81 2007/07/02 14:56:57 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.82 2007/07/29 23:00:10 hollow Exp $
+
+*vpopmail-5.4.19 (29 Jul 2007)
+
+  29 Jul 2007; Benedikt Böhm <hollow@gentoo.org> files/99vpopmail,
+  metadata.xml, +vpopmail-5.4.19.ebuild:
+  version bump. fixes #162348, #161765, #182192 and hopefully #126809, #149267
+  too
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> vpopmail-5.4.16.ebuild:
   (QA) RESTRICT clean up.
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index b01a36cc7b2d..d823612765c9 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 99vpopmail 86 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b SHA1 843a382c9e985dceef6e0e4fbe04a5d7c30c42e2 SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1
-MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
-RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b files/99vpopmail 86
-SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1 files/99vpopmail 86
+AUX 99vpopmail 64 RMD160 c5587e2065da076bdd33c5b97139029936a26637 SHA1 5bc3f3ae1938c9951d0003b47d04154996596f25 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4
+MD5 8a0a03cf21614c86bf3d77e341932842 files/99vpopmail 64
+RMD160 c5587e2065da076bdd33c5b97139029936a26637 files/99vpopmail 64
+SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4 files/99vpopmail 64
 AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 files/vpopmail-5.4.9-access.violation.patch 918
@@ -26,25 +26,33 @@ MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 files/vpopmail.conf 466
 SHA256 66d50ec6ba176cab96934ebc696d880d2d60d5767e19464cab54f85e54ac421e files/vpopmail.conf 466
 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
 EBUILD vpopmail-5.4.16.ebuild 7570 RMD160 f47ab2d506ea05a92f7087d57a8002631e4a4773 SHA1 0d420e5593e31810d59270257e3211367dd9d043 SHA256 dc3a8bcadd0a3c9b8ac2f8bef113004fc413078ae0a33712abb6aa6b84862049
 MD5 1b65b874e591cacfe755d443fbf67867 vpopmail-5.4.16.ebuild 7570
 RMD160 f47ab2d506ea05a92f7087d57a8002631e4a4773 vpopmail-5.4.16.ebuild 7570
 SHA256 dc3a8bcadd0a3c9b8ac2f8bef113004fc413078ae0a33712abb6aa6b84862049 vpopmail-5.4.16.ebuild 7570
-MISC ChangeLog 13002 RMD160 d83b9455958f634613bbddc45f182965ea70e4bb SHA1 16ae709c0dda6de58c0f9034d316c9c9725e228a SHA256 ac63f750f1e17a37e584b984daf1a98e6d9512cfb78f5ac133a23580a0957402
-MD5 35610f2c4781a1c9f443eff5227185b5 ChangeLog 13002
-RMD160 d83b9455958f634613bbddc45f182965ea70e4bb ChangeLog 13002
-SHA256 ac63f750f1e17a37e584b984daf1a98e6d9512cfb78f5ac133a23580a0957402 ChangeLog 13002
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+EBUILD vpopmail-5.4.19.ebuild 6060 RMD160 33b54ce5069c6a5aa6220be0536c4fea401b6e59 SHA1 c423570775e1f05b81dbb3144b594da9c67c0e1b SHA256 37010930a5c0fd6ca0eced7b86926bc1b2fb0f569465e59266cae1f3e0f03180
+MD5 bad3e0b327b675f0527d29865b6543f6 vpopmail-5.4.19.ebuild 6060
+RMD160 33b54ce5069c6a5aa6220be0536c4fea401b6e59 vpopmail-5.4.19.ebuild 6060
+SHA256 37010930a5c0fd6ca0eced7b86926bc1b2fb0f569465e59266cae1f3e0f03180 vpopmail-5.4.19.ebuild 6060
+MISC ChangeLog 13230 RMD160 27285de5dbf0fff0bc45f9233048649a504f13b0 SHA1 f2cd9bfa3d7b359ed40efa24fa2a41653055e1a4 SHA256 e00f0c080a2f7cc4450e43c7eef48f668eba1590bfe69a75824e1d7db1aea2eb
+MD5 851a55bbf972f76dcbb65dd069e7c5dc ChangeLog 13230
+RMD160 27285de5dbf0fff0bc45f9233048649a504f13b0 ChangeLog 13230
+SHA256 e00f0c080a2f7cc4450e43c7eef48f668eba1590bfe69a75824e1d7db1aea2eb ChangeLog 13230
+MISC metadata.xml 253 RMD160 70832184fd802ef3eb31d9402ec9dd7e6cf13a85 SHA1 d739b49808e925f057320dd0638c9869bc43ac7d SHA256 d6dc3563367c333b1d108804be0d00711f6f77429ada8ebd973cb073c6e60f2b
+MD5 4c104dfcc0bebff42c4ec3bda1c3d698 metadata.xml 253
+RMD160 70832184fd802ef3eb31d9402ec9dd7e6cf13a85 metadata.xml 253
+SHA256 d6dc3563367c333b1d108804be0d00711f6f77429ada8ebd973cb073c6e60f2b metadata.xml 253
 MD5 a464df25b232aab1a73d12dde9149854 files/digest-vpopmail-5.4.16 247
 RMD160 39d6399bf7108c80b1a15f77594f2f294aca82a8 files/digest-vpopmail-5.4.16 247
 SHA256 911d2a37db98d55dfb2e9884e9fa64a529d3b29882e5c9add69d3a0d62b7201f files/digest-vpopmail-5.4.16 247
+MD5 d252d34488d9a6e35347c852805e50d1 files/digest-vpopmail-5.4.19 250
+RMD160 12b13e8bf2daf2caf8fb6d296bfd76e4039ae8be files/digest-vpopmail-5.4.19 250
+SHA256 6dd5379262cdecb1c7b054fa9250af98a66ba88b27b112faf43ec8ef5513035d files/digest-vpopmail-5.4.19 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGiRI+ppoStNGKGywRAhfQAKC42+QXxdMcUqB6fQ6jPmKy0Pz52gCdHViJ
-3ijww7FlnCATH/AKQPi4Iw8=
-=arF7
+iD8DBQFGrRwGmPFBzbX68WERAjd5AJ9OKoOUSPSBbQf3r/UN8qxQeb1/VwCgkzQW
+Sd7SAIGiPql1dQcFL5Grnd8=
+=ink6
 -----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/files/99vpopmail b/net-mail/vpopmail/files/99vpopmail
index f3fd7377eb90..02d0a9c4d35a 100644
--- a/net-mail/vpopmail/files/99vpopmail
+++ b/net-mail/vpopmail/files/99vpopmail
@@ -1,2 +1,2 @@
 ROOTPATH="/var/vpopmail/bin"
-CONFIG_PROTECT="/var/vpopmail/domains /var/vpopmail/etc"
+CONFIG_PROTECT="/var/vpopmail/etc"
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.19 b/net-mail/vpopmail/files/digest-vpopmail-5.4.19
new file mode 100644
index 000000000000..af3688b2f63e
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.4.19
@@ -0,0 +1,3 @@
+MD5 a00e988fa355af8c367f09ddf0d4aaea vpopmail-5.4.19a.tar.gz 489109
+RMD160 cc4c952b850bee9c6c10429dca59cce681287838 vpopmail-5.4.19a.tar.gz 489109
+SHA256 e124c596645bbdc3924b2b73339558a6d80aa61cfa4a0044939d240bae8ae66e vpopmail-5.4.19a.tar.gz 489109
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 51f94e3fbe0e..ea8f365c8d69 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>qmail</herd>
+	<maintainer>
+		<email>hollow@gentoo.org</email>
+		<name>Benedikt Böhm</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/vpopmail/vpopmail-5.4.19.ebuild b/net-mail/vpopmail/vpopmail-5.4.19.ebuild
new file mode 100644
index 000000000000..0354edecf16c
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.19.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.19.ebuild,v 1.1 2007/07/29 23:00:10 hollow Exp $
+
+inherit eutils fixheadtails autotools
+
+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}a.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"
+
+# qmail home directory
+QMAIL_HOME="/var/qmail"
+
+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 "${S}"/cdb/Makefile || die "failed to fix file"
+}
+
+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 /var/vpopmail
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	# install documentation
+	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
+		einfo "Installing vpopmail mysql configuration file"
+		dodir /etc
+		# config file position
+		mv "${D}"/var/vpopmail/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf /var/vpopmail/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() {
+	einfo "Performing post-installation routines for ${P}"
+
+	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"
+	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 "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."
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+}