Updates to vpopmail. Still masked.

4 files changed, 12 insertions, 157 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 244cc05176a9..51a11709423d 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,15 +1,15 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.2 2002/07/26 09:38:47 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.3 2002/07/26 11:09:41 carpaski Exp $
 
 *vpopmail-5.2.1 (24 Jul 2002)
 
   26 Feb 2002; Nicholas Jones <carpaski@gentoo.org> vpopmail-5.2.1-r2 :
 
   Revised -r1 submitted via consortium of Patrick Naubert and Maurizio
-	Disimino to fix the library data and sandbox issues.
+  Disimino to fix the library data and sandbox issues.
 	
-	Added homedir-via-passwd-homedir capability. Moved some code around.
+  Added homedir-via-passwd-homedir capability. Moved some code around.
   
 *vpopmail-5.2.1 (24 Jul 2002)
 
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.2.1 b/net-mail/vpopmail/files/digest-vpopmail-5.2.1
deleted file mode 100644
index a6a45f2be1e6..000000000000
--- a/net-mail/vpopmail/files/digest-vpopmail-5.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e299a467db955c95c2966c7aa0ef6e5 vpopmail-5.2.1.tar.gz 273353
-MD5 9d12d36935643050617a76c5104c4d28 vpopmail-5.2.1-mysql.diff 5211
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild
index ee093198da88..4e274ecf56c3 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild,v 1.1 2002/07/26 09:38:47 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r2.ebuild,v 1.2 2002/07/26 11:09:41 carpaski Exp $
 
 # TODO: all ldap, sybase support
 S=${WORKDIR}/${P}
@@ -27,10 +27,10 @@ VPOP_DEFAULT_HOME="/var/vpopmail"
 VPOP_HOME="$VPOP_DEFAULT_HOME"
 
 vpopmail_set_homedir() {
-	VPOP_HOME=`grep vchkpw /etc/passwd | cut -d: -f6`
+	VPOP_HOME=`grep vpopmail /etc/passwd | cut -d: -f6`
 	if [ -z "$VPOP_HOME" ]; then
 		echo -ne "\a"
-	  eerror "vchkpw's home directory is null in /etc/passwd"
+	  eerror "vpopmail's home directory is null in /etc/passwd"
 	  eerror "You probably want to check that out."
 		eerror "Continuing with default."
 		sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
@@ -41,12 +41,12 @@ vpopmail_set_homedir() {
 }
 
 pkg_setup() {
-	if [ -z `getent group vchkpw` ]; then
-		(groupadd -g 89 vchkpw 2>/dev/null || groupadd vchkpw ) || die "problem adding vchkpw group"
+	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 vchkpw -u 89 -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vchkpw -u `getent group vchkpw | awk -F":" '{ print $3 }'` -d ${VPOP_DEFAULT_HOME} -c "vpopmail_directory" \
+		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
 }
@@ -90,7 +90,7 @@ src_compile() {
 		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
 		--enable-vpopuser=vpopmail \
 		--enable-many-domains=y \
-		--enable-vpopgroup=vchkpw \
+		--enable-vpopgroup=vpopmail \
 		--enable-file-locking=y \
 		--enable-file-sync=y \
 		--enable-md5-passwords=y \
@@ -118,7 +118,7 @@ src_install () {
 	dodoc doc/doc_html/* doc/man_html/*
 	rm -rf ${D}/${VPOP_HOME}/doc
 	dosym /usr/share/doc/${P}-r1/ ${VPOP_HOME}/doc
-	chown vpopmail.vchkpw ${D}/${VPOP_HOME}/doc
+	chown vpopmail.vpopmail ${D}/${VPOP_HOME}/doc
 
 	# Create symlink in /usr/bin for executables
 	mkdir -p ${D}/usr/bin/
diff --git a/net-mail/vpopmail/vpopmail-5.2.1.ebuild b/net-mail/vpopmail/vpopmail-5.2.1.ebuild
deleted file mode 100644
index debc6cb64c34..000000000000
--- a/net-mail/vpopmail/vpopmail-5.2.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1.ebuild,v 1.1 2002/07/24 10:49:23 carpaski Exp $
-
-# TODO: all ldap, sybase support
-S=${WORKDIR}/${P}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-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/vpopmail/${P}.tar.gz
-	http://gentoo.twobit.net/misc/vpopmail-5.2.1-mysql.diff"
-
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	mysql? ( =dev-db/mysql-3.23* )"
-
-RDEPEND="net-mail/qmail
-	virtual/cron
-	mysql? ( =dev-db/mysql-3.23* )"
-
-pkg_setup() {
-	if [ -z `getent group vchkpw` ]; then
-		(groupadd -g 89 vchkpw 2>/dev/null || groupadd vchkpw ) || die "problem adding vchkpw group"
-	fi    
-	if [ -z `getent passwd vpopmail` ]; then
-		( useradd -g vchkpw -u 89 -d /var/vpopmail -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		 useradd -g vchkpw -u `getent group vchkpw | awk -F":" '{ print $3 }'` -d /var/vpopmail -c "vpopmail_directory" \
-		 -s /bin/false -m vpopmail) || die "problem adding vpopmail user"
-	fi
-
-}
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	if [ "`use mysql`" ]; then
-		einfo "Applying MySQL patch..."
-	# Thanks to Nicholas Jones (carpaski@gentoo.org)
-		patch < ${DISTDIR}/vpopmail-5.2.1-mysql.diff
-	fi
-}
-
-src_compile() {
-
-	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"
-
-	econf ${myopts} --sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=/var/vpopmail/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=vchkpw \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-clear-passwd=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 || die "./configure failed"
-
-	if [ "`use mysql`" ]; then
-		echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
-	fi
-
-	emake || die "Make failed."
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install-strip || die
-	touch ${D}/var/vpopmail/domains/.keep
-	# Install documentation.
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL NEWS TODO README README.* RELEASE.NOTES UPGRADE.*
-
-	# Create symlink in /usr/bin for executables
-	mkdir -p ${D}/usr/bin/
-	for item in `ls -1 ${D}/var/vpopmail/bin`; do dosym /var/vpopmail/bin/${item} usr/bin/${item} ; done
-
-	# Create /etc/vpopmail.conf
-	[ "`use mysql`" ] && mkdir ${D}/etc && cp ${FILESDIR}/vpopmail.conf ${D}/etc/
-
-}
-
-pkg_postinst() {
-
-	einfo "Performing post-installation routines for ${P}."
-	echo "40 * * * * /usr/bin/clearopensmtp 2>&1 > /dev/null" >> /var/spool/cron/crontabs/root
-
-	# This is to let users to to their binary pkg. this is a workaround until portage will handle this in a better way
-	if [ -z `getent group vchkpw` ]; then
-		(groupadd -g 89 vchkpw 2>/dev/null || groupadd vchkpw ) || die "problem adding vchkpw group"
-	fi
-	if [ -z `getent passwd vpopmail` ]; then
-		( useradd -g vchkpw -u 89 -d /var/vpopmail -c "vpopmail_directory" -s /bin/false -m vpopmail || \
-		useradd -g vchkpw -u `getent group vchkpw | awk -F":" '{ print $3 }'` -d /var/vpopmail -c "vpopmail_directory" \
-		-s /bin/false -m vpopmail) || die "problem adding vpopmail user"
-	fi
-
-if [ "`use mysql`" ]; then
-
-	einfo ""
-	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"
-	einfo ""
-	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;"
-	einfo ""
-fi
-
-}
-
-pkg_postrm() {
-	sed "/^40.*\/usr\/bin\/clearopensmtp.*null$/d" /var/spool/cron/crontabs/root > /var/spool/cron/crontabs/root.new
-	mv --force /var/spool/cron/crontabs/root.new /var/spool/cron/crontabs/root
-	einfo "The vpopmail DATA will NOT be removed automatically."
-	einfo "You can delete them manually by removing the /var/vpopmail directory."
-}