Closes #21914

6 files changed, 28 insertions, 40 deletions

diff --git a/net-libs/libesmtp/ChangeLog b/net-libs/libesmtp/ChangeLog
index 12033349c693..b710ad49ea69 100644
--- a/net-libs/libesmtp/ChangeLog
+++ b/net-libs/libesmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libesmtp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.11 2003/08/18 14:37:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.12 2003/09/17 19:58:49 aliz Exp $
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> libesmtp-1.0-r1.ebuild :
+  Added patch to make libesmtp compile with OpenSSL 0.9.7. Closing #21914.
+  Also clean out obsolete ebuilds.
 
   18 Aug 2003; Aron Griffis <agriffis@gentoo.org> libesmtp-1.0-r1.ebuild:
   Add ~alpha to KEYWORDS
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index eff10e833d85..6081fecac3d0 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,7 +1,6 @@
-MD5 12a3cd28b074ae6e6719f886280e5f5f ChangeLog 1643
+MD5 565ea72cfac0a9606f57b52bbc41e4bb ChangeLog 1823
 MD5 31d27d7e8d6fbf3c4420a8b9ca0d108f libesmtp-0.8.12.ebuild 958
-MD5 43705c7c39dcbee9651df00bd5610295 libesmtp-1.0.ebuild 956
-MD5 4bf2fca2345fb23f8d31569f5945901b libesmtp-1.0-r1.ebuild 1319
+MD5 6b7d53ae4a9ff8b23522e4374e2c27e0 libesmtp-1.0-r1.ebuild 1395
 MD5 395e602b515d970eab3a9d7ef8a2016f files/digest-libesmtp-0.8.12 68
-MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0 65
 MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0-r1 65
+MD5 43822a1b725899b2ad3fbc20f58ee840 files/libesmtp-1.0-openssl.patch 405
diff --git a/net-libs/libesmtp/files/digest-libesmtp-1.0 b/net-libs/libesmtp/files/digest-libesmtp-1.0
deleted file mode 100644
index 588955cf4e98..000000000000
--- a/net-libs/libesmtp/files/digest-libesmtp-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6da5742bd8119a48a8385adfad14ea85 libesmtp-1.0.tar.bz2 230169
diff --git a/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch b/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch
new file mode 100644
index 000000000000..2a7df7ea375f
--- /dev/null
+++ b/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch
@@ -0,0 +1,13 @@
+--- ntlm/ntlmdes.c	2003-09-17 19:27:03.000000000 +0000
++++ ntlm/ntlmdes.c	2003-09-17 19:27:40.000000000 +0000
+@@ -60,8 +60,8 @@
+   des_ecb_encrypt (iv, result, ks, DES_ENCRYPT);
+ 
+   /* paranoia */
+-  memset (key, 0, sizeof key);
+-  memset (ks, 0, sizeof ks);
++  memset (&key, 0, sizeof key);
++  memset (&ks, 0, sizeof ks);
+ }
+ 
+ /* Copy and convert to upper case.  If supplied string is shorter than the
diff --git a/net-libs/libesmtp/libesmtp-1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
index 012fd9b02dc6..a76162f7de5e 100644
--- a/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0-r1.ebuild,v 1.4 2003/09/06 22:04:23 msterret Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0-r1.ebuild,v 1.5 2003/09/17 19:58:49 aliz Exp $
 
 inherit gcc eutils gnuconfig libtool
 
@@ -22,6 +21,12 @@ SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
 KEYWORDS="~x86 ~sparc ~ppc ~alpha"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-openssl.patch
+}
+
 src_compile() {
 	gnuconfig_update
 
diff --git a/net-libs/libesmtp/libesmtp-1.0.ebuild b/net-libs/libesmtp/libesmtp-1.0.ebuild
deleted file mode 100644
index 73ebdf4acf07..000000000000
--- a/net-libs/libesmtp/libesmtp-1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.ebuild,v 1.2 2003/09/06 22:04:23 msterret Exp $
-
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
-SRC_URI="http://www.stafford.uklinux.net/libesmtp/${P}.tar.bz2"
-HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
-
-DEPEND=">=sys-devel/libtool-1.3.5-r2
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-SLOT="0"
-LICENSE="LGPL-2.1 GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-src_compile() {
-	local myconf
-	use ssl || myconf="${myconf} --without-openssl"
-
-	./configure --prefix=/usr ${myconf} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make prefix=${D}/usr install || die "make install failed"
-	dodoc AUTHORS COPYING COPYING.GPL INSTALL ChangeLog NEWS Notes README TODO
-	dohtml doc/api.xml
-}
-