summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Gagern <Martin.vGagern@gmx.net>2010-07-19 10:08:53 +0200
committerMartin von Gagern <Martin.vGagern@gmx.net>2010-07-19 10:08:53 +0200
commit6508318d7f742f755585cf30cedd9ab0d892aef8 (patch)
tree38ef304b2590fed35db43384d0b9ffd5dc06cd25 /app-crypt
parent[kde-base/kdelibs] Adjust for dev-libs/openssl-1.0.0a and its typesafe stacks. (diff)
downloadkde-sunset-6508318d7f742f755585cf30cedd9ab0d892aef8.tar.gz
kde-sunset-6508318d7f742f755585cf30cedd9ab0d892aef8.tar.bz2
kde-sunset-6508318d7f742f755585cf30cedd9ab0d892aef8.zip
[app-crypt/qca-tls] Adjust for dev-libs/openssl-1.0.0a and its stricter typing.
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/qca-tls/ChangeLog6
-rw-r--r--app-crypt/qca-tls/Manifest5
-rw-r--r--app-crypt/qca-tls/files/qca-openssl-1.0.0.patch17
-rw-r--r--app-crypt/qca-tls/qca-tls-1.0-r4.ebuild3
4 files changed, 27 insertions, 4 deletions
diff --git a/app-crypt/qca-tls/ChangeLog b/app-crypt/qca-tls/ChangeLog
index 4a8c24d7..73480a95 100644
--- a/app-crypt/qca-tls/ChangeLog
+++ b/app-crypt/qca-tls/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-crypt/qca-tls
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.57 2009/10/14 00:57:52 halcy0n Exp $
+ 19 Jul 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+ qca-tls-1.0-r4.ebuild, +files/qca-openssl-1.0.0.patch:
+ Adjust for dev-libs/openssl-1.0.0a and its stricter typing.
+
14 Oct 2009; Mark Loeser <halcy0n@gentoo.org> qca-tls-1.0-r3.ebuild:
QA fixes; unquoted variables
diff --git a/app-crypt/qca-tls/Manifest b/app-crypt/qca-tls/Manifest
index 6af8f73a..8937744a 100644
--- a/app-crypt/qca-tls/Manifest
+++ b/app-crypt/qca-tls/Manifest
@@ -1,6 +1,7 @@
AUX qca-openssl-0.9.8.patch 719 RMD160 1beac361d71e129183d038dc3abd24a9339cab42 SHA1 8df1067637ed44315ffa0bf37b1df814f4a522d5 SHA256 9879fa954ce63c107b568194e4a6ede4192d34f7a7cdb2ba14a5c95f20c287aa
+AUX qca-openssl-1.0.0.patch 408 RMD160 49346aa9ef082588cb01df81c30170cd0e33bf6d SHA1 7cc4a91d708ff11be03c7daf1007cb484650061f SHA256 8ac6734712a97d6728dbab52af1747adbb981e0c339485ec4a6748bc7094ea00
AUX qca-pathfix.patch 301 RMD160 4cd979b5e28eabfa773ce0aa46d42e9209c46ded SHA1 64c341415163c8a550d76ce92dc10838f8a71379 SHA256 12b86099556839cf1ad03fd56fa409e53bc120713ea0352a1ac6f7acb0e093d2
DIST qca-tls-1.0.tar.bz2 23489 RMD160 c553782e77ab54edde7e4f0676a3caad74dfa910 SHA1 775e764c5be342048eba11dae5c5fd3b636d23c5 SHA256 510edd7b1be3a4ac097b2b501fa908043aaa57f3efbab8e81cee0c8ae15af0cd
-EBUILD qca-tls-1.0-r4.ebuild 1064 RMD160 286b5c5f230a675ecab9c74f1703a681426ebc2b SHA1 2c86cc69edb42d47f77f2af6c6e72fa6803ab509 SHA256 282109e9c207e2e4dffa62eae343b299b63db6e0fd34548a056e7007cf92e6f3
-MISC ChangeLog 6280 RMD160 e7117a300c43334f0518735cbfc660b0265f5986 SHA1 862dd4f3dce7c3f66b8c3aa0e872f9ef1987ccb1 SHA256 ec3c9caf6b4d74500608b55ec2dd0a06197bc95fe9472ffde6175ba69b41947a
+EBUILD qca-tls-1.0-r4.ebuild 1110 RMD160 c6417d1b8931bcc9056803a34c254da68caf1324 SHA1 0c5a4561b9809ded05da6fc89ff43ba426629aae SHA256 5c82789e8fc545031034e4c3601b1105fa6d253033e5475e95771a3cc10c154e
+MISC ChangeLog 6464 RMD160 3b9bd50ffaafc3ab81b56785107ee2bb9f09d8f8 SHA1 80c313af064e80020052c16e0810ff7c27ee9c44 SHA256 301b1c2aa801179c6b6de61a68fc3bedbf9ea6374fa144e5aeead63ac8561978
MISC metadata.xml 175 RMD160 7b2f22c798e48fc11f071762f6acf20baaf40188 SHA1 a36f05b8242f0ca11a2efb95c6cfdc5cd7d93fb7 SHA256 1b062933bb6cf3e6d3bca8c2830f0b87701781bc4a3594229ad28e9bee874176
diff --git a/app-crypt/qca-tls/files/qca-openssl-1.0.0.patch b/app-crypt/qca-tls/files/qca-openssl-1.0.0.patch
new file mode 100644
index 00000000..1c9e5f18
--- /dev/null
+++ b/app-crypt/qca-tls/files/qca-openssl-1.0.0.patch
@@ -0,0 +1,17 @@
+Adjust for stricter typing in OpenSSL 1.0.0.
+
+2010-07-19 Martin von Gagern
+
+Index: qca-tls-1.0/qca-tls.cpp
+===================================================================
+--- qca-tls-1.0.orig/qca-tls.cpp
++++ qca-tls-1.0/qca-tls.cpp
+@@ -953,7 +953,7 @@ public:
+ RSAKeyContext *key;
+
+ SSL *ssl;
+- SSL_METHOD *method;
++ const SSL_METHOD *method;
+ SSL_CTX *context;
+ BIO *rbio, *wbio;
+ CertContext cc;
diff --git a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
index 7f64c357..c0b865d6 100644
--- a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
+++ b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild,v 1.9 2009/03/18 18:09:26 ranger Exp $
@@ -23,6 +23,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/qca-pathfix.patch
epatch "${FILESDIR}"/qca-openssl-0.9.8.patch
+ epatch "${FILESDIR}"/qca-openssl-1.0.0.patch
}
src_compile() {