Revbump, amd64 fix, closes bug #45567

6 files changed, 111 insertions, 3 deletions

diff --git a/net-mail/hotwayd/ChangeLog b/net-mail/hotwayd/ChangeLog
index 0c0f7169dbe6..14728894922a 100644
--- a/net-mail/hotwayd/ChangeLog
+++ b/net-mail/hotwayd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/hotwayd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/ChangeLog,v 1.4 2004/06/24 23:23:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/ChangeLog,v 1.5 2004/07/26 22:21:54 malc Exp $
+
+*hotwayd-0.8 (26 Jul 2004)
+
+  26 Jul 2004; <malc@gentoo.org> +files/hotwayd-0.8-amd64.patch,
+  +files/hotwayd-0.8.xinetd, +hotwayd-0.8.ebuild:
+  Revbump, add fix to make md5 work on amd64, fixes bug #45567
 
 *hotwayd-0.7.1 (20 Nov 2003)
 
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
index 331169fa3ae9..0261047062f4 100644
--- a/net-mail/hotwayd/Manifest
+++ b/net-mail/hotwayd/Manifest
@@ -1,7 +1,11 @@
+MD5 15f32e50c9001458863e1b929af2dae1 ChangeLog 774
 MD5 1a3536122f3dfb866de3d3bbf13b2b19 hotwayd-0.5.3.ebuild 1888
 MD5 a8006fe7a67dbd77b4c7182b32d87112 hotwayd-0.7.1.ebuild 1889
-MD5 3e412266b2a48bea8b9ec6f2a8aaddb6 ChangeLog 571
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 38800a211e0f1f2c9226af9ba80bfef7 files/hotwayd.xinetd 878
+MD5 11b930426e7e58ccb5e71ee7227d3210 hotwayd-0.8.ebuild 1980
 MD5 90c7357229f07f0723820b3b6810420b files/digest-hotwayd-0.5.3 66
 MD5 e0d6705fcbf82a628c84fee10e046b08 files/digest-hotwayd-0.7.1 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
diff --git a/net-mail/hotwayd/files/digest-hotwayd-0.8 b/net-mail/hotwayd/files/digest-hotwayd-0.8
new file mode 100644
index 000000000000..2ad71bd95c62
--- /dev/null
+++ b/net-mail/hotwayd/files/digest-hotwayd-0.8
@@ -0,0 +1 @@
+MD5 b34d5166a2c6d7ba3970d3a0325c8c1a hotwayd-0.8.tar.bz2 148962
diff --git a/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch b/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch
new file mode 100644
index 000000000000..a74d9ab9131b
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch
@@ -0,0 +1,13 @@
+--- hotwayd-0.8/work/hotwayd-0.8/libghttp-1.0.9-mod/md5.h	2002-11-02 00:54:21.000000000 +0000
++++ hotwayd-0.8_patched/work/hotwayd-0.8/libghttp-1.0.9-mod/md5.h	2004-07-26 15:51:20.634345504 +0100
+@@ -38,7 +38,9 @@
+ typedef unsigned short int UINT2;
+ 
+ /* UINT4 defines a four byte word */
+-typedef unsigned long int UINT4;
++// not on x86_64 it ain't...
++//typedef unsigned long int UINT4;
++typedef unsigned int UINT4;
+ 
+ /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
diff --git a/net-mail/hotwayd/files/hotwayd-0.8.xinetd b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
new file mode 100644
index 000000000000..947409606596
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
@@ -0,0 +1,26 @@
+# default: off
+# description: hotway daemon
+#   - 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.
+#   - 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
+#     changing the value of "disable = yes" to "disable = no".
+#   - Restart xinetd after changing anything in this file:
+#     # /etc/init.d/xinetd restart
+
+service hotwayd
+{
+        only_from               = localhost
+	socket_type		= stream
+	wait			= no
+	user			= nobody
+	port			= 110
+	server			= /usr/sbin/hotwayd
+	#server_args		= - 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.8.ebuild b/net-mail/hotwayd/hotwayd-0.8.ebuild
new file mode 100644
index 000000000000..2a35abe29fce
--- /dev/null
+++ b/net-mail/hotwayd/hotwayd-0.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 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.1 2004/07/26 22:21:54 malc Exp $
+
+DESCRIPTION="Hotmail to pop3 deamon"
+HOMEPAGE="http://hotwayd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hotwayd/${P}.tar.bz2"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+DEPEND="sys-apps/xinetd
+	dev-libs/libxml2"
+
+inherit eutils
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-amd64.patch || die "epatch ${P}-amd64.patch failed"
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+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
+
+	dodoc AUTHORS NEWS README
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/${P}.xinetd hotwayd
+}
+
+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 "-----------------------------------------------------------------"
+}