Fix building against >=openssl-0.9.8b. Fix by Francisco Javier <ffelix at sshinf.com>, bug #146473.

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 44 insertions, 14 deletions

diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index 1fcf136617df..53f8f5a2481c 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/up-imapproxy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.13 2006/04/27 22:01:36 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.14 2006/10/07 02:25:22 ticho Exp $
+
+  07 Oct 2006; Andrej Kacian <ticho@gentoo.org>
+  +files/1.2.4-include-fix.patch, up-imapproxy-1.2.4.ebuild:
+  Fix building against >=openssl-0.9.8b. Fix by Francisco Javier <ffelix at
+  sshinf.com>, bug #146473.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index 993b05e88d1b..e945343d3554 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -1,24 +1,38 @@
-AUX 1.2.4-string-format-fix.patch 375 RMD160 9c2a9cd5d70ddbf85fd3495666fc3e9cb0c6d772 SHA1 e492b7e3388c65ac48caad38bf4e548738147345 SHA256 8d2d3f48627912846f3e4a5f97ca0b01f082485a419afdb55a8ebb2c906367f2 size 375
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.2.4-include-fix.patch 233 RMD160 408e8869aa1fcf266099d6fd620ef7159ab15dba SHA1 f098c507c728ba3025aa888d2aea6c91da2cae4b SHA256 df89e346f075f4854d2e7308d4570adf5c46514d4c0c30fe01177145f05d2d00
+MD5 b8b7e90f4da71b4297251a38c74c0951 files/1.2.4-include-fix.patch 233
+RMD160 408e8869aa1fcf266099d6fd620ef7159ab15dba files/1.2.4-include-fix.patch 233
+SHA256 df89e346f075f4854d2e7308d4570adf5c46514d4c0c30fe01177145f05d2d00 files/1.2.4-include-fix.patch 233
+AUX 1.2.4-string-format-fix.patch 375 RMD160 9c2a9cd5d70ddbf85fd3495666fc3e9cb0c6d772 SHA1 e492b7e3388c65ac48caad38bf4e548738147345 SHA256 8d2d3f48627912846f3e4a5f97ca0b01f082485a419afdb55a8ebb2c906367f2
 MD5 41b1d37cf457ac257131d32a89292291 files/1.2.4-string-format-fix.patch 375
 RMD160 9c2a9cd5d70ddbf85fd3495666fc3e9cb0c6d772 files/1.2.4-string-format-fix.patch 375
 SHA256 8d2d3f48627912846f3e4a5f97ca0b01f082485a419afdb55a8ebb2c906367f2 files/1.2.4-string-format-fix.patch 375
-AUX imapproxy.rc6 505 RMD160 f217612eb25c3dab81ce6d206f2a0681169db18d SHA1 deaa2f55e90fe57a97ac1032eba542ec72e5840d SHA256 b0d2369d4f311d37834145887e358c98e65451505985e2457dae9609f72579dd size 505
+AUX imapproxy.rc6 505 RMD160 f217612eb25c3dab81ce6d206f2a0681169db18d SHA1 deaa2f55e90fe57a97ac1032eba542ec72e5840d SHA256 b0d2369d4f311d37834145887e358c98e65451505985e2457dae9609f72579dd
 MD5 335caa9f1889ac28acefe57e99d6496b files/imapproxy.rc6 505
 RMD160 f217612eb25c3dab81ce6d206f2a0681169db18d files/imapproxy.rc6 505
 SHA256 b0d2369d4f311d37834145887e358c98e65451505985e2457dae9609f72579dd files/imapproxy.rc6 505
-DIST up-imapproxy-1.2.4.tar.gz 131331 RMD160 f763af637c3988d01a3f67d7437516327962a4e3 SHA256 f109a9a9e195154be8c790f458779529e00175e4824a3686980e8bc3533f1d86 size 131331
-EBUILD up-imapproxy-1.2.4.ebuild 1278 RMD160 e774184a082851d575330ef7a3361c54a74faa1f SHA1 aa7371ecbd2602a61d7074d73d553bb22bbe0038 SHA256 6f9e928606cb6e372661a6494313c0266e8e64a930e2a127b4961d7b091397d3 size 1278
-MD5 f9e32c64b6a4c82daee85f562a2ffcbc up-imapproxy-1.2.4.ebuild 1278
-RMD160 e774184a082851d575330ef7a3361c54a74faa1f up-imapproxy-1.2.4.ebuild 1278
-SHA256 6f9e928606cb6e372661a6494313c0266e8e64a930e2a127b4961d7b091397d3 up-imapproxy-1.2.4.ebuild 1278
-MISC ChangeLog 2017 RMD160 884a9388451155e150d1d4a74575c0efb4e387e2 SHA1 f247910ad081f03c922f4dd9922d996539905405 SHA256 78adb290cb9a8a8e263bed00af24aea063ad938a6d14f4042adfbd011c3847e7 size 2017
-MD5 9debbb7044c8e5920d0a1ec8607a9405 ChangeLog 2017
-RMD160 884a9388451155e150d1d4a74575c0efb4e387e2 ChangeLog 2017
-SHA256 78adb290cb9a8a8e263bed00af24aea063ad938a6d14f4042adfbd011c3847e7 ChangeLog 2017
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 size 161
+DIST up-imapproxy-1.2.4.tar.gz 131331 RMD160 f763af637c3988d01a3f67d7437516327962a4e3 SHA1 e2484d413ef8613a8af567d8e7a7f9836c603bfb SHA256 f109a9a9e195154be8c790f458779529e00175e4824a3686980e8bc3533f1d86
+EBUILD up-imapproxy-1.2.4.ebuild 1323 RMD160 68f4ae2bc974fc380f6b1b3cf7670640fefaa269 SHA1 6eb1df623ec73c3c2b94e45214b2e790ce47e70b SHA256 4622801c18e3d542e58e15a619790e264d59001b1507654684e2c84225a3f44b
+MD5 c0a4f42f9b67761417f1fb8a44a3f3e7 up-imapproxy-1.2.4.ebuild 1323
+RMD160 68f4ae2bc974fc380f6b1b3cf7670640fefaa269 up-imapproxy-1.2.4.ebuild 1323
+SHA256 4622801c18e3d542e58e15a619790e264d59001b1507654684e2c84225a3f44b up-imapproxy-1.2.4.ebuild 1323
+MISC ChangeLog 2229 RMD160 f8e0ed661be602faa685ccfeed65b0df1f1cb22a SHA1 acf9110748f343e0b008a43980d9a6f5baf16262 SHA256 04945f741785436591e983e525fb1afbb6492a94c6192d130b5f98891428fdb1
+MD5 dd866af132717c16a84678611e4c323f ChangeLog 2229
+RMD160 f8e0ed661be602faa685ccfeed65b0df1f1cb22a ChangeLog 2229
+SHA256 04945f741785436591e983e525fb1afbb6492a94c6192d130b5f98891428fdb1 ChangeLog 2229
+MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
 MD5 863fbf2306f1912d3dcf9c9af90381d4 files/digest-up-imapproxy-1.2.4 256
 RMD160 2e391f43001723aa76fd1c360fe6f7f6832e833b files/digest-up-imapproxy-1.2.4 256
 SHA256 d2bb59ecb04baf5f52bf70812c9fbba9b903c3452c48648e25ef72435f0a5b73 files/digest-up-imapproxy-1.2.4 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJxAbQlM6RnzZP+IRAsACAKDAGpsP9sOYEr70VmGFl284/FjlkQCfazd5
+weA+L4XUvSwABY+UDrGP90w=
+=PpQD
+-----END PGP SIGNATURE-----
diff --git a/net-mail/up-imapproxy/files/1.2.4-include-fix.patch b/net-mail/up-imapproxy/files/1.2.4-include-fix.patch
new file mode 100644
index 000000000000..eafcd1b31c2c
--- /dev/null
+++ b/net-mail/up-imapproxy/files/1.2.4-include-fix.patch
@@ -0,0 +1,10 @@
+--- up-imapproxy-1.2.4.orig/src/imapcommon.c
++++ up-imapproxy-1.2.4/src/imapcommon.c
+@@ -136,6 +136,7 @@
+ 
+ #include <openssl/evp.h>
+ #include <openssl/err.h>
++#include <openssl/md5.h>
+ 
+ #include <pthread.h>
+ #include <sys/types.h>
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild
index caa22e76332b..1b322a90f614 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild,v 1.2 2006/03/05 08:22:20 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild,v 1.3 2006/10/07 02:25:22 ticho Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 src_unpack() {
 	unpack ${A} && cd "${S}"
 	epatch "${FILESDIR}"/${PV}-string-format-fix.patch
+	epatch "${FILESDIR}"/${PV}-include-fix.patch
 	sed -i -e 's:in\.imapproxyd:imapproxyd:g'  \
 		README Makefile.in include/imapproxy.h || die "sed failed"
 }