version bump - bug #346835

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

3 files changed, 252 insertions, 8 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index f82948332e7a..236e2319b037 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.101 2011/05/15 10:13:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.102 2011/07/27 09:41:53 eras Exp $
+
+*vpopmail-5.4.33 (27 Jul 2011)
+
+  27 Jul 2011; Eray Aslan <eras@gentoo.org> +vpopmail-5.4.33.ebuild:
+  version bump - bug #346835
 
   15 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
   vpopmail-5.4.30-r2.ebuild:
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 1e573cb3513a..927522703d1b 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 99vpopmail 64 RMD160 c5587e2065da076bdd33c5b97139029936a26637 SHA1 5bc3f3ae1938c9951d0003b47d04154996596f25 SHA256 63468f27aa1a588482b843d899d98eaeda2b4152d28b8d120dcdf8d3610532a4
 AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac
@@ -8,17 +8,27 @@ AUX vpopmail-double-free.patch 411 RMD160 82594d0ae6618411227fafa136fcedd83b328d
 AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4
 DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA1 59d158f0e6b9516f242085101a144597fc8bf296 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a
 DIST vpopmail-5.4.30.tar.gz 609358 RMD160 83fa5b43e146719953fb16da5b7d0a3780f8f94b SHA1 419f4dc8cc6577a43aa42f67a68f418e5b415adb SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc
+DIST vpopmail-5.4.33.tar.gz 612271 RMD160 d064f1a53e7cbe41c87af790ab2dee2d406df7b2 SHA1 1fd185321c5460458683ab7acfc104420b213e2d SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4
 EBUILD vpopmail-5.4.16.ebuild 7578 RMD160 7541f90ccc8f24e7ed50d67f0c7f64c148296063 SHA1 4a9caded00f83d85dcbbec4d6e4d9cc390884273 SHA256 446d852b65028132f03477f7b4856769017ca90e4193f15bcdf8a34f9b8f54a0
 EBUILD vpopmail-5.4.30-r1.ebuild 7223 RMD160 f259a46d87aaa25a6530b6be28a7da8d895ce40b SHA1 9fda6c094eda6d85b36d2979c2a727dc7e858963 SHA256 649f14ccca8a66dceb13f27df4acfa4dd7e7ccb1f009716ca2ed008e4b1ee415
 EBUILD vpopmail-5.4.30-r2.ebuild 7324 RMD160 615b37cd3af0049d40636a11a79f21bdaef68a73 SHA1 8c14bb5d42ebe14c25a61fe24c3daa7357a8f146 SHA256 ac748c1eb9fdbf5cf165a18afa26c1cdd70daab16d87dbf5a7a70b78f17aa45d
-MISC ChangeLog 15765 RMD160 4baf56e38f2406f1ba8240b0b9a24f5aca8a0acb SHA1 24ba7f55323215f0899d1af9870e48e3a851dc2a SHA256 c45d5ea1596fa773225ac2b186076fd7249489cda7cfaa855d60a75dda019db9
+EBUILD vpopmail-5.4.33.ebuild 7227 RMD160 a73b54bef86600eb4bcbf9a4f6966ffa61fd131e SHA1 2e4a5c724e8a6d90ea5da6c3cb185005f50088aa SHA256 36993c40536bb9eee1eb1410aefcf413557972c4238d09429ac25cb7afce8704
+MISC ChangeLog 15890 RMD160 d62a5417ad4c957a825f81f20024d95f0266fc0c SHA1 ccc38896f54d195c3756ac20fe3a9f19ee596773 SHA256 b6744a8e6dcd249f7a119d979889b75f47311515042f58f2a7d3202d8ba32b5e
 MISC metadata.xml 517 RMD160 3ac125856ecc0b4a40da3121250fe0ae5e6d74c8 SHA1 2f0e78d2e5e00498860b9d72bdb4b66883370c55 SHA256 d651b3c6eb2a45f76ffd4546a77248df9f5750e9acd14b4896d3cac0bec65c88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk3Pp0AACgkQIiMqcbOVdxRYBwP/dfDY+sD7luPc2/bD/yhz9P4j
-+GoohkPFiqZ2NEHWe4ZJa1BrvF+kfaJ0M66oe3HvQMXxRyfa6WA27mKzbhxnsxPw
-fihqlpkpeRBDzL0LetKAiZLmeoC2sTYSI26fyzPndhLw6TLvR++2G0x4aYmz6th/
-lXsBytYOWVTr/AxczLg=
-=wlGs
+iQIcBAEBCAAGBQJOL93aAAoJEHfx8XVYajsfJ50QAKAzwN7jrhrmv/AdZij2o/SK
+403+eyFYZ1SXwykoGmgoiVp/w2IxXE+qE0WeddL4mmbNC1vNr95MSdSvehKJPn9H
+tvr/8A+5FWNjiycBlJpq+kyeHQiglqTcn2fVGR6fpiyUKiGcGDwYCmUG0CeN5YyJ
+20OSBZuVsEr7XFLY0I0g2drP6mKbmJI+pbF1eBDBVhvmPReeFnTyCb+7QB9oTWHW
+6j6/iYPYbqGHVnKHcLqr8vzw6k9KPRrhTxBsgu99w15b6yGwmPiXoKN5FBMjt3x1
+P1FPruOLJ6dKuffkQ+7fH7yJk4RinO0juTwAAsgd/m85ARyhHbgyh6Xi44fYoE5Y
++kEnyxoOlCYxW9yEDoWyUcQRgvVq/ulM07px3uYvE3CWfVVPLP9Rf4R2uAtLwHDn
+QgGhdKjS1AJ5TeBTSECa+zqeqkbR3BPm52lGHk9aX4qQg3qQHLx9HKtkUSB1fVpV
+blFkNvBNdX6PDwBNH3OVrwK/jd/vWCuM3T3kOWROPhEw+6v/X0JDBbs5WFAkUGBL
+J8Syo10Y0gnOMaFSjkQI47SAzqeQ5Jq3yw5EwS6NJZUfrGGv8da5KiUok+h3mLTW
+EuYIKSnsVa4OCODF26ssXWGLt6mcPBcl0+1gwJcMOak6MF7fQW8FeU7CjO8N2QDY
+XdMRNPfPKrAy9vfSrsO8
+=2PH/
 -----END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
new file mode 100644
index 000000000000..d06a720733ef
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.1 2011/07/27 09:41:53 eras Exp $
+
+EAPI=4
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql spamassassin"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+	spamassassin? ( mail-filter/spamassassin )"
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.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_configure() {
+	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) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	# bug #277764
+	emake -j1 DESTDIR="${D}" install
+	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
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	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
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}