Fixed up to comply with bug #79240. Stable on x86. Cleaned out old versions.#

(Portage version: 2.0.51-r15)

9 files changed, 35 insertions, 343 deletions

diff --git a/net-mail/popa3d/ChangeLog b/net-mail/popa3d/ChangeLog
index 44773b9baebc..0b04a19f6357 100644
--- a/net-mail/popa3d/ChangeLog
+++ b/net-mail/popa3d/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2004/11/06 18:48:13 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.14 2005/02/24 17:26:15 port001 Exp $
+
+*popa3d-0.6.4.1-r1 (24 Feb 2005)
+
+  24 Feb 2005; <port001@gentoo.org> -files/pam, -popa3d-0.6.3.ebuild,
+  +popa3d-0.6.4.1-r1.ebuild, -popa3d-0.6.4.1.ebuild, -popa3d-0.6.4.ebuild:
+  Fixed up to comply with bug #79240. Stable on x86. Cleaned out old versions.
 
   06 Nov 2004; Jason Wever <weeve@gentoo.org> popa3d-0.6.4.1.ebuild:
   Added ~sparc keyword to 0.6.4.1 as it wasn't carried over in the version bump.
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index 2f5dd189fc56..ef3492f48cd0 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -1,10 +1,12 @@
+MD5 f7f325d55120a414875f3e1703bee8a1 popa3d-0.6.4.1-r1.ebuild 4633
+MD5 b976da7d114b8a409206b6850d72f036 popa3d-0.6.4.1.ebuild 4311
+MD5 502f6b64dad9109c858b94bba710445e popa3d-0.6.4.ebuild 4305
+MD5 ea3321c609c3c0452d40ea3984d26004 popa3d-0.6.3.ebuild 4285
 MD5 2c820aa61321b3fcd8f08eeb85ad3113 ChangeLog 2322
 MD5 dbb40cd6b37794fccc9251f434aa99ce metadata.xml 425
-MD5 ea3321c609c3c0452d40ea3984d26004 popa3d-0.6.3.ebuild 4285
-MD5 502f6b64dad9109c858b94bba710445e popa3d-0.6.4.ebuild 4305
-MD5 b976da7d114b8a409206b6850d72f036 popa3d-0.6.4.1.ebuild 4311
-MD5 a39dff3e063ffd11e322158dc3b18523 files/digest-popa3d-0.6.3 201
-MD5 2e722f7560b3b3fc07a8853ec869b8c2 files/digest-popa3d-0.6.4 201
 MD5 6e6b9368bd2cafab8d90bde76f5011b7 files/pam 136
+MD5 309ea38c54e2c8653d224cbf72036dd6 files/digest-popa3d-0.6.4.1-r1 203
 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.3 b/net-mail/popa3d/files/digest-popa3d-0.6.3
deleted file mode 100644
index 940382954d6c..000000000000
--- a/net-mail/popa3d/files/digest-popa3d-0.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cceb80f90d0fc1f85fdb5cf7472afe9e popa3d-0.6.3.tar.gz 31551
-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/files/digest-popa3d-0.6.4 b/net-mail/popa3d/files/digest-popa3d-0.6.4
deleted file mode 100644
index 75cbc74f627c..000000000000
--- a/net-mail/popa3d/files/digest-popa3d-0.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21d4876c4d85b92d323e46d2e8f12e11 popa3d-0.6.4.tar.gz 31881
-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/files/digest-popa3d-0.6.4.1 b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r1
index a91bd2036052..a91bd2036052 100644
--- a/net-mail/popa3d/files/digest-popa3d-0.6.4.1
+++ b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r1
diff --git a/net-mail/popa3d/files/pam b/net-mail/popa3d/files/pam
deleted file mode 100644
index b69741c55a2a..000000000000
--- a/net-mail/popa3d/files/pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-
-auth	required	/lib/security/pam_stack.so service=system-auth
-account	required	/lib/security/pam_stack.so service=system-auth
diff --git a/net-mail/popa3d/popa3d-0.6.3.ebuild b/net-mail/popa3d/popa3d-0.6.3.ebuild
deleted file mode 100644
index 0028b6651321..000000000000
--- a/net-mail/popa3d/popa3d-0.6.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.3.ebuild,v 1.8 2004/09/06 19:02:47 ciaranm 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/${P}-vname-2.diff
-		 !mbox? ( 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
-	epause 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 mbox ; then
-		einfo "Mailbox format is: MAILBOX."
-	else
-		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
-		einfo "Mailbox format is: MAILDIR."
-		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
-			POPA3D_HOME_MAILBOX=".maildir"
-		fi
-	fi
-
-	if [ "${POPA3D_HOME_MAILBOX}" != "" ] ; then
-		einfo "Mailbox path: ~/$POPA3D_HOME_MAILBOX"
-		epause 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
-}
diff --git a/net-mail/popa3d/popa3d-0.6.4.1.ebuild b/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild
index 5681b25379be..3c7768c68a5a 100644
--- a/net-mail/popa3d/popa3d-0.6.4.1.ebuild
+++ b/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.4 2004/11/06 18:48:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild,v 1.1 2005/02/24 17:26:15 port001 Exp $
 
 inherit eutils
 
@@ -44,17 +44,29 @@ 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 )"
+	 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 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND=">=sys-apps/sed-4
-		pam? ( >=sys-libs/pam-0.72 )"
+	pam? ( >=sys-libs/pam-0.72
+	       >=net-mail/mailbase-0.00-r8 )"
 
 pkg_setup() {
+
+	if use pam && ! built_with_use net-mail/mailbase pam;
+	then
+		echo
+		eerror
+		eerror "${PN} needs net-mail/mailbase to be built with the pam USE flag"
+		eerror "activated. Please rebuild net-mail/mailbase with pam"
+		eerror
+		die "mailbase has to be built with pam flag"
+	fi
+
 	if use mbox && use maildir ; then
 		echo
 		eerror
@@ -153,7 +165,7 @@ src_install() {
 	newexe ${FILESDIR}/popa3d-initrc popa3d
 
 	if use pam ; then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/pam popa3d
+		dodir /etc/pam.d/
+		dosym /etc/pam.d/pop /etc/pam.d/popa3d
 	fi
 }
diff --git a/net-mail/popa3d/popa3d-0.6.4.ebuild b/net-mail/popa3d/popa3d-0.6.4.ebuild
deleted file mode 100644
index 12b0da296658..000000000000
--- a/net-mail/popa3d/popa3d-0.6.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.ebuild,v 1.7 2004/09/06 19:02:47 ciaranm 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 ~sparc"
-
-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
-	epause 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"
-		epause 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
-}