Fix building with OpenSSL >= 1.0.0 wrt #326959 by Diego E. 'FlaPettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 32 insertions, 5 deletions

diff --git a/dev-cpp/sptk/ChangeLog b/dev-cpp/sptk/ChangeLog
index 325ba6014996..73602f34ffe3 100644
--- a/dev-cpp/sptk/ChangeLog
+++ b/dev-cpp/sptk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/sptk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.69 2010/06/17 20:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.70 2010/07/11 06:35:48 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> sptk-4.02.ebuild,
+  +files/sptk-4.02-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326959 by Diego E. 'FlaPettenò.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> sptk-3.5.8.10.ebuild,
   sptk-3.5.8.14.ebuild, sptk-3.5.8.14-r1.ebuild, sptk-4.00.ebuild,
diff --git a/dev-cpp/sptk/Manifest b/dev-cpp/sptk/Manifest
index b79bc4ebb0a3..4e12c30ecc1f 100644
--- a/dev-cpp/sptk/Manifest
+++ b/dev-cpp/sptk/Manifest
@@ -1,5 +1,6 @@
 AUX sptk-3.5.8.14-as-needed.patch 532 RMD160 45ec102b9d50ecf23e534b81e3ed265213878569 SHA1 439e866ad8e001a47341e3b194513a0bb5238727 SHA256 beafde068e1d51e90030edebcccf0693b9ed6c5f745ce91cbb18cdb5c0f12993
 AUX sptk-4.00-as-needed.patch 442 RMD160 eb9b33b71de3dfb00dffca4187091962de5e3a7f SHA1 2aa3d7e676d7e7aafaa9d2b20a1a812fa3503569 SHA256 e36dcc1e93e9cce2e14563edc7d35d935e381ca3b421e5a68ef1f21114b541a5
+AUX sptk-4.02-openssl-1.patch 505 RMD160 e7067437542da8088b382552ddbda23422e88672 SHA1 3f527c61d2b60b0f5f8bc6a5392b29fc11970f3b SHA256 5df8a1597a0b16a5ccf742f365f2ec349679b637d52ee3e2d0685f91f2cc0844
 AUX sptk-gcc-4.4.patch 1657 RMD160 6711fa4e6a3ddac7ff4a484d6328783a87e952b8 SHA1 fc0b65e5f5991bd83820243ff25a341a4147553a SHA256 9af109eb625369b0eb9abc36ddec3930c5f43aee52993fa3de882ca022ae0990
 DIST sptk-3.5.8.10.tbz2 4372961 RMD160 863cdd10631abf5895dd8f36d1e3e97504bf8f26 SHA1 1abd960108d06438022448822da1e954651e11f9 SHA256 ae5ceaa771252ff551aac857197b6bcc3d36c6aa1fde1653b26d5367e2283205
 DIST sptk-3.5.8.14.tbz2 4378384 RMD160 47d57c1992a3005ab2bb74a5bb5c9c117f8673ad SHA1 e45b5999ee128e690262e4d915d43dfe61cc2c95 SHA256 4becafebe46b6765ae4b3f1aeeb10e64968d4e1dd8a8529b402e515c53c3be4e
@@ -9,6 +10,6 @@ EBUILD sptk-3.5.8.10.ebuild 1813 RMD160 1c2473ddeb770e9b7d4bb918f2e46fa8c9a31966
 EBUILD sptk-3.5.8.14-r1.ebuild 1929 RMD160 55375fa8bb285626198bc24e351943f27e6d4ceb SHA1 d72d8d6bca51de19f7d76b634e7630607d1722b6 SHA256 931520de3ede6d9b01038731653f63529784d589239d2b6601d71575ff789a41
 EBUILD sptk-3.5.8.14.ebuild 1813 RMD160 bca1f9ebaf6fe4bdfb64e01ebc2bd586cd95da29 SHA1 a7a54c15c0ee332b92d7b02e145ca7b5a4166161 SHA256 47c6333f66f78aded8530f2c8b9a627a3654cdcaad3f9e8dc7f61894df1ce240
 EBUILD sptk-4.00.ebuild 1883 RMD160 c9b097dfed04ef7deaa55cabdd751bfd3d39f6e5 SHA1 258ba5bdb2805cd806c84bc6ce2a27216983a5e5 SHA256 38667f335a64588a0601fb5782207fdd6150a6d927e21f670ce666579153f9cc
-EBUILD sptk-4.02.ebuild 1901 RMD160 5e21e00566c5342fdf1622e11307edc904dcb90f SHA1 ca6244624d1aa764977cefa22272ebec3d1ff8e4 SHA256 db698a1f6b5f46d214bc2b7f5394e925b7d83d49e34f34b2a9dbc66d6d40336d
-MISC ChangeLog 10426 RMD160 3848906c72b6a28860d20b76b75a8f494c6e2f04 SHA1 f8f701ad150b9b8b56369598a28a96d53560ad97 SHA256 dac081bb7cd01012706088f4eb65d199fbd1ef7d02a7ee6e49c321a0a1afed2f
+EBUILD sptk-4.02.ebuild 1995 RMD160 a53f3aa1bc0683bfcbbc430cc57201a80ae61d2d SHA1 8259d8332e70136e2ec6ef1cc9301d855ad4f0d3 SHA256 57c36257cb0b9a11d722b96bacc19a46c30c880af3a481303a0ebe88ada5e687
+MISC ChangeLog 10612 RMD160 3852d1a8349d92614cae006c245dbf5028d3e904 SHA1 c18ca18e7ae6b99f265cd7627d83193d6835e8d1 SHA256 226faeede9f5c0703c8f69fdfcd246dab5673ca5a9e42ddfafa899158303c233
 MISC metadata.xml 464 RMD160 2ac8ec514dbbee12ae8bd7be1ca0bfc41eb3386c SHA1 ec484dafdab9c4a59d6531021e2f59742b4184c5 SHA256 ad2d2d7f242bc2f8c27bc4733d1c97460b3fe5e7ef52e27f52185b74768c542e
diff --git a/dev-cpp/sptk/files/sptk-4.02-openssl-1.patch b/dev-cpp/sptk/files/sptk-4.02-openssl-1.patch
new file mode 100644
index 000000000000..df28abfb8184
--- /dev/null
+++ b/dev-cpp/sptk/files/sptk-4.02-openssl-1.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/326959
+
+--- src/encryption/CSymmetricSSLEncryption.cpp
++++ src/encryption/CSymmetricSSLEncryption.cpp
+@@ -48,9 +48,11 @@
+     memcpy(m_key, key, sizeof(m_key));
+     memcpy(m_vec, vec, sizeof(m_vec));
+     EVP_CipherInit_ex(&m_ctx, cipher, NULL, m_key, m_vec, direction);
++#if OPENSSL_VERSION_NUMBER < 0x10000000L
+ #ifdef EVP_CIPH_FLAG_LENGTH_BITS
+     M_EVP_CIPHER_CTX_set_flags(&m_ctx, EVP_CIPH_FLAG_LENGTH_BITS);
+ #endif
++#endif
+ }
+ 
+ CSymmetricSSLCipher::~CSymmetricSSLCipher()
diff --git a/dev-cpp/sptk/sptk-4.02.ebuild b/dev-cpp/sptk/sptk-4.02.ebuild
index c9e204fd5f00..32085499ad9d 100644
--- a/dev-cpp/sptk/sptk-4.02.ebuild
+++ b/dev-cpp/sptk/sptk-4.02.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-4.02.ebuild,v 1.2 2010/06/17 20:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-4.02.ebuild,v 1.3 2010/07/11 06:35:48 ssuominen Exp $
 
 EAPI=1
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 IUSE="fltk odbc doc sqlite excel postgres aspell mysql gnutls"
 
@@ -29,6 +29,12 @@ DEPEND="${RDEPEND}
 
 CMAKE_IN_SOURCE_BUILD=1
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+}
+
 src_compile() {
 	local mycmakeargs="$(cmake-utils_use_no postgres POSTGRESQL)
 	$(cmake-utils_use_no mysql MYSQL)