diff options
| author | jdolecek <jdolecek> | 2007-12-23 21:05:51 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2007-12-23 21:05:51 +0000 |
| commit | eb92e9f7b0e8e493e410b33e435508a6cc5f6dde (patch) | |
| tree | 2999cbe370e725e22796368df10fb806f2ffc110 /security/qca-tls/patches | |
| parent | 8645bded1571988a79872cd923a55e61d5a20393 (diff) | |
| download | pkgsrc-eb92e9f7b0e8e493e410b33e435508a6cc5f6dde.tar.gz | |
restore security/qca-tls to state on pkgsrc-2007Q3-base tag (just before
the removal), rather then revision 1.1 of all files, used for original revival
test compiled on Mac OS X 10.5
Diffstat (limited to 'security/qca-tls/patches')
| -rw-r--r-- | security/qca-tls/patches/patch-aa | 17 | ||||
| -rw-r--r-- | security/qca-tls/patches/patch-ab | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/security/qca-tls/patches/patch-aa b/security/qca-tls/patches/patch-aa index b508b4435b4..e99fca36063 100644 --- a/security/qca-tls/patches/patch-aa +++ b/security/qca-tls/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/12/20 20:37:27 jdolecek Exp $ +$NetBSD: patch-aa,v 1.5 2007/12/23 21:05:51 jdolecek Exp $ ---- configure.orig 2004-12-19 09:10:21.000000000 +0000 -+++ configure 2004-12-19 09:20:50.000000000 +0000 -@@ -144,8 +144,10 @@ +--- configure.orig 2003-12-17 17:54:50.000000000 -0500 ++++ configure +@@ -144,8 +144,10 @@ public: s = conf->getenv("QC_WITH_OPENSSL_LIB"); if(!s.isEmpty()) { @@ -13,3 +13,12 @@ $NetBSD: patch-aa,v 1.4 2007/12/20 20:37:27 jdolecek Exp $ lib = s; } else { +@@ -168,7 +170,7 @@ public: + if(kb) + ext += QString("-I") + kbdir + ' '; + if(!lib.isEmpty()) +- ext += QString("-L") + lib + " -lssl -lcrypto "; ++ ext += QString("-L") + lib + " " + QString("-R") + lib + " -lssl -lcrypto "; + int ret; + if(!conf->doCompileAndLink(str, ext, &ret)) + return false; diff --git a/security/qca-tls/patches/patch-ab b/security/qca-tls/patches/patch-ab index 2b53de120ff..fb9a83331e4 100644 --- a/security/qca-tls/patches/patch-ab +++ b/security/qca-tls/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2007/12/20 20:37:27 jdolecek Exp $ +$NetBSD: patch-ab,v 1.5 2007/12/23 21:05:51 jdolecek Exp $ --- qca-tls.cpp.orig 2005-12-27 22:22:32.000000000 +0000 +++ qca-tls.cpp @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.4 2007/12/20 20:37:27 jdolecek Exp $ if(!r) { // try this other public function, for whatever reason p = (void *)in; -+#ifdef OSSL_097 ++#if OPENSSL_VERSION_NUMBER >= 0x00908000 + r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len); +#else r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len); @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.4 2007/12/20 20:37:27 jdolecek Exp $ bool createFromDER(const char *in, unsigned int len) { -+#ifdef OSSL_097 ++#if OPENSSL_VERSION_NUMBER >= 0x00908000 + const unsigned char *p = (const unsigned char *)in; +#else unsigned char *p = (unsigned char *)in; |