fix bug #30414 and #30642

4 files changed, 233 insertions, 2 deletions

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index ed1ae9b87acc..fcfdd6746149 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,10 +1,11 @@
 MD5 54d8cbcb10d7ac81e68c84d06c7e04d3 vpopmail-5.2.1-r6.ebuild 6369
-MD5 aba173dce6e3cb59b74599e1e97c05c5 vpopmail-5.2.1-r8.ebuild 6640
+MD5 2fcd5c69e038e951a6dc69744803b152 vpopmail-5.2.1-r8.ebuild 6700
 MD5 b16fa5a653a6018d133f178fc22c2de1 vpopmail-5.2.1-r5.ebuild 6036
-MD5 9bd493be099c8d17db545d797570b96d ChangeLog 3584
+MD5 8958715ab5a460d3927f833558a1e6a1 ChangeLog 3726
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 8158bcd4a71afee2a936bf6f67288592 vpopmail-5.2.1-r7.ebuild 6369
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
+MD5 ceafe640132b1326bbc71949e8bccd1c files/vpopmail-5.2.1-gcc33mysql.diff 554
 MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
 MD5 d388c60820d1ce87e90cbc46a89c6a77 files/digest-vpopmail-5.2.1-r5 327
 MD5 61705fcd13006df869646877d966fac8 files/digest-vpopmail-5.2.1-r6 134
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8
new file mode 100644
index 000000000000..a6a45f2be1e6
--- /dev/null
+++ b/net-mail/vpopmail/files/digest-vpopmail-5.2.1-r8
@@ -0,0 +1,2 @@
+MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
+MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff b/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff
new file mode 100644
index 000000000000..cfbd1cddf53b
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.2.1-gcc33mysql.diff
@@ -0,0 +1,17 @@
+diff -ur vpopmail-5.2.1.orig/vmysql.h vpopmail-5.2.1/vmysql.h
+--- vpopmail-5.2.1.orig/vmysql.h	2003-10-08 15:14:24.000000000 -0700
++++ vpopmail-5.2.1/vmysql.h	2003-10-08 15:23:03.000000000 -0700
+@@ -77,11 +77,11 @@
+ primary key (pw_name, pw_domain ) "
+ #else
+ #define TABLE_LAYOUT "pw_name char(32) not null, \
+-pw_domain char(64) not null, 
++pw_domain char(64) not null, \
+ pw_passwd char(40), \
+ pw_uid int, pw_gid int, \
+ pw_gecos char(48), \
+-pw_dir char(160), 
++pw_dir char(160), \
+ pw_shell char(20), \
+ primary key (pw_name, pw_domain ) "
+ #endif
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
new file mode 100644
index 000000000000..4824dd7c3064
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.1 2003/10/08 22:26:49 robbat2 Exp $
+
+IUSE="mysql ipalias clearpasswd"
+
+inherit eutils
+
+# TODO: all ldap, sybase support
+HOMEPAGE="http://www.inter7.com/vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
+SRC_URI="http://www.inter7.com/${PN}/${P}.tar.gz
+	mysql? ( http://gentoo.twobit.net/misc/${P}-mysql.diff )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc"
+DEPEND_COMMON="net-mail/qmail
+	mysql? ( >=dev-db/mysql-3.23* )"
+DEPEND="sys-apps/sed
+		sys-apps/ucspi-tcp
+		${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+	 	 virtual/cron"
+
+# 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."
+		sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	if [ -z `getent group vpopmail` ]; then
+		(groupadd -g 89 vpopmail 2>/dev/null || groupadd vpopmail ) || die "problem adding vpopmail group"
+	fi
+	if [ -z `getent passwd vpopmail` ]; then
+		useradd -g vpopmail -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
+		useradd -g vpopmail -u `getent group vpopmail | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
+		-s /bin/false -m vpopmail || die "problem adding vpopmail user"
+	fi
+}
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
+
+	if use mysql; then
+		einfo "Applying MySQL patch..."
+		# Thanks to Nicholas Jones (carpaski@gentoo.org)
+		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
+		# gcc3.3 fix
+		epatch ${FILESDIR}/vpopmail-5.2.1-gcc33mysql.diff
+	fi
+
+	# Thanks to Vadim Berezniker (vadim@berezniker.com)
+	# This patch backports a bug fix from the devel version re: logons
+	epatch ${FILESDIR}/vpopmail.diff
+}
+
+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-mysql=y \
+			--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" \
+		|| myopts="${myopts} --enable-mysql=n"
+
+	# the configure script tries to force root and make directories not using ${D}
+	sed -e '1282,1289d' -e '1560,1567d' -e '2349d' -e '2107d' -e '2342d' configure > configure.new
+	mv --force configure.new configure
+	chmod u+x configure
+
+	# 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-defaultquota=30000000,1000C \
+		--enable-roaming-users=y --enable-relay-clear-minutes=60 \
+		--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
+		--enable-logging=y \
+		--enable-log-name=vpopmail
+
+	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
+
+	emake || die "Make failed."
+}
+
+src_install () {
+	vpopmail_set_homedir
+
+	make DESTDIR=${D} install-strip || die
+
+	# Install documentation.
+	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO
+	dodoc README README.* RELEASE.NOTES UPGRADE.*
+	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
+		insinto /etc
+		doins ${FILESDIR}/vpopmail.conf
+		fowners vpopmail:vpopmail /etc/vpopmail.conf
+		fperms 600 /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
+}
+
+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 600 and"
+		einfo "owned by vpopmail:vpopmail"
+	fi
+	# do this for good measure
+	if [ -e /etc/vpopmail.conf ]; then
+		chmod 600 /etc/vpopmail.conf
+		chown vpopmail:vpopmail /etc/vpopmail.conf
+	fi
+}
+
+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."
+}