Add a patch to fix compilation with newer openssl versions. Fixes bug #147923. Thanks to Francisco J. Vázquez <franjva@terra.es>.

(Portage version: 2.1.1)

7 files changed, 45 insertions, 7 deletions

diff --git a/mail-mta/nbsmtp/ChangeLog b/mail-mta/nbsmtp/ChangeLog
index 4e8618e37146..dc024722928b 100644
--- a/mail-mta/nbsmtp/ChangeLog
+++ b/mail-mta/nbsmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/nbsmtp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.34 2005/12/28 19:52:12 ferdy Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.35 2006/09/17 17:13:58 ferdy Exp $
+
+  17 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/nbsmtp-1.00-openssl.patch, nbsmtp-1.00-r2.ebuild,
+  nbsmtp-1.00-r3.ebuild:
+  Add a patch to fix compilation with newer openssl versions. Fixes bug
+  #147923. Thanks to Francisco J. Vázquez <franjva@terra.es>.
 
   28 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> nbsmtp-1.00-r3.ebuild:
   add missing inherit
diff --git a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00 b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00
index 492499b41cca..b69c00d13ea3 100644
--- a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00
+++ b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00
@@ -1 +1,3 @@
 MD5 0c6a200027a6f7f61f44b374261aa52f nbsmtp-1.00.tar.bz2 104090
+RMD160 a701bca7715c5965f8ac337225d01c4f86abca36 nbsmtp-1.00.tar.bz2 104090
+SHA256 9e63fe490ce4df513d1c61640deaf9b603ba96ab4afd0f306d584c11b2e2989f nbsmtp-1.00.tar.bz2 104090
diff --git a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2 b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2
index 492499b41cca..b69c00d13ea3 100644
--- a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2
+++ b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2
@@ -1 +1,3 @@
 MD5 0c6a200027a6f7f61f44b374261aa52f nbsmtp-1.00.tar.bz2 104090
+RMD160 a701bca7715c5965f8ac337225d01c4f86abca36 nbsmtp-1.00.tar.bz2 104090
+SHA256 9e63fe490ce4df513d1c61640deaf9b603ba96ab4afd0f306d584c11b2e2989f nbsmtp-1.00.tar.bz2 104090
diff --git a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3 b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3
index 492499b41cca..b69c00d13ea3 100644
--- a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3
+++ b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3
@@ -1 +1,3 @@
 MD5 0c6a200027a6f7f61f44b374261aa52f nbsmtp-1.00.tar.bz2 104090
+RMD160 a701bca7715c5965f8ac337225d01c4f86abca36 nbsmtp-1.00.tar.bz2 104090
+SHA256 9e63fe490ce4df513d1c61640deaf9b603ba96ab4afd0f306d584c11b2e2989f nbsmtp-1.00.tar.bz2 104090
diff --git a/mail-mta/nbsmtp/files/nbsmtp-1.00-openssl.patch b/mail-mta/nbsmtp/files/nbsmtp-1.00-openssl.patch
new file mode 100644
index 000000000000..c1d7198896c4
--- /dev/null
+++ b/mail-mta/nbsmtp/files/nbsmtp-1.00-openssl.patch
@@ -0,0 +1,12 @@
+--- hmac_md5.c.orig	2006-09-17 17:44:33.000000000 +0100
++++ hmac_md5.c	2006-09-17 17:45:07.000000000 +0100
+@@ -5,8 +5,8 @@
+  * Code taken from RFC2104.
+  */
+ 
+-#include <openssl/md5.h>
+ #include <string.h>
++#include <openssl/md5.h>
+ 
+ #include "hmac_md5.h"
+ 
diff --git a/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild b/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild
index 048afc43a50c..d1a6b0f8e81d 100644
--- a/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild,v 1.1 2005/08/19 22:46:57 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild,v 1.2 2006/09/17 17:13:58 ferdy Exp $
+
+inherit eutils
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
 SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
@@ -17,6 +19,12 @@ DEPEND="virtual/libc
 
 PROVIDE="virtual/mta"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openssl.patch
+}
+
 src_compile() {
 	econf $(use_enable ssl) \
 		$(use_enable debug) \
diff --git a/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild b/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild
index 0f119b86c620..e518a047c8fb 100644
--- a/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild,v 1.2 2005/12/28 19:52:12 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild,v 1.3 2006/09/17 17:13:58 ferdy Exp $
 
-inherit mailer
+inherit mailer eutils
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
 SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
@@ -16,6 +16,12 @@ IUSE="ssl ipv6 debug"
 DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openssl.patch
+}
+
 src_compile() {
 	econf $(use_enable ssl) \
 		$(use_enable debug) \