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

Package-Manager: portage-2.1.1

8 files changed, 85 insertions, 18 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/Manifest b/mail-mta/nbsmtp/Manifest
index bd29b51b0fa5..6c235bde171b 100644
--- a/mail-mta/nbsmtp/Manifest
+++ b/mail-mta/nbsmtp/Manifest
@@ -1,19 +1,48 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c247a8bac49c9fa964b441bc917dd276 ChangeLog 6105
-MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00 64
-MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00-r2 64
-MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00-r3 64
+AUX mailer.conf 348 RMD160 f73aa1491684e0418fef370c2b6e7a7cd6b95fee SHA1 5bf91af39271e5cdcf47583ef21e7f41b8ab1da9 SHA256 b6510fb7ebee86c546756e77adaad738c222e4128d63141a488ebca59c2dfbed
 MD5 02906beafefaf79dd565570de5541a06 files/mailer.conf 348
-MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
-MD5 f5c43fd15371cd45d2429999463c3ffa nbsmtp-1.00-r2.ebuild 1102
-MD5 6e03274a7640eadde6b193a6d169dafd nbsmtp-1.00-r3.ebuild 1323
+RMD160 f73aa1491684e0418fef370c2b6e7a7cd6b95fee files/mailer.conf 348
+SHA256 b6510fb7ebee86c546756e77adaad738c222e4128d63141a488ebca59c2dfbed files/mailer.conf 348
+AUX nbsmtp-1.00-openssl.patch 259 RMD160 2eaa419bd5e98d9ce51029d610dfd4e7048def6d SHA1 d19af8d840461ed3d95b132e25ad09f0d0c1520c SHA256 b47c89ea273a4b9228d47722b2e811a240e13625f0b37e22c48666282627943f
+MD5 dfa296d300eefcf51605c18dd109e5a5 files/nbsmtp-1.00-openssl.patch 259
+RMD160 2eaa419bd5e98d9ce51029d610dfd4e7048def6d files/nbsmtp-1.00-openssl.patch 259
+SHA256 b47c89ea273a4b9228d47722b2e811a240e13625f0b37e22c48666282627943f files/nbsmtp-1.00-openssl.patch 259
+DIST nbsmtp-1.00.tar.bz2 104090 RMD160 a701bca7715c5965f8ac337225d01c4f86abca36 SHA1 02a2a4967c06afd862f943e6594c08eed8c6674a SHA256 9e63fe490ce4df513d1c61640deaf9b603ba96ab4afd0f306d584c11b2e2989f
+EBUILD nbsmtp-1.00-r2.ebuild 1201 RMD160 71dad99649ad0558078194f1be7998735c4755b8 SHA1 27dea85d18b9a8734d303b5e3a24f09f96e36c3c SHA256 bac6c98c49f2dec69952fc86a3e540266fbb85797b3a3b58724057d8f0a40065
+MD5 51f8188d8fc85cefacbbc26fe077ee58 nbsmtp-1.00-r2.ebuild 1201
+RMD160 71dad99649ad0558078194f1be7998735c4755b8 nbsmtp-1.00-r2.ebuild 1201
+SHA256 bac6c98c49f2dec69952fc86a3e540266fbb85797b3a3b58724057d8f0a40065 nbsmtp-1.00-r2.ebuild 1201
+EBUILD nbsmtp-1.00-r3.ebuild 1413 RMD160 c73052a0427e1de15411f3805afc81e248f9af6f SHA1 78ef5860109eb1936b5441e01999f31ff1fe0424 SHA256 290136641b5b46cc02389ce877b71bf4886d7e97ace65dd18e3b75ca2cb34ea9
+MD5 e1b0cbe37bb2ff9bc5a93642350449a4 nbsmtp-1.00-r3.ebuild 1413
+RMD160 c73052a0427e1de15411f3805afc81e248f9af6f nbsmtp-1.00-r3.ebuild 1413
+SHA256 290136641b5b46cc02389ce877b71bf4886d7e97ace65dd18e3b75ca2cb34ea9 nbsmtp-1.00-r3.ebuild 1413
+EBUILD nbsmtp-1.00.ebuild 867 RMD160 cc7f2a3e10f04efe50f87ad7b460cea9620d849c SHA1 edc997bdf0a28eb67e366d63acf94d675a2b7936 SHA256 d69125efb55c9a44a2faf8db5419c1731ba849d8cfab372395c985d77be2a9c9
 MD5 542c744aef06ef42eeb7a5aee6e34cdb nbsmtp-1.00.ebuild 867
+RMD160 cc7f2a3e10f04efe50f87ad7b460cea9620d849c nbsmtp-1.00.ebuild 867
+SHA256 d69125efb55c9a44a2faf8db5419c1731ba849d8cfab372395c985d77be2a9c9 nbsmtp-1.00.ebuild 867
+MISC ChangeLog 6378 RMD160 6902868610444cdd0a8c99f7ee4efce27327d47f SHA1 78552ef70865d707dd18e6fc24b2051cb90d809a SHA256 733c097f0c76365c47372bf5825750a380da136a7823a010617566760575b863
+MD5 0389a8b3a1601f8e8a00dd91abf92693 ChangeLog 6378
+RMD160 6902868610444cdd0a8c99f7ee4efce27327d47f ChangeLog 6378
+SHA256 733c097f0c76365c47372bf5825750a380da136a7823a010617566760575b863 ChangeLog 6378
+MISC metadata.xml 259 RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 SHA1 9f7a04d0cab1654d39498db3f124fc755202adb7 SHA256 d0e8725b6ece5de6014dd4b18064854b993b1e3ab04d838370d7744756656ae5
+MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
+RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 metadata.xml 259
+SHA256 d0e8725b6ece5de6014dd4b18064854b993b1e3ab04d838370d7744756656ae5 metadata.xml 259
+MD5 761c94154fcdf0608376840d5723c03d files/digest-nbsmtp-1.00 238
+RMD160 23776f77e0a0c298286d82a8d399ceb315905da4 files/digest-nbsmtp-1.00 238
+SHA256 be4e939663cbb35faeac5bb2fb468db99505fb38506a0ed4a434d01318ec4f32 files/digest-nbsmtp-1.00 238
+MD5 761c94154fcdf0608376840d5723c03d files/digest-nbsmtp-1.00-r2 238
+RMD160 23776f77e0a0c298286d82a8d399ceb315905da4 files/digest-nbsmtp-1.00-r2 238
+SHA256 be4e939663cbb35faeac5bb2fb468db99505fb38506a0ed4a434d01318ec4f32 files/digest-nbsmtp-1.00-r2 238
+MD5 761c94154fcdf0608376840d5723c03d files/digest-nbsmtp-1.00-r3 238
+RMD160 23776f77e0a0c298286d82a8d399ceb315905da4 files/digest-nbsmtp-1.00-r3 238
+SHA256 be4e939663cbb35faeac5bb2fb468db99505fb38506a0ed4a434d01318ec4f32 files/digest-nbsmtp-1.00-r3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDsuz9ViELBEf1JB0RAqUWAJsGZ7XTTHALMTnCgKDP267IBtKT3wCfUEhU
-BGZz50dfHPKvzWkQb2XtjTs=
-=1/3b
+iD8DBQFFDYJjViELBEf1JB0RAjcwAJ0Z58GhEDuw/DE+s0DL6Kls/FP7uACePwxW
+t+CG+l0pDm0D66TlLxpa510=
+=bgfP
 -----END PGP SIGNATURE-----
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) \