From 3ead64174594d958483ad121aa45cedffd416d59 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 24 Jul 2009 10:56:46 +0000
Subject: deal with incompatibilities of newer openssl to make it build on
 NetBSD-current again, fixes PR pkg/41770 by Ryo HAYASAKA

---
 x11/qt4-libs/distinfo         |  5 ++++-
 x11/qt4-libs/patches/patch-ba | 13 +++++++++++++
 x11/qt4-libs/patches/patch-bb | 17 +++++++++++++++++
 x11/qt4-libs/patches/patch-bc | 17 +++++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 x11/qt4-libs/patches/patch-ba
 create mode 100644 x11/qt4-libs/patches/patch-bb
 create mode 100644 x11/qt4-libs/patches/patch-bc

(limited to 'x11/qt4-libs')

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 92ae15ba4cd..1c18e0f0027 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2009/07/07 16:36:05 drochner Exp $
+$NetBSD: distinfo,v 1.32 2009/07/24 10:56:46 drochner Exp $
 
 SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
 RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
@@ -24,3 +24,6 @@ SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
 SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
+SHA1 (patch-ba) = 669bd9b71edfe861b2945d696cf5fa151d0d48af
+SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9
+SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d
diff --git a/x11/qt4-libs/patches/patch-ba b/x11/qt4-libs/patches/patch-ba
new file mode 100644
index 00000000000..94c6c6563c4
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2009/07/24 10:56:46 drochner Exp $
+
+--- src/network/ssl/qsslcertificate.cpp.orig	2009-06-20 06:57:57.000000000 +0200
++++ src/network/ssl/qsslcertificate.cpp
+@@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
+     if (!d->x509)
+         return result;
+ 
+-    STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
++    STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
+ 
+     if (altNames) {
+         for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
diff --git a/x11/qt4-libs/patches/patch-bb b/x11/qt4-libs/patches/patch-bb
new file mode 100644
index 00000000000..27b989d6a6e
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-bb
@@ -0,0 +1,17 @@
+$NetBSD: patch-bb,v 1.1 2009/07/24 10:56:46 drochner Exp $
+
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2009-06-20 06:57:57.000000000 +0200
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -142,9 +142,9 @@ DEFINEFUNC2(int, PEM_write_bio_RSA_PUBKE
+ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG)
+ DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return)
+ DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
+-DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
+-DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
+-DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
++DEFINEFUNC(void, sk_free, STACK_OF(GENERAL_NAME) *a, a, return, DUMMYARG)
++DEFINEFUNC(int, sk_num, STACK_OF(GENERAL_NAME) *a, a, return -1, return)
++DEFINEFUNC2(char *, sk_value, STACK_OF(GENERAL_NAME) *a, a, int b, b, return 0, return)
+ DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
+ DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
+ DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
diff --git a/x11/qt4-libs/patches/patch-bc b/x11/qt4-libs/patches/patch-bc
new file mode 100644
index 00000000000..6b39fec109f
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-bc
@@ -0,0 +1,17 @@
+$NetBSD: patch-bc,v 1.1 2009/07/24 10:56:46 drochner Exp $
+
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2009-06-20 06:57:57.000000000 +0200
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -254,9 +254,9 @@ int q_PEM_write_bio_RSA_PUBKEY(BIO *a, R
+ void q_RAND_seed(const void *a, int b);
+ int q_RAND_status();
+ void q_RSA_free(RSA *a);
+-void q_sk_free(STACK *a);
+-int q_sk_num(STACK *a);
+-char * q_sk_value(STACK *a, int b);
++void q_sk_free(STACK_OF(GENERAL_NAME) *a);
++int q_sk_num(STACK_OF(GENERAL_NAME) *a);
++char * q_sk_value(STACK_OF(GENERAL_NAME) *a, int b);
+ int q_SSL_accept(SSL *a);
+ int q_SSL_clear(SSL *a);
+ char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
-- 
cgit v1.2.3