version bump for bug 285213

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 230 insertions, 5 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 74f235ccc458..380591265f5e 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.87 2009/07/14 08:54:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.88 2009/12/29 12:39:36 fauli Exp $
+
+*vpopmail-5.4.30 (29 Dec 2009)
+
+  29 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  +vpopmail-5.4.30.ebuild:
+  version bump for bug 285213
 
   14 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   vpopmail-5.4.26.ebuild:
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index e65d1fea1f92..7ddf9028f94b 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -10,17 +10,19 @@ DIST vpopmail-5.4.19a.tar.gz 489109 RMD160 cc4c952b850bee9c6c10429dca59cce681287
 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
 DIST vpopmail-5.4.26.tar.gz 523930 RMD160 18208ec2336251011786363daa2a55192824358a SHA1 3236c4fb54ab70c262d0678220a58b8579c0baaf SHA256 6212191b045615c1f2cf8ed3bc6c18326ec6547e30962da07455ab2119f58fb2
+DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc
 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
 EBUILD vpopmail-5.4.25.ebuild 6688 RMD160 6a0f9f87c1f270ad269391c1f47bf484bfe40e6a SHA1 c58add7cc36161fe54fc7ed521a9036ede783569 SHA256 dfca35d3cbd4fba5f47b8d56a9b5df35646aa504214ef5b9951b4883d9dbd8d1
 EBUILD vpopmail-5.4.26.ebuild 6711 RMD160 df2b821e809a30a9d489f8f898f911d076841677 SHA1 7fd0987e6e7d1833e9404569258afe5c7250c542 SHA256 fea3b977385e04259f0b14215cd9312eeca581f54f4d072bf26989640e7911eb
-MISC ChangeLog 13985 RMD160 167245d05bbd87e497bbf97502b452dd7bed9d19 SHA1 09ef3970f21c3772f4ec78cdbe5bf1ec65691406 SHA256 19234336cfbaecfc542acfc67ce861c26d7e9b7c784cd802e68dbfb592c5c311
+EBUILD vpopmail-5.4.30.ebuild 6675 RMD160 d02dbe18ccd0e98dd3e673aa87087d8bf0fcb135 SHA1 4a505d104d6e18fc9af91122eb377981bc0b26ae SHA256 15a0f88ab281968fedc2c2c01caa9538d60491ff0c781dc8737b7c8c0c845c6e
+MISC ChangeLog 14126 RMD160 79991769c49968d006e6cffd0247ee2f2e42afb9 SHA1 e6c6285c7f437cd8febf30a1444556a111789f03 SHA256 2ade64525146b7d52cf5fd24bc4276361bfb80676a84c0a147b6894a7acb7a06
 MISC metadata.xml 521 RMD160 dd51013ae2492986d9ad9b9c914b2925584a828d SHA1 37925b11a0227e341757f64c00940e6c4898bab7 SHA256 fd6522671f5e83acd6ba619fea68a05b7c335326ce9c41ea1291041e84155b53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpcR70ACgkQAiZjviIA2XjPoQCfYzjaHXmzJzHbX/KjI4Yuupx3
-cuYAn1MoNhB12jRO2fJihlycWEn6AMXn
-=MMmM
+iEYEARECAAYFAks5+JMACgkQNQqtfCuFneMosQCdHioWP2ckTz5vxIhfTIAyFPdf
+thoAnioFEocMgvp85/UJQoPJAwsC2w9N
+=QQWK
 -----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/vpopmail-5.4.30.ebuild b/net-mail/vpopmail/vpopmail-5.4.30.ebuild
new file mode 100644
index 000000000000..c615d50128b2
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.30.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.30.ebuild,v 1.1 2009/12/29 12:39:36 fauli 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 )"
+RDEPEND="${DEPEND}"
+
+# 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-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-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
+
+	# bug #277764
+	emake -j1 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 doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/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
+}