Version bumped

4 files changed, 175 insertions, 6 deletions

diff --git a/net-mail/popa3d/ChangeLog b/net-mail/popa3d/ChangeLog
index 72a2c6d354c3..d9414e3dfe90 100644
--- a/net-mail/popa3d/ChangeLog
+++ b/net-mail/popa3d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/popa3d
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.9 2004/07/15 02:05:53 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.10 2004/07/28 16:00:10 port001 Exp $
+
+*popa3d-0.6.4.1 (28 Jul 2004)
+
+  28 Jul 2004; Ian Leitch <port001@gentoo.org> +popa3d-0.6.4.1.ebuild:
+  Version bumped
 
   14 Jul 2004; Jason Wever <weeve@gentoo.org> popa3d-0.6.4.ebuild:
   Added ~sparc keyword, resolves bug #57102.
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index 155032f509ec..c7a232361e48 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -1,8 +1,10 @@
-MD5 d1a9a996479145ae390146dbcd677d5d ChangeLog 1799
-MD5 dbb40cd6b37794fccc9251f434aa99ce metadata.xml 425
-MD5 2318688e965373c0d793120909fd1fce popa3d-0.6.3.ebuild 4284
+MD5 e5c60fce56abcd1cf8309ae2889950f7 popa3d-0.6.4.1.ebuild 4299
 MD5 4c75ab6c9b9af837c2fa1e477c29711a popa3d-0.6.4.ebuild 4301
-MD5 a39dff3e063ffd11e322158dc3b18523 files/digest-popa3d-0.6.3 201
-MD5 2e722f7560b3b3fc07a8853ec869b8c2 files/digest-popa3d-0.6.4 201
+MD5 2318688e965373c0d793120909fd1fce popa3d-0.6.3.ebuild 4284
+MD5 fa3e793450e8665f0238698bbe0a3a17 ChangeLog 1922
+MD5 dbb40cd6b37794fccc9251f434aa99ce metadata.xml 425
 MD5 6e6b9368bd2cafab8d90bde76f5011b7 files/pam 136
 MD5 d7e80b35c6a318d497f9fc4e538e0429 files/popa3d-initrc 479
+MD5 a39dff3e063ffd11e322158dc3b18523 files/digest-popa3d-0.6.3 201
+MD5 2e722f7560b3b3fc07a8853ec869b8c2 files/digest-popa3d-0.6.4 201
+MD5 309ea38c54e2c8653d224cbf72036dd6 files/digest-popa3d-0.6.4.1 203
diff --git a/net-mail/popa3d/files/digest-popa3d-0.6.4.1 b/net-mail/popa3d/files/digest-popa3d-0.6.4.1
new file mode 100644
index 000000000000..a91bd2036052
--- /dev/null
+++ b/net-mail/popa3d/files/digest-popa3d-0.6.4.1
@@ -0,0 +1,3 @@
+MD5 5e352b7eebe59f184ce0b0c4c9731c89 popa3d-0.6.4.1.tar.gz 32061
+MD5 e0f3bc79b0fb6b91bb60957448ad419f popa3d-0.6.3-vname-2.diff 2128
+MD5 3f44bf9519c20afa98ea0dffb30300ed popa3d-0.5.9-maildir-2.diff 9978
diff --git a/net-mail/popa3d/popa3d-0.6.4.1.ebuild b/net-mail/popa3d/popa3d-0.6.4.1.ebuild
new file mode 100644
index 000000000000..efdb8f08e36c
--- /dev/null
+++ b/net-mail/popa3d/popa3d-0.6.4.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.1.ebuild,v 1.1 2004/07/28 16:00:10 port001 Exp $
+
+inherit eutils
+
+#
+# Mailbox format is determined by the 'mbox' and 'maildir'
+# system USE flags.
+#
+# Mailbox path configuration denoted by the system USE
+# flags.
+#
+# USE flag 'maildir' denotes ~/.maildir
+# USE flag 'mbox' denotes /var/mail/username
+#
+# You can overwrite this by setting the POPA3D_HOME_MAILBOX
+# environmental variable (see below) before emerge.
+#
+# Environmental variables.
+#
+# POPA3D_HOME_MAILBOX
+#
+# Overwrite the local user mailbox path. For example
+# if you want qmail-styled ~/Mailbox you can set it
+# to "Mailbox". For the traditional (although not in
+# gentoo Maildir) set it to "Maildir".
+# 
+# POPA3D_VIRTUAL_ONLY
+#
+# Set this field to "YES" if you dont want local users
+# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
+# variable effectively useless.
+#
+# POPA3D_VIRTUAL_HOME_PATH
+#
+# Set this field to the base virtual home path. For more information
+# read the virtual guide here: http://forums.gentoo.org/viewtopic.php?t=82386
+# 
+
+IUSE="pam mbox maildir"
+
+DESCRIPTION="A security oriented POP3 server."
+HOMEPAGE="http://www.openwall.com/popa3d/"
+
+SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz
+		 http://www.data.is/~hhg/popa3d/popa3d-0.6.3-vname-2.diff
+		 maildir? ( http://www.data.is/~hhg/popa3d/popa3d-0.5.9-maildir-2.diff )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=">=sys-apps/sed-4
+		pam? ( >=sys-libs/pam-0.72 )"
+
+pkg_setup() {
+	if use mbox && use maildir ; then
+		echo
+		eerror
+		eerror "You must choose between mbox or maildir,"
+		eerror "both cannot be used together."
+		eerror
+		die "Both mbox and maildir specified."
+	fi
+
+	echo
+	ewarn
+	ewarn "You can customize this ebuild with environmental variables."
+	ewarn "If you don't set any I'll assume sensible defaults."
+	ewarn
+	ewarn "See inside this ebuild for details."
+	ewarn
+	echo
+	sleep 5
+
+	if ! grep -q ^popa3d: /etc/group ; then
+		groupadd popa3d || die "Failed to add group: popa3d"
+	fi
+
+	if ! grep -q ^popa3d: /etc/passwd ; then
+		useradd -g popa3d -d /dev/null -s /dev/null popa3d || die "Failed to add user: popa3d"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+src_compile() {
+	cd ${S}
+
+	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff
+
+	if use maildir ; then
+		einfo "Mailbox format is: MAILDIR."
+		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
+		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
+			POPA3D_HOME_MAILBOX=".maildir"
+		fi
+	else
+		einfo "Mailbox format is: MAILBOX."
+	fi
+
+	if [ "${POPA3D_HOME_MAILBOX}" != "" ] ; then
+		einfo "Mailbox path: ~/$POPA3D_HOME_MAILBOX"
+		sleep 2
+		sed -i -e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" params.h
+		sed -i -e "s:^#define HOME_MAILBOX_NAME.*$:#define HOME_MAILBOX_NAME \"${POPA3D_HOME_MAILBOX}\":" params.h
+	else
+		einfo "Mailbox path: /var/mail/username"
+	fi
+
+	if [ "${POPA3D_VIRTUAL_ONLY}" = "YES" ] ; then
+		einfo "Virtual only, no local system users"
+		sed -i -e "s:^#define VIRTUAL_ONLY.*$:#define VIRTUAL_ONLY 1:" params.h
+	fi
+
+	if [ "${POPA3D_VIRTUAL_HOME_PATH}" != "" ] ; then
+		einfo "Virtual home path set to: $POPA3D_VIRTUAL_HOME_PATH"
+		sed -i -e "s:^#define VIRTUAL_HOME_PATH.*$:#define VIRTUAL_HOME_PATH \"$POPA3D_VIRTUAL_HOME_PATH\":" params.h
+	fi
+
+	if [ "$POPA3D_VIRTUAL_ONLY" = "YES" ] ; then
+		einfo "Authentication method: Virtual."
+	elif use pam ; then
+		einfo "Authentication method: PAM."
+		LIBS="${LIBS} -lpam"
+		sed -i -e "s:^#define AUTH_SHADOW\t\t\t1$:#define AUTH_SHADOW\t\t\t0:" params.h
+		sed -i -e "s:^#define AUTH_PAM\t\t\t0$:#define AUTH_PAM\t\t\t1:" params.h
+	else
+		einfo "Authentication method: Shadow."
+	fi
+
+	sed -i -e "s:^#define POP_STANDALONE.*$:#define POP_STANDALONE 1:" params.h
+	sed -i -e "s:^#define POP_VIRTUAL.*$:#define POP_VIRTUAL 1:" params.h
+	sed -i -e "s:^#define VIRTUAL_VNAME.*$:#define VIRTUAL_VNAME 1:" params.h
+
+	emake LIBS="${LIBS} -lcrypt" || die "emake failed"
+}
+
+src_install() {
+	into /usr
+
+	dosbin popa3d
+	doman popa3d.8
+	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
+
+	diropts -m 755
+	dodir /var/empty
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/popa3d-initrc popa3d
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/pam popa3d
+	fi
+}