From 2004e3ba5768d3a2917208208fd0f00caae920a9 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 12 Jul 2010 16:00:52 +0000 Subject: Fix building with OpenSSL >= 1.0.0 wrt #327937 by Diego E. Pettenò. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-analyzer/postal/ChangeLog | 8 ++++-- net-analyzer/postal/Manifest | 5 ++-- .../postal/files/05_postal-0.70-openssl-1.patch | 30 ++++++++++++++++++++++ net-analyzer/postal/postal-0.70.ebuild | 5 ++-- 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 net-analyzer/postal/files/05_postal-0.70-openssl-1.patch (limited to 'net-analyzer/postal') diff --git a/net-analyzer/postal/ChangeLog b/net-analyzer/postal/ChangeLog index b1789c92da0e..b4edf6393dcf 100644 --- a/net-analyzer/postal/ChangeLog +++ b/net-analyzer/postal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/postal -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.6 2008/06/15 12:23:26 dertobi123 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.7 2010/07/12 16:00:52 ssuominen Exp $ + + 12 Jul 2010; Samuli Suominen postal-0.70.ebuild, + +files/05_postal-0.70-openssl-1.patch: + Fix building with OpenSSL >= 1.0.0 wrt #327937 by Diego E. Pettenò. *postal-0.70 (15 Jun 2008) diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest index 2b6109489b5c..e9155220373d 100644 --- a/net-analyzer/postal/Manifest +++ b/net-analyzer/postal/Manifest @@ -2,9 +2,10 @@ AUX 01_postal-0.70-gcc43.patch 268 RMD160 182ea97d399e25c6d7b7521d8d1213d7f3ac7c AUX 02_postal-0.70-nossl.patch 1945 RMD160 e9dd1ff6e8171277f9290debe6c89a931d0f411f SHA1 14d0fa3e3ff39462fe43ca6d0353420afe1f58bf SHA256 47b7b3ae380076504e9bf98df59255a807d5ca3b33895bf9823d4c6e005044c2 AUX 03_postal-0.70-c++0x-integrated.patch 7118 RMD160 a6e4a5af4033ed9235fe8f2c405128f4523852e0 SHA1 c59d0039cfe8f4c640d3e33e34a67e9787454c0b SHA256 687341a58889402a0681d0630b1a7ef2380129af34a431c5358fe454cb0e37ed AUX 04_postal-0.70-warnings.patch 445 RMD160 0574ab04ebebbf2ecdf92bb17937212934976ce9 SHA1 dc8a4f0bd1dcd7970799329d2d0a7ad79a5895fa SHA256 369b174bc39454cd6ca854cb05d403a56f739a1ab341a22bd2192a73e43791d1 +AUX 05_postal-0.70-openssl-1.patch 529 RMD160 87e0e347aa87c3527fd39022f7aef17954b28a83 SHA1 474a95d108a24b2d74cd0dc6f92d0afafcb41d7e SHA256 552d803986a8adba0f7b88337ba215b41eb0c14a6f61f93e88821dfdb5269b54 DIST postal-0.62.tgz 84506 RMD160 694800444ff33c7c64c5b7915ef5438fdb3605f3 SHA1 6379ac223964921963389c8c600a1ba4b24a6ab3 SHA256 937252ddff2576364f3ea5ce05a9247ec5ab8e043a951c6c1ad6ce15d016ddd6 DIST postal-0.70.tgz 99965 RMD160 2b23ab0d60abfeaad32adf7ba65134d0f267294a SHA1 d02dc900eb645aa993c5747fa434a0af4b0fb7e0 SHA256 ce7f7650fbe1aecc7543dbbdc74e86229c03e14e3534193341ad78dfb8662b42 EBUILD postal-0.62.ebuild 811 RMD160 26bceace758af659d50637fb043c2b003ce4ad70 SHA1 7be5ac863877b0a46712f5fa50a65f8ee460e261 SHA256 ce589d42e036ace8bb4781f337bd5e9a20d7f75c912c6d4d391d9f7d62bd548b -EBUILD postal-0.70.ebuild 1182 RMD160 ce00690c59e8f30b5ea99444a6996ed54c309f37 SHA1 8bc9c0cb6ea0d737ac0a3c034c34f49770215522 SHA256 b4d9204350bd3237108da02ae20bfcf0ea5accb28fcb7903f4212089761eacdb -MISC ChangeLog 1280 RMD160 8ada0668131adfad67ef1db8e8d5bb358b5a9785 SHA1 549754be4f850201f54226614531a6d014bf97bc SHA256 4bc3acf6f3ec8ed9c6e1be85bbc32b80dba2e832c10afbd1321a62324df4a4fd +EBUILD postal-0.70.ebuild 1227 RMD160 2d1392dba78f0005e3b589a64f91944ebb33441b SHA1 31e9fff09f667e1ebda905b24a0347414f075144 SHA256 f084d4285e9c8458d083551332735506650bbdef8d307f7f104d647c8797d393 +MISC ChangeLog 1466 RMD160 63d2f242c91d8aa95cc30000ef1ccbe761cf8c4d SHA1 186502f1ec4af0fbfed1306a87d49fd606e57928 SHA256 386d2847e6f0f30afd44f1ccfc52c781bfdc771bb7ab6816dd3d5560d0f5404d MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b diff --git a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch new file mode 100644 index 000000000000..5b5c054ac98c --- /dev/null +++ b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch @@ -0,0 +1,30 @@ +http://bugs.gentoo.org/327937 + +--- basictcp.h ++++ basictcp.h +@@ -89,7 +89,11 @@ + + #ifdef USE_SSL + #ifdef USE_OPENSSL ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_sslMeth; ++ #else + SSL_METHOD *m_sslMeth; ++ #endif + SSL_CTX* m_sslCtx; + SSL *m_ssl; + #else +--- tcp.h ++++ tcp.h +@@ -100,7 +100,11 @@ + + #ifdef USE_SSL + #ifdef USE_OPENSSL ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_sslMeth; ++ #else + SSL_METHOD *m_sslMeth; ++ #endif + SSL_CTX* m_sslCtx; + SSL *m_ssl; + #else diff --git a/net-analyzer/postal/postal-0.70.ebuild b/net-analyzer/postal/postal-0.70.ebuild index 7584f981e647..0451bd2b0828 100644 --- a/net-analyzer/postal/postal-0.70.ebuild +++ b/net-analyzer/postal/postal-0.70.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/postal-0.70.ebuild,v 1.1 2008/06/15 12:23:26 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/postal-0.70.ebuild,v 1.2 2010/07/12 16:00:52 ssuominen Exp $ inherit autotools eutils @@ -32,6 +32,7 @@ src_unpack() { epatch "${FILESDIR}/02_${P}-nossl.patch" epatch "${FILESDIR}/03_${P}-c++0x-integrated.patch" epatch "${FILESDIR}/04_${P}-warnings.patch" + epatch "${FILESDIR}/05_${P}-openssl-1.patch" eautoreconf } -- cgit v1.2.3-65-gdbad