Apply patch to prevent unwanted mail header mangling. Closes #66256.

5 files changed, 109 insertions, 5 deletions

diff --git a/net-mail/hotwayd/ChangeLog b/net-mail/hotwayd/ChangeLog
index 48e034db2416..3d6369168834 100644
--- a/net-mail/hotwayd/ChangeLog
+++ b/net-mail/hotwayd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2004/08/08 00:13:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/hotwayd/ChangeLog,v 1.9 2004/10/04 12:22:53 ticho Exp $
+
+*hotwayd-0.8-r1 (04 Oct 2004)
+
+  04 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/hotwayd-0.8-headerfix.patch, +hotwayd-0.8-r1.ebuild:
+  Revision bump. Apply patch to fix unwanted header mangling (see bug #66256).
+  Patch submitted by Keith Landry <wirwzd@wirewizards.com>.
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> hotwayd-0.7.4.ebuild,
   hotwayd-0.8.ebuild:
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
index 9b3d545b3a0b..1bac01131841 100644
--- a/net-mail/hotwayd/Manifest
+++ b/net-mail/hotwayd/Manifest
@@ -1,9 +1,22 @@
-MD5 b7a3948f75df026e5c2a4dfa62687a16 hotwayd-0.8.ebuild 1982
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bce7fcf6739275830189da59f5a0304d ChangeLog 1456
 MD5 996ca96b58d7ccaf43e5fd2f9f4f1a01 hotwayd-0.7.4.ebuild 1886
-MD5 dbd404d5d0be31545b878876a55b6968 ChangeLog 1176
+MD5 c0834f8ef90fa424f3b0bb23f903b222 hotwayd-0.8-r1.ebuild 2069
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 90d2d54ad3f474f1db81ab9ce45b39e0 files/hotwayd-0.8.xinetd 928
-MD5 38800a211e0f1f2c9226af9ba80bfef7 files/hotwayd.xinetd 878
+MD5 b7a3948f75df026e5c2a4dfa62687a16 hotwayd-0.8.ebuild 1982
 MD5 2d2ee1259a0fd2a7f3e82f7b3449be37 files/hotwayd-0.8-amd64.patch 563
+MD5 90d2d54ad3f474f1db81ab9ce45b39e0 files/hotwayd-0.8.xinetd 928
 MD5 66d321fd1972f44a53676d31a03bca9d files/digest-hotwayd-0.8 64
+MD5 969a671e962b81278cd38b4017d6df80 files/hotwayd-0.8-headerfix.patch 555
 MD5 76109cc95e670b7bf885c7028e669359 files/digest-hotwayd-0.7.4 66
+MD5 66d321fd1972f44a53676d31a03bca9d files/digest-hotwayd-0.8-r1 64
+MD5 38800a211e0f1f2c9226af9ba80bfef7 files/hotwayd.xinetd 878
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYUCm10xuJSrg3/sRArzJAJ4uKHRg+tiU98iJuuaAiZ4098VgNgCcCQxB
+6bDhyahDxqb3HOeGGFXPWgU=
+=aGGz
+-----END PGP SIGNATURE-----
diff --git a/net-mail/hotwayd/files/digest-hotwayd-0.8-r1 b/net-mail/hotwayd/files/digest-hotwayd-0.8-r1
new file mode 100644
index 000000000000..2ad71bd95c62
--- /dev/null
+++ b/net-mail/hotwayd/files/digest-hotwayd-0.8-r1
@@ -0,0 +1 @@
+MD5 b34d5166a2c6d7ba3970d3a0325c8c1a hotwayd-0.8.tar.bz2 148962
diff --git a/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch b/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch
new file mode 100644
index 000000000000..347e8e003054
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch
@@ -0,0 +1,24 @@
+--- hotwayd-0.8.orig/commands.c	2004-02-07 06:44:05.000000000 -0500
++++ hotwayd-0.8/commands.c	2004-10-03 15:53:25.636497904 -0400
+@@ -961,12 +961,16 @@
+ 
+ char *grow_and_copy(char *dest, int curpos, char *src, int i)
+ {
+-  if(!(dest = realloc(dest, curpos+i+1)))
++  char* temp = 0;
++  if(!(temp = malloc(curpos+i+1)))
+     return NULL;
+-
+-  strlcat(dest, src, curpos+i+1);
+-
+-  return dest;
++ 
++  memcpy(temp, dest, curpos);
++  memcpy(temp+curpos, src, i);
++  temp[curpos+i] = '\0';
++ 
++  free(dest);
++  return temp;
+ }
+ 
+ int proxy_sanity_check(void) {
diff --git a/net-mail/hotwayd/hotwayd-0.8-r1.ebuild b/net-mail/hotwayd/hotwayd-0.8-r1.ebuild
new file mode 100644
index 000000000000..7984b55b79bf
--- /dev/null
+++ b/net-mail/hotwayd/hotwayd-0.8-r1.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.1 2004/10/04 12:22:53 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"
+
+IUSE=""
+
+DEPEND="sys-apps/xinetd
+	dev-libs/libxml2"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-amd64.patch || die "epatch ${P}-amd64.patch failed"
+	epatch ${FILESDIR}/${P}-headerfix.patch || die "epatch ${P}-headerfix.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 "-----------------------------------------------------------------"
+}