make it actually work. *grumble*.

4 files changed, 255 insertions, 11 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index add1652bf35a..9347714ed6ac 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.41 2004/08/21 20:34:27 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.42 2004/08/22 02:03:36 robbat2 Exp $
+
+*vpopmail-5.4.6-r1 (21 Aug 2004)
+
+  21 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +vpopmail-5.4.6-r1.ebuild:
+  make it actually work. *grumble*.
 
   21 Aug 2004; Tuan Van <langthang@gentoo.org> vpopmail-5.4.6.ebuild:
   stable on x86 wrt bug #60844.
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 8f159ddd6fd8..bb5a338b78b6 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5867b54ad82fc3de202fa5cb7afccca2 vpopmail-5.2.2-r1.ebuild 7487
 MD5 0f45c195f993f33c78c2a6d98108a3c8 vpopmail-5.4.0.ebuild 7429
 MD5 a6fbf86e82e7039d4256fdd6c1a38bcb vpopmail-5.4.0-r1.ebuild 7410
 MD5 98eb520388c505ec8e99f8fdf5f33d3a vpopmail-5.2.1-r9.ebuild 7567
 MD5 39aa2505d0a7cf2d02650d8cdf4b187c vpopmail-5.2.1-r6.ebuild 6380
 MD5 3886587ecb82bfa71669f27a2880f8f5 vpopmail-5.2.1-r8.ebuild 6724
+MD5 d3547dcb15552da06bbfa9634a3ec285 vpopmail-5.4.6-r1.ebuild 7566
 MD5 0bc96064a9872b49c094b93f24e9f909 vpopmail-5.4.0_rc1.ebuild 8362
 MD5 9cb9f545f72335fc7ba8402d9c616d01 vpopmail-5.4.6.ebuild 7499
 MD5 5c75d54e8924b414cba1dda30a7181e4 vpopmail-5.2.1-r5.ebuild 6062
@@ -29,13 +27,7 @@ MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r8 134
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r9 134
 MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2-r1 134
 MD5 d3296e78f37859945cfe766afb969dc2 files/digest-vpopmail-5.4.0-r1 134
+MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
 MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
 MD5 9aeca181f86314f09d9cfe99ebe8b7d0 files/vpopmail.diff 2101
 MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBJ7UD5FrxP71izLARApBGAKDYMmyZgxcNKPHNRmtvrAtv7ZKLagCghqfv
-ekpCfWdnCxlJAT28wnXRq7g=
-=76+b
------END PGP SIGNATURE-----
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1 b/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1
new file mode 100644
index 000000000000..771391da70a4
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.4.6-r1
@@ -0,0 +1 @@
+MD5 2db38c521b5fad4d76868d2582a72221 vpopmail-5.4.6.tar.gz 425910
diff --git a/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
new file mode 100644
index 000000000000..204f5dfdf4f9
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.6-r1.ebuild,v 1.1 2004/08/22 02:03:36 robbat2 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 or Postfix mail servers."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#	mysql? ( http://gentoo.twobit.net/misc/${PN}-5.2.1-mysql.diff )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~amd64 ppc"
+IUSE="mysql ipalias clearpasswd"
+# vpopmail will NOT build if non-root.
+RESTRICT="nouserpriv"
+DEPEND_COMMON="mail-mta/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 /bin/false ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_unpack() {
+	# cd ${WORKDIR}
+	# unpack ${MY_P}.tar.gz
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/vpopmail-5.2.1-showall.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
+	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-sqllibdir=/usr/lib/mysql \
+			--enable-mysql-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 \
+		--enable-domainquotas \
+		--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:root ${D}${VPOP_HOME}/{bin,etc,include}
+}
+
+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."
+}