pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/p5-Net-SSLeay make this build with newer Open...
details: https://anonhg.NetBSD.org/pkgsrc/rev/93c47ac8ba42
branches: trunk
changeset: 562513:93c47ac8ba42
user: drochner <drochner%pkgsrc.org@localhost>
date: Thu Jul 30 14:54:39 2009 +0000
description:
make this build with newer OpenSSL versions
tested with:
-1.0.0beta3 (which already identifies itself as 1.0.0)
-the snapshot in NetBSD-current (identifies itself as 1.1.0)
-the 0.9.8 we had in -current before
diffstat:
security/p5-Net-SSLeay/distinfo | 4 ++-
security/p5-Net-SSLeay/patches/patch-aa | 48 +++++++++++++++++++++++++++++++++
security/p5-Net-SSLeay/patches/patch-ab | 12 ++++++++
3 files changed, 63 insertions(+), 1 deletions(-)
diffs (80 lines):
diff -r 54852e8f64e3 -r 93c47ac8ba42 security/p5-Net-SSLeay/distinfo
--- a/security/p5-Net-SSLeay/distinfo Thu Jul 30 13:08:45 2009 +0000
+++ b/security/p5-Net-SSLeay/distinfo Thu Jul 30 14:54:39 2009 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.20 2008/08/03 20:35:30 he Exp $
+$NetBSD: distinfo,v 1.21 2009/07/30 14:54:39 drochner Exp $
SHA1 (Net-SSLeay-1.35.tar.gz) = dc295d4a7da8ab330aca13c45e2cb5b8220aa5e4
RMD160 (Net-SSLeay-1.35.tar.gz) = b8f0afb29507624566665f3a835c3c87fd1e7996
Size (Net-SSLeay-1.35.tar.gz) = 132198 bytes
+SHA1 (patch-aa) = 299303c3afabeae0b41fee55c5dcb6ce1ea38133
+SHA1 (patch-ab) = 26d8af03934729ee0b152e33f51cfa3fb6b0d39d
diff -r 54852e8f64e3 -r 93c47ac8ba42 security/p5-Net-SSLeay/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/p5-Net-SSLeay/patches/patch-aa Thu Jul 30 14:54:39 2009 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.1 2009/07/30 14:54:39 drochner Exp $
+
+--- SSLeay.xs.orig 2008-07-24 03:03:22.000000000 +0200
++++ SSLeay.xs
+@@ -89,6 +89,7 @@ extern "C" {
+ */
+ #undef _
+
++#define BLOCK osslBLOCK
+ #include <openssl/err.h>
+ #include <openssl/lhash.h>
+ #include <openssl/rand.h>
+@@ -1243,6 +1244,14 @@ SSL_CTX_set_options(ctx,op)
+ SSL_CTX * ctx
+ long op
+
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++
++LHASH_OF(SSL_SESSION) *
++SSL_CTX_sessions(ctx)
++ SSL_CTX * ctx
++
++#else
++
+ LHASH *
+ SSL_CTX_sessions(ctx)
+ SSL_CTX * ctx
+@@ -1253,6 +1262,8 @@ SSL_CTX_sessions(ctx)
+ OUTPUT:
+ RETVAL
+
++#endif
++
+ unsigned long
+ SSL_CTX_sess_number(ctx)
+ SSL_CTX * ctx
+@@ -2124,11 +2135,6 @@ int
+ SSL_renegotiate(s)
+ SSL * s
+
+-int
+-SSL_SESSION_cmp(a,b)
+- SSL_SESSION * a
+- SSL_SESSION * b
+-
+ void *
+ SSL_SESSION_get_ex_data(ss,idx)
+ SSL_SESSION * ss
diff -r 54852e8f64e3 -r 93c47ac8ba42 security/p5-Net-SSLeay/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/p5-Net-SSLeay/patches/patch-ab Thu Jul 30 14:54:39 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2009/07/30 14:54:39 drochner Exp $
+
+--- typemap.orig 2008-07-24 03:03:22.000000000 +0200
++++ typemap
+@@ -15,6 +15,7 @@ BIO_METHOD * T_IV
+ EVP_PKEY * T_IV
+ CERT * T_IV
+ LHASH * T_IV
++LHASH_OF(SSL_SESSION) * T_IV
+ struct cert_st * T_IV
+ X509_STORE_CTX * T_IV
+ ASN1_UTCTIME * T_IV
Home |
Main Index |
Thread Index |
Old Index