Patches pushed to the mirrors, SRC_URI updated - #93647. keepdir on /var/empty - #93659. Removed stale revision.

Package-Manager: portage-2.0.51.22-r1

6 files changed, 17 insertions, 187 deletions

diff --git a/net-mail/popa3d/ChangeLog b/net-mail/popa3d/ChangeLog
index 212d816230a1..f08baf901de7 100644
--- a/net-mail/popa3d/ChangeLog
+++ b/net-mail/popa3d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/popa3d
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.16 2005/05/21 20:56:34 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.17 2005/05/23 18:26:08 port001 Exp $
+
+  23 May 2005; Ian Leitch <port001@gentoo.org> -popa3d-0.6.4.1-r1.ebuild,
+  popa3d-0.6.4.1-r2.ebuild:
+  Patches pushed to the mirrors, SRC_URI updated - #93647. keepdir on
+  /var/empty - #93659. Removed stale revision.
 
   21 May 2005; Ian Leitch <port001@gentoo.org> popa3d-0.6.4.1-r2.ebuild:
   Stable on x86
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index 838cafd60267..c642036df6c0 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -1,7 +1,5 @@
-MD5 38c4137d84c7f6800b129b8436789448 popa3d-0.6.4.1-r1.ebuild 4634
-MD5 861c10b57830827f968abfeaefbd4e71 popa3d-0.6.4.1-r2.ebuild 4479
-MD5 728bfa20258d26bc922296d3ba0f64a2 ChangeLog 2857
+MD5 0328bbe5c989b571523cfad64e76d23e popa3d-0.6.4.1-r2.ebuild 4481
+MD5 aee5e57379d06aa42a768a601b7bb633 ChangeLog 3077
 MD5 dbb40cd6b37794fccc9251f434aa99ce metadata.xml 425
-MD5 309ea38c54e2c8653d224cbf72036dd6 files/digest-popa3d-0.6.4.1-r1 203
-MD5 309ea38c54e2c8653d224cbf72036dd6 files/digest-popa3d-0.6.4.1-r2 203
+MD5 d5e922ceb0a1fbe958b60cefb5029e1b files/digest-popa3d-0.6.4.1-r2 208
 MD5 d7e80b35c6a318d497f9fc4e538e0429 files/popa3d-initrc 479
diff --git a/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r1 b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r1
deleted file mode 100644
index a91bd2036052..000000000000
--- a/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-popa3d-0.6.4.1-r2 b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
index a91bd2036052..f04b6de97e18 100644
--- a/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
+++ b/net-mail/popa3d/files/digest-popa3d-0.6.4.1-r2
@@ -1,3 +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
+MD5 568acb623180cbdbfcd286a037688bcf popa3d-0.6.3-vname-2.diff.gz 947
+MD5 ec478faa35cc2ee4f06f77eb9c236070 popa3d-0.5.9-maildir-2.diff.gz 3227
diff --git a/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild b/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild
deleted file mode 100644
index 3c7768c68a5a..000000000000
--- a/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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-r1.ebuild,v 1.1 2005/02/24 17:26:15 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 ~ppc ~sparc"
-
-DEPEND=">=sys-apps/sed-4
-	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
-		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
-		dodir /etc/pam.d/
-		dosym /etc/pam.d/pop /etc/pam.d/popa3d
-	fi
-}
diff --git a/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild b/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
index 524c86e426e1..7e69e3e8ec48 100644
--- a/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
+++ b/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2005/05/21 20:56:34 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.1-r2.ebuild,v 1.3 2005/05/23 18:26:08 port001 Exp $
 
 inherit eutils
 
@@ -44,8 +44,8 @@ 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 )"
+	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
+	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -93,9 +93,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff
+	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff.gz
 
-	use maildir && epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
+	use maildir && epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff.gz
 }
 
 src_compile() {
@@ -156,6 +156,7 @@ src_install() {
 
 	diropts -m 755
 	dodir /var/empty
+	keepdir /var/empty
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/popa3d-initrc popa3d