Add support for building hotsmtpd. Closes #77629.

10 files changed, 98 insertions, 21 deletions

diff --git a/net-mail/hotwayd/ChangeLog b/net-mail/hotwayd/ChangeLog
index bbf409973a7f..9be99b008e8b 100644
--- a/net-mail/hotwayd/ChangeLog
+++ b/net-mail/hotwayd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/hotwayd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/ChangeLog,v 1.14 2005/01/10 02:35:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/ChangeLog,v 1.15 2005/01/13 15:14:51 ticho Exp $
+
+*hotwayd-0.8.2-r1 (13 Jan 2005)
+
+  13 Jan 2005; Andrej Kacian <ticho@gentoo.org> files/hotwayd-0.8.xinetd,
+  files/hotwayd.xinetd, hotwayd-0.7.4.ebuild, hotwayd-0.8-r1.ebuild,
+  +hotwayd-0.8.2-r1.ebuild, hotwayd-0.8.2.ebuild, hotwayd-0.8.ebuild:
+  Added "smtp" USE flag for building hotsmtpd SMTP proxy. Closes bug #77629,
+  reported by Scott <s_aldinger@hotmail.com>.
 
   09 Jan 2005; Jason Wever <weeve@gentoo.org> hotwayd-0.8.2.ebuild:
   Added ~sparc keyword wrt bug #76591.
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
index 6a96606aa5c5..d4da19e4598b 100644
--- a/net-mail/hotwayd/Manifest
+++ b/net-mail/hotwayd/Manifest
@@ -1,14 +1,16 @@
 MD5 55633565bcaaafc05e1c116455de95d1 ChangeLog 2362
-MD5 263aa82b9dcb212c9e60f17f62db8fda hotwayd-0.7.4.ebuild 1754
+MD5 2a3f0602f17da205098fc7de42a427dc hotwayd-0.7.4.ebuild 1750
+MD5 0318416d7a9d0a72b62be5c26cf8bb1f hotwayd-0.8.2.ebuild 1709
+MD5 c6d5da372443fcd01440ad4eb0e98355 hotwayd-0.8-r1.ebuild 1942
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 42728917fad7204ce33db5ae70cf655e hotwayd-0.8.ebuild 1870
-MD5 9455697ca9f954dc59b16169f14db779 hotwayd-0.8-r1.ebuild 1943
-MD5 f23f146ac6e592dba05440548eaee3bb hotwayd-0.8.2.ebuild 1710
+MD5 e6eb6697bab70278a4eb96e79b7f1b9f hotwayd-0.8.ebuild 1869
+MD5 7a6bb44a2c6f37eb19f65e9b00bc351e hotwayd-0.8.2-r1.ebuild 1650
+MD5 2d2ee1259a0fd2a7f3e82f7b3449be37 files/hotwayd-0.8-amd64.patch 563
+MD5 dd6f3b429961f43d5dc98ae6cb7a7135 files/hotwayd-0.8.xinetd 1096
+MD5 095121675641d48c7914ee0357579157 files/digest-hotwayd-0.8.2-r1 66
+MD5 66d321fd1972f44a53676d31a03bca9d files/digest-hotwayd-0.8 64
+MD5 11f58c76db54b710b16843e031fd58ab files/hotwayd-0.8-headerfix.patch 557
 MD5 76109cc95e670b7bf885c7028e669359 files/digest-hotwayd-0.7.4 66
 MD5 095121675641d48c7914ee0357579157 files/digest-hotwayd-0.8.2 66
-MD5 38800a211e0f1f2c9226af9ba80bfef7 files/hotwayd.xinetd 878
-MD5 66d321fd1972f44a53676d31a03bca9d files/digest-hotwayd-0.8 64
-MD5 2d2ee1259a0fd2a7f3e82f7b3449be37 files/hotwayd-0.8-amd64.patch 563
-MD5 90d2d54ad3f474f1db81ab9ce45b39e0 files/hotwayd-0.8.xinetd 928
 MD5 66d321fd1972f44a53676d31a03bca9d files/digest-hotwayd-0.8-r1 64
-MD5 11f58c76db54b710b16843e031fd58ab files/hotwayd-0.8-headerfix.patch 557
+MD5 f1e3a435a01ea89b18857dbb690c41d7 files/hotwayd.xinetd 1097
diff --git a/net-mail/hotwayd/files/digest-hotwayd-0.8.2-r1 b/net-mail/hotwayd/files/digest-hotwayd-0.8.2-r1
new file mode 100644
index 000000000000..22edaa6adc99
--- /dev/null
+++ b/net-mail/hotwayd/files/digest-hotwayd-0.8.2-r1
@@ -0,0 +1 @@
+MD5 0d1e3a691c8d5757a6e67b32745ab2cb hotwayd-0.8.2.tar.bz2 150424
diff --git a/net-mail/hotwayd/files/hotwayd-0.8.xinetd b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
index 947409606596..c0e50fe7427f 100644
--- a/net-mail/hotwayd/files/hotwayd-0.8.xinetd
+++ b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
@@ -1,9 +1,11 @@
 # default: off
 # description: hotway daemon
+#   - You need to add a line that says "hotwayd         110/tcp" to your
+#     /etc/services file. Change the port number if necessary, see below.
 #   - By default it listens to port 110 (default for pop3)
 #     If you already have a pop3 server running, or you want it to listen
 #     to another port change the value of "port = 110" below.
-#     Change the value in your email client accordingly.
+#     Change the value in your email client and in /etc/services accordingly.
 #   - By default it only allows access from localhost.
 #   - Also all xinetd entries do not start by default.
 #     One should manually enable the entries that one wants by
diff --git a/net-mail/hotwayd/files/hotwayd.xinetd b/net-mail/hotwayd/files/hotwayd.xinetd
index a9b7c6a8dc94..47dd94beeb9a 100644
--- a/net-mail/hotwayd/files/hotwayd.xinetd
+++ b/net-mail/hotwayd/files/hotwayd.xinetd
@@ -1,9 +1,11 @@
 # default: off
 # description: hotway daemon
+#   - You need to add a line that says "hotwayd         110/tcp" to your
+#     /etc/services file. Change the port number if necessary, see below.
 #   - By default it listens to port 110 (default for pop3)
 #     If you already have a pop3 server running, or you want it to listen
 #     to another port change the value of "port = 110" below.
-#     Change the value in your email client accordingly.
+#     Change the value in your email client and in /etc/services accordingly.
 #   - By default it only allows access from localhost.
 #   - Also all xinetd entries do not start by default.
 #     One should manually enable the entries that one wants by
@@ -19,7 +21,7 @@ service hotwayd
 	user			= nobody
 	port			= 110
 	server			= /usr/sbin/hotwayd
-	server_args		= -s
+	#server_args		= -p http://proxy:8080 -u proxy_user -q proxy_password
 	log_on_success		+= USERID
 	log_on_failure		+= USERID
 	disable			= yes
diff --git a/net-mail/hotwayd/hotwayd-0.7.4.ebuild b/net-mail/hotwayd/hotwayd-0.7.4.ebuild
index 90de125f33ff..170bdba4edc8 100644
--- a/net-mail/hotwayd/hotwayd-0.7.4.ebuild
+++ b/net-mail/hotwayd/hotwayd-0.7.4.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/hotwayd/hotwayd-0.7.4.ebuild,v 1.5 2005/01/10 02:35:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/hotwayd-0.7.4.ebuild,v 1.6 2005/01/13 15:14:51 ticho Exp $
 
 DESCRIPTION="Hotmail to pop3 daemon"
 HOMEPAGE="http://hotwayd.sourceforge.net/"
@@ -30,7 +30,7 @@ src_install () {
 	dodoc AUTHORS NEWS README
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/hotwayd.xinetd hotwayd
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
 }
 
 pkg_postinst () {
diff --git a/net-mail/hotwayd/hotwayd-0.8-r1.ebuild b/net-mail/hotwayd/hotwayd-0.8-r1.ebuild
index b56c40a788ed..b28df9efd7aa 100644
--- a/net-mail/hotwayd/hotwayd-0.8-r1.ebuild
+++ b/net-mail/hotwayd/hotwayd-0.8-r1.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/hotwayd/hotwayd-0.8-r1.ebuild,v 1.5 2005/01/10 02:35:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/hotwayd-0.8-r1.ebuild,v 1.6 2005/01/13 15:14:51 ticho Exp $
 
 inherit eutils
 
@@ -34,7 +34,7 @@ src_install () {
 	dodoc AUTHORS NEWS README
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/${P}.xinetd hotwayd
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
 }
 
 pkg_postinst () {
diff --git a/net-mail/hotwayd/hotwayd-0.8.2-r1.ebuild b/net-mail/hotwayd/hotwayd-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..473160bdc763
--- /dev/null
+++ b/net-mail/hotwayd/hotwayd-0.8.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/hotwayd-0.8.2-r1.ebuild,v 1.1 2005/01/13 15:14:51 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Hotmail to pop3 daemon"
+HOMEPAGE="http://hotwayd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hotwayd/${P}.tar.bz2"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+
+IUSE="smtp"
+
+DEPEND="virtual/inetd
+	dev-libs/libxml2
+	smtp? ( >=dev-libs/cyrus-sasl-2 )"
+
+src_install () {
+	# The original make install is broken, since it also tries to install 
+	# the libghttp files. This is not needed, since this library is statically
+	# linked into the executable.
+	# Lets just copy the (one) file manually...
+	dosbin hotwayd
+	if use smtp; then
+		dosbin hotsmtpd/hotsmtpd
+		insinto /etc/xinetd.d
+		newins hotsmtpd/hotsmtpd.xinetd hotsmtpd
+	fi
+
+	dodoc AUTHORS NEWS README
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
+}
+
+pkg_postinst () {
+	einfo ""
+	einfo " By default daemons that use xinetd are not started "
+	einfo "     automatically in gentoo"
+	einfo " To activate do the following steps: "
+	einfo " - Edit the file /etc/xinetd.d/hotwayd and change disable "
+	einfo "   from yes to no "
+	einfo " - Add the following line to /etc/services: "
+	einfo "   hotwayd         110/tcp "
+	einfo " - Note: if you already have a daemon serving port 110 (the "
+	einfo "   default pop3 port); then change the port number to something "
+	einfo "   else; also change the port number in hotwayd "
+	einfo " - If you already had xinetd up and running, restart with "
+	einfo "   # /etc/init.d/xinetd restart "
+	einfo "   or "
+	einfo "   If the emerge also pulled in the xinetd package for you, do "
+	einfo "   # rc-update add xinetd default "
+	einfo "   # /etc/init.d/xinetd start "
+	einfo ""
+	if use smtp; then
+		einfo "You chose to install hotsmtpd, a SMTP proxy for hotmail. Please"
+		einfo "Configure /etc/xinetd.d/hotsmtpd and restart xinetd to start using it."
+	fi
+}
diff --git a/net-mail/hotwayd/hotwayd-0.8.2.ebuild b/net-mail/hotwayd/hotwayd-0.8.2.ebuild
index 715fa875caee..fed6bcc54e1f 100644
--- a/net-mail/hotwayd/hotwayd-0.8.2.ebuild
+++ b/net-mail/hotwayd/hotwayd-0.8.2.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/hotwayd/hotwayd-0.8.2.ebuild,v 1.2 2005/01/10 02:35:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/hotwayd-0.8.2.ebuild,v 1.3 2005/01/13 15:14:51 ticho Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_install () {
 	dodoc AUTHORS NEWS README
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/${P}.xinetd hotwayd
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
 }
 
 pkg_postinst () {
diff --git a/net-mail/hotwayd/hotwayd-0.8.ebuild b/net-mail/hotwayd/hotwayd-0.8.ebuild
index 6afba2738579..503e3152b06f 100644
--- a/net-mail/hotwayd/hotwayd-0.8.ebuild
+++ b/net-mail/hotwayd/hotwayd-0.8.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/hotwayd/hotwayd-0.8.ebuild,v 1.7 2005/01/10 02:35:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/hotwayd-0.8.ebuild,v 1.8 2005/01/13 15:14:51 ticho Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_install () {
 	dodoc AUTHORS NEWS README
 
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/${P}.xinetd hotwayd
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
 }
 
 pkg_postinst () {