Version bump + cleanups and QA fixes. Closes bug #125814

Package-Manager: portage-2.0.54-r2

4 files changed, 222 insertions, 32 deletions

diff --git a/net-mail/popa3d/ChangeLog b/net-mail/popa3d/ChangeLog
index 191933423fa6..64bf7b40c8de 100644
--- a/net-mail/popa3d/ChangeLog
+++ b/net-mail/popa3d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/popa3d
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.24 2006/05/23 18:20:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.25 2006/05/23 18:52:27 ferdy Exp $
+
+*popa3d-1.0.2 (23 May 2006)
+
+  23 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +popa3d-1.0.2.ebuild:
+  Version bump + cleanups and QA fixes. Closes bug #125814
 
   23 May 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove port001 from metadata, bug 26349.
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index 09c02145802f..c2237c1fea7b 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -1,40 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX popa3d-initrc 479 RMD160 7a10b05009d7930d5edf7d37bb633a7eb490baf0 SHA1 f9904d3ce4b893a7da64718f0bb9f879a747a7a0 SHA256 2fc9aeeb1818d7a5fca2f72212767118c6b23d432d1d2550b82cc99b5ada3711
+MD5 019fc8d0a5313a4a5381de560e5fbd7e ChangeLog 3925
+MD5 d5e922ceb0a1fbe958b60cefb5029e1b files/digest-popa3d-0.6.4.1-r2 208
+MD5 361c1454d68521669150fc25f5078c82 files/digest-popa3d-1.0 204
+MD5 0ea4016f3565e2276780fb2ced858043 files/digest-popa3d-1.0.2 206
 MD5 d7e80b35c6a318d497f9fc4e538e0429 files/popa3d-initrc 479
-RMD160 7a10b05009d7930d5edf7d37bb633a7eb490baf0 files/popa3d-initrc 479
-SHA256 2fc9aeeb1818d7a5fca2f72212767118c6b23d432d1d2550b82cc99b5ada3711 files/popa3d-initrc 479
-DIST popa3d-0.5.9-maildir-2.diff.gz 3227
-DIST popa3d-0.6.3-vname-2.diff.gz 947
-DIST popa3d-0.6.4.1.tar.gz 32061
-DIST popa3d-1.0.tar.gz 32586
-EBUILD popa3d-0.6.4.1-r2.ebuild 4471 RMD160 6dfddcf11559180e46eb5fcfb961b56e8a72e51b SHA1 5994ba717948c284a4d0332a873ac36d70dd2e49 SHA256 11c6b71b21a8d213b401a59cc70fea235775596d07cfa0510772171eb7a3bd79
+MD5 5b48d9a897a74987026c74a16e2478e5 metadata.xml 235
 MD5 76b82c38818ea590156682b0504acfcc popa3d-0.6.4.1-r2.ebuild 4471
-RMD160 6dfddcf11559180e46eb5fcfb961b56e8a72e51b popa3d-0.6.4.1-r2.ebuild 4471
-SHA256 11c6b71b21a8d213b401a59cc70fea235775596d07cfa0510772171eb7a3bd79 popa3d-0.6.4.1-r2.ebuild 4471
-EBUILD popa3d-1.0.ebuild 5447 RMD160 d93711b99dbde31862224c3961a3c0c229f2e0b0 SHA1 24e52b70f2b1f8f4802f4cc737f59dfe3607d04e SHA256 89a910769c585ea018e69fbc74c83a7d369f68f1715a73408674355372c7a967
+MD5 62a30b527ddaa69494697d2cec729590 popa3d-1.0.2.ebuild 5558
 MD5 0c6a249e00612aa98eb0d8725ff68cb5 popa3d-1.0.ebuild 5447
-RMD160 d93711b99dbde31862224c3961a3c0c229f2e0b0 popa3d-1.0.ebuild 5447
-SHA256 89a910769c585ea018e69fbc74c83a7d369f68f1715a73408674355372c7a967 popa3d-1.0.ebuild 5447
-MISC ChangeLog 3762 RMD160 67f88c2a51fca115e9fc892394f8c9c4b9c8cd41 SHA1 1ba5ffac876aad10db41c5b34dec05680990d7c8 SHA256 385c98e927eace3e895eb17fba4e0516b171b209ffa23b8c0e6c5dca2b975357
-MD5 cee9c07a540409089c9701e7947f1a85 ChangeLog 3762
-RMD160 67f88c2a51fca115e9fc892394f8c9c4b9c8cd41 ChangeLog 3762
-SHA256 385c98e927eace3e895eb17fba4e0516b171b209ffa23b8c0e6c5dca2b975357 ChangeLog 3762
-MISC metadata.xml 235 RMD160 9902228719750c3aa42965b67d3e5fe7354f217f SHA1 cb097e246c97c9d57cbfb5fc1850a6e294509b14 SHA256 67771a4ca51a3c324056aa0ab9ee0040646c12c548b86a478be4b8280af63235
-MD5 5b48d9a897a74987026c74a16e2478e5 metadata.xml 235
-RMD160 9902228719750c3aa42965b67d3e5fe7354f217f metadata.xml 235
-SHA256 67771a4ca51a3c324056aa0ab9ee0040646c12c548b86a478be4b8280af63235 metadata.xml 235
-MD5 d5e922ceb0a1fbe958b60cefb5029e1b files/digest-popa3d-0.6.4.1-r2 208
-RMD160 c4de6461cd328b9b8a0c0b495cd0c43cb002dc30 files/digest-popa3d-0.6.4.1-r2 208
-SHA256 84de3691ae45655d8ace621e977960c9a3071e1a91ad1dd7748430463b743da2 files/digest-popa3d-0.6.4.1-r2 208
-MD5 361c1454d68521669150fc25f5078c82 files/digest-popa3d-1.0 204
-RMD160 3f71cf91a03c93d8c08d6c981a3ce1e97a9414c6 files/digest-popa3d-1.0 204
-SHA256 eecfbe01d3cdef08a1ca77a396661b91cb5c8fd03623107b9c53b001db09a708 files/digest-popa3d-1.0 204
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEc1KNugEuf3OQ0akRAr52AKCbuMJwAqb4vI+rPhzml2GeSO9J5gCgjdfx
-pVkUHFsMT1VP1ThkYX6KWAs=
-=nmz+
+iD8DBQFEc1oEViELBEf1JB0RAmyRAJ0dtuzlb9G0NdpIj18dTyb2nCvqbwCfTtOM
+rRzhwqGUtYEWe+0rpECRfMg=
+=iYod
 -----END PGP SIGNATURE-----
diff --git a/net-mail/popa3d/files/digest-popa3d-1.0.2 b/net-mail/popa3d/files/digest-popa3d-1.0.2
new file mode 100644
index 000000000000..1789e9a6696f
--- /dev/null
+++ b/net-mail/popa3d/files/digest-popa3d-1.0.2
@@ -0,0 +1,3 @@
+MD5 ec478faa35cc2ee4f06f77eb9c236070 popa3d-0.5.9-maildir-2.diff.gz 3227
+MD5 568acb623180cbdbfcd286a037688bcf popa3d-0.6.3-vname-2.diff.gz 947
+MD5 cebdc56b6fa0655a5688c89cb7703b66 popa3d-1.0.2.tar.gz 32848
diff --git a/net-mail/popa3d/popa3d-1.0.2.ebuild b/net-mail/popa3d/popa3d-1.0.2.ebuild
new file mode 100644
index 000000000000..3520908ae239
--- /dev/null
+++ b/net-mail/popa3d/popa3d-1.0.2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-1.0.2.ebuild,v 1.1 2006/05/23 18:52:27 ferdy Exp $
+
+inherit eutils toolchain-funcs
+
+#
+# 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
+#
+######
+# 12/07/2005 - port001
+# Version 1.0 introduced some increased default values for a number of
+# configuration paramaters. These values are way too high for most systems.
+MAX_SESSIONS=100 # Default is 500
+MAX_SESSIONS_PER_SOURCE=10 # Default is 50
+
+MAX_MAILBOX_MESSAGES=100000 # Default is 2097152
+MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
+MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
+######
+
+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
+	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"
+KEYWORDS="~ppc ~sparc ~x86"
+
+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
+
+	enewgroup popa3d
+	enewuser popa3d -1 -1 /nonexistent popa3d
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/popa3d-0.6.3-vname-2.diff.gz
+
+	use maildir && epatch "${DISTDIR}"/popa3d-0.5.9-maildir-2.diff.gz
+}
+
+src_compile() {
+	cd "${S}"
+
+	sed -i \
+		-e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \
+		-e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \
+		-e "s:^\(#define MAX_MAILBOX_MESSAGES\).*$:\1 ${MAX_MAILBOX_MESSAGES}:" \
+		-e "s:^\(#define MAX_MAILBOX_OPEN_BYTES\).*$:\1 ${MAX_MAILBOX_OPEN_BYTES}:" \
+		-e "s:^\(#define MAX_MAILBOX_WORK_BYTES\).*$:\1 ${MAX_MAILBOX_WORK_BYTES}:" \
+			params.h || die "sed on params.h failed (1)"
+
+	if use maildir ; then
+		einfo "Mailbox format is: MAILDIR."
+		if [[ -z ${POPA3D_HOME_MAILBOX} ]] ; then
+			POPA3D_HOME_MAILBOX=".maildir"
+		fi
+	else
+		einfo "Mailbox format is: MAILBOX."
+	fi
+
+	if [[ -n ${POPA3D_HOME_MAILBOX} ]] ; then
+		einfo "Mailbox path: ~/${POPA3D_HOME_MAILBOX}"
+		epause 2
+		sed -i \
+			-e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" \
+			-e "s:^\(#define HOME_MAILBOX_NAME\).*$:\1 \"${POPA3D_HOME_MAILBOX}\":" \
+				params.h || die "sed on params.h failed (2)"
+	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\).*$:\1 1:" params.h
+	fi
+
+	if [[ -n ${POPA3D_VIRTUAL_HOME_PATH} ]] ; then
+		einfo "Virtual home path set to: ${POPA3D_VIRTUAL_HOME_PATH}"
+		sed -i \
+			-e "s:^\(#define VIRTUAL_HOME_PATH\).*$:\1 \"$POPA3D_VIRTUAL_HOME_PATH\":" \
+				params.h || die "sed on params.h failed (3)"
+	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\)[[:blank:]].*$:\1 0:" \
+			-e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \
+				params.h || die "sed on params.h failed (4)"
+	else
+		einfo "Authentication method: Shadow."
+	fi
+
+	sed -i \
+		-e "s:^\(#define POP_STANDALONE\).*$:\1 1:" \
+		-e "s:^\(#define POP_VIRTUAL\).*$:\1 1:" \
+		-e "s:^\(#define VIRTUAL_VNAME\).*$:\1 1:" \
+			params.h || die "sed on params.h failed (5)"
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS =/d' \
+		-e '/^LDFLAGS =/d' \
+			Makefile || die "Makefile cleaning failed"
+
+	emake LIBS="${LIBS} -lcrypt" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	into /usr
+
+	dosbin popa3d
+	doman popa3d.8
+	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
+
+	diropts -m 755
+	dodir /var/empty
+	keepdir /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
+}