revision bump, security fix wrt bug #132674

Package-Manager: portage-2.1_pre10-r3

4 files changed, 294 insertions, 13 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index bdc9fb649401..53abd4cef5f8 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.68 2006/02/20 22:12:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.69 2006/05/08 22:12:27 anarchy Exp $
+
+*vpopmail-5.4.16 (08 May 2006)
+
+  08 May 2006; Jory A. Pratt <anarchy@gentoo.org> +vpopmail-5.4.16.ebuild:
+  revision bump, plus security fix wrt bug #132674
 
   20 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
   vpopmail-5.4.6-r1.ebuild, -vpopmail-5.4.9-r2.ebuild,
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index b8a795b610a5..97821f3ea616 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,48 +1,72 @@
-MD5 10a14bb5ef47419f26931c2e7d9489f8 ChangeLog 11155
-RMD160 bc9a96f8fbe730559a0515a2e2f40c62111070f7 ChangeLog 11155
-SHA256 061477cecb233b92501dcb942b5a8ec3bd45d4c7a6ed438278bbc51267360b73 ChangeLog 11155
+AUX 99vpopmail 86 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b SHA1 843a382c9e985dceef6e0e4fbe04a5d7c30c42e2 SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1 size 86
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
 RMD160 2ede3f28e75f950c46fda8b43242b3d9c9d1c55b files/99vpopmail 86
 SHA256 15c0f4c42f654492e7d41772974d91e140626fcf8670d7540fc10d608209e9a1 files/99vpopmail 86
-MD5 932b241ee21fdbe7601622592f4ef78e files/digest-vpopmail-5.4.13 67
-RMD160 14d71cc443859c32f3da2075f1ac07dff8923d18 files/digest-vpopmail-5.4.13 67
-SHA256 46028a7ff539e79893ab1380fedc70230511ce7b4aa047f5ce11d7165e4a2c84 files/digest-vpopmail-5.4.13 67
-MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
-RMD160 b62d4d25e6e17e35c2ba8c9f195f0a3c13887639 files/digest-vpopmail-5.4.6-r1 66
-SHA256 cd24dd0a5a7f00b6271dc153b9afd47e00b1c2c86b682bd43bb76e77f1393a86 files/digest-vpopmail-5.4.6-r1 66
+AUX vpopmail-5.2.1-showall.patch 754 RMD160 0ea48a7243b3536692cd8432f00430d7de8904e9 SHA1 c5d3b134407b2b4c41713af77289aef34a7ad2ac SHA256 fe0e2b78b721415b5c95b944902dbaf5f214bf01c9237fb6359429fe3a4276f9 size 754
 MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
 RMD160 0ea48a7243b3536692cd8432f00430d7de8904e9 files/vpopmail-5.2.1-showall.patch 754
 SHA256 fe0e2b78b721415b5c95b944902dbaf5f214bf01c9237fb6359429fe3a4276f9 files/vpopmail-5.2.1-showall.patch 754
+AUX vpopmail-5.4.6-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac size 918
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 files/vpopmail-5.4.6-access.violation.patch 918
 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac files/vpopmail-5.4.6-access.violation.patch 918
+AUX vpopmail-5.4.9-access.violation.patch 918 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 SHA1 d8cee61fc06de279e87eb402ba404190683c5303 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac size 918
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
 RMD160 5516adfc50adf66754d41ad4de67c3d8b7f78042 files/vpopmail-5.4.9-access.violation.patch 918
 SHA256 cf6840d7dc6131969ef5a69b1d520a5d01d7414e1638a0eeebd12c5689f380ac files/vpopmail-5.4.9-access.violation.patch 918
+AUX vpopmail-Maildir-dotmaildir-fix.sh 1480 RMD160 691f03e6a7eee4597ef7615720618bccd2c8439f SHA1 dc5a5e9e2323346bb2687049d9d3a68ac1fec866 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085 size 1480
 MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
 RMD160 691f03e6a7eee4597ef7615720618bccd2c8439f files/vpopmail-Maildir-dotmaildir-fix.sh 1480
 SHA256 de2100c8f56116591870b55f953ae3358c0f65d1920d5acda3c1c00bc5c10085 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
+AUX vpopmail-cdb-Makefile.patch 363 RMD160 9e85433d347f5561495c13189d5a86b4dc569d48 SHA1 b75a9fb15452268dbbb31637e757fdfef181b42a SHA256 7b405a185e9c844faf33b3f0154c52023e8f191556cb085a3651b53dbad43a84 size 363
 MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
 RMD160 9e85433d347f5561495c13189d5a86b4dc569d48 files/vpopmail-cdb-Makefile.patch 363
 SHA256 7b405a185e9c844faf33b3f0154c52023e8f191556cb085a3651b53dbad43a84 files/vpopmail-cdb-Makefile.patch 363
+AUX vpopmail-fPIC.patch 7397 RMD160 111839636b0c46bc5989037e488e40460a458f8e SHA1 64e855a15971f43bab6ec9886a230daa96d6e2c4 SHA256 d63d8f172cc213eabb03704cf55795864291e9bddbee27a845b26db48e36e774 size 7397
 MD5 aa40d1572827d929f64cdcdabb71f437 files/vpopmail-fPIC.patch 7397
 RMD160 111839636b0c46bc5989037e488e40460a458f8e files/vpopmail-fPIC.patch 7397
 SHA256 d63d8f172cc213eabb03704cf55795864291e9bddbee27a845b26db48e36e774 files/vpopmail-fPIC.patch 7397
+AUX vpopmail-lazy.patch 324 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 SHA1 d24b87cc3ae340f23533390eb0cd41cc26922cb7 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4 size 324
 MD5 64f166cd6f9ffc206ab5842a1286b546 files/vpopmail-lazy.patch 324
 RMD160 9c65dfd19ed52cbb8e2e828973dfed9ab1d1cb57 files/vpopmail-lazy.patch 324
 SHA256 aa1f8123433b82cdae554c943c8731359e226c598cea22496fdd63a11ab58fc4 files/vpopmail-lazy.patch 324
+AUX vpopmail.clearopensmtp 235 RMD160 9cb47b507e22f25ed27b56e00593d93724f00625 SHA1 e8e1790c514cea8bc8684ded85325a698d38a0bf SHA256 c98c52414e5fbc6f02b0e146546f464613ac483a2c81e5ee11ee154cdceb8883 size 235
 MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
 RMD160 9cb47b507e22f25ed27b56e00593d93724f00625 files/vpopmail.clearopensmtp 235
 SHA256 c98c52414e5fbc6f02b0e146546f464613ac483a2c81e5ee11ee154cdceb8883 files/vpopmail.clearopensmtp 235
+AUX vpopmail.conf 466 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 SHA1 69f150647054d1b275f75004050e223fd2643034 SHA256 66d50ec6ba176cab96934ebc696d880d2d60d5767e19464cab54f85e54ac421e size 466
 MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
 RMD160 80bc94ab202558ad4ec044810a7ceeb9032eaad3 files/vpopmail.conf 466
 SHA256 66d50ec6ba176cab96934ebc696d880d2d60d5767e19464cab54f85e54ac421e files/vpopmail.conf 466
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+DIST vpopmail-5.4.13.tar.gz 434719 size 434719
+DIST vpopmail-5.4.16.tar.gz 453019 RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a size 453019
+DIST vpopmail-5.4.6.tar.gz 425910 size 425910
+EBUILD vpopmail-5.4.13.ebuild 7707 RMD160 cb5cb000affbd0364451d8ce202ed20d0f191b13 SHA1 3917fed737acc0b9c3d61af6d4188e9998324bf2 SHA256 9aaff4ddee657f6b0468a8e93fffe6d53e328e3cdb39ee98058a781593de62e9 size 7707
 MD5 5f743b714cd7e3127bbe6664be5d5072 vpopmail-5.4.13.ebuild 7707
 RMD160 cb5cb000affbd0364451d8ce202ed20d0f191b13 vpopmail-5.4.13.ebuild 7707
 SHA256 9aaff4ddee657f6b0468a8e93fffe6d53e328e3cdb39ee98058a781593de62e9 vpopmail-5.4.13.ebuild 7707
+EBUILD vpopmail-5.4.16.ebuild 7708 RMD160 cc6b7965c6f5435721620db98d44b82a9a910cfd SHA1 f0657fb4de9d5c107f1ec65b75fcadff68e36430 SHA256 185d5382810d19c50e143583a6a1c7d1c01437c92e2bcf09468f3e79d9618655 size 7708
+MD5 30711fb83bcf5f9fed12c505d3a5dcbd vpopmail-5.4.16.ebuild 7708
+RMD160 cc6b7965c6f5435721620db98d44b82a9a910cfd vpopmail-5.4.16.ebuild 7708
+SHA256 185d5382810d19c50e143583a6a1c7d1c01437c92e2bcf09468f3e79d9618655 vpopmail-5.4.16.ebuild 7708
+EBUILD vpopmail-5.4.6-r1.ebuild 7625 RMD160 8e6212d2a060565dd1fe052bb81f44e02399f92a SHA1 adcbd454d119d313a2d4d6e012b8c6bc3ee39ef6 SHA256 688baff6b8989ee3fa673cd64793215377d24a882238f886fd02f4724ab3cb40 size 7625
 MD5 38131d11a3d3b2311e1d6e02a0d36a7b vpopmail-5.4.6-r1.ebuild 7625
 RMD160 8e6212d2a060565dd1fe052bb81f44e02399f92a vpopmail-5.4.6-r1.ebuild 7625
 SHA256 688baff6b8989ee3fa673cd64793215377d24a882238f886fd02f4724ab3cb40 vpopmail-5.4.6-r1.ebuild 7625
+MISC ChangeLog 11315 RMD160 63e4d626c8e3a7bfca91116cf96b988eb1674ca3 SHA1 b22ecf7abad6b231d87c9609187dea9e5847cbbd SHA256 f842f838903b80033f6edbacbfa26396d161e5d285e4ddd1d0956670f610aadb size 11315
+MD5 4df699865b5666a78fbc4173f9b95e9b ChangeLog 11315
+RMD160 63e4d626c8e3a7bfca91116cf96b988eb1674ca3 ChangeLog 11315
+SHA256 f842f838903b80033f6edbacbfa26396d161e5d285e4ddd1d0956670f610aadb ChangeLog 11315
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 size 161
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MD5 932b241ee21fdbe7601622592f4ef78e files/digest-vpopmail-5.4.13 67
+RMD160 14d71cc443859c32f3da2075f1ac07dff8923d18 files/digest-vpopmail-5.4.13 67
+SHA256 46028a7ff539e79893ab1380fedc70230511ce7b4aa047f5ce11d7165e4a2c84 files/digest-vpopmail-5.4.13 67
+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 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
+RMD160 b62d4d25e6e17e35c2ba8c9f195f0a3c13887639 files/digest-vpopmail-5.4.6-r1 66
+SHA256 cd24dd0a5a7f00b6271dc153b9afd47e00b1c2c86b682bd43bb76e77f1393a86 files/digest-vpopmail-5.4.6-r1 66
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.16 b/net-mail/vpopmail/files/digest-vpopmail-5.4.16
new file mode 100644
index 000000000000..f54a51a8fd7f
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.4.16
@@ -0,0 +1,3 @@
+MD5 7e98f368333c678879e2a3f7686f8ab7 vpopmail-5.4.16.tar.gz 453019
+RMD160 de385ee6dbe0edf7ccb2e88c5b967669711d1e2b vpopmail-5.4.16.tar.gz 453019
+SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a vpopmail-5.4.16.tar.gz 453019
diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
new file mode 100644
index 000000000000..a1852d76e22a
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.16.ebuild,v 1.1 2006/05/08 22:12:27 anarchy Exp $
+
+inherit eutils gnuconfig fixheadtails
+
+# TODO: all ldap, sybase support
+#MY_PV=${PV/_/-}
+#MY_P=${PN}-${MY_PV}
+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 sparc x86"
+IUSE="mysql ipalias clearpasswd"
+# vpopmail will NOT build if non-root.
+RESTRICT="nouserpriv"
+DEPEND_COMMON="virtual/qmail
+	mysql? ( >=dev-db/mysql-3.23 )"
+DEPEND="sys-apps/sed
+	sys-apps/ucspi-tcp
+	${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+	virtual/cron"
+
+# S="${WORKDIR}/${MY_P}"
+
+# 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."
+		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() {
+	# cd ${WORKDIR}
+	# unpack ${MY_P}.tar.gz
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
+	epatch ${FILESDIR}/${PN}-lazy.patch || die "failed to patch."
+
+	sed -i \
+		's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c \
+		|| die "failed to change Maildir to .maildir"
+	sed -i \
+		'/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c \
+		|| die "failed to remove vpopmail advertisement"
+
+	gnuconfig_update
+	aclocal || die "aclocal failed"
+	WANT_AUTOMAKE="1.6" automake --add-missing || die "automake failed."
+	autoconf || die "reconfigure failed."
+	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
+}
+
+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-auth-module=mysql \
+			--enable-libs=/usr/include/mysql \
+			--enable-libdir=/usr/lib/mysql \
+			--enable-sql-logging=y \
+			--enable-auth-logging=y \
+			--enable-valias=y \
+			--enable-mysql-replication=n \
+			--enable-mysql-limits"
+
+	# Bug 20127
+	use clearpasswd \
+		&& myopts="${myopts} --enable-clear-passwd=y" \
+		|| myopts="${myopts} --enable-clear-passwd=n"
+
+	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-logging=y \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
+		|| die
+
+	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
+	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
+	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
+	#--disable-rebuild-tcpserver-file \
+
+	emake || die "Make failed."
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	make DESTDIR=${D} install || die
+	dosed ${VPOP_HOME}/etc/inc_deps
+	dosed ${VPOP_HOME}/etc/lib_deps
+
+	into /var/vpopmail
+	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	# Install documentation.
+	dodoc AUTHORS ChangeLog FAQ INSTALL README*
+	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
+		#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
+
+	# 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:0 ${D}${VPOP_HOME}/{bin,etc,include}
+	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
+	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
+}
+
+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 640 and"
+		einfo "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
+
+	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."
+	echo
+	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	einfo "using net-mail/relay-ctrl instead."
+}