1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
$NetBSD: patch-bd,v 1.8 2004/02/04 13:58:39 markd Exp $
--- kio/kssl/kopenssl.cc.orig 2003-11-30 22:47:08.000000000 +1300
+++ kio/kssl/kopenssl.cc
@@ -207,7 +207,7 @@ void KOpenSSLProxy::destroy() {
_me = 0L;
}
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__)
#include <qdir.h>
#include <qstring.h>
#include <qstringlist.h>
@@ -270,26 +270,23 @@ KConfig *cfg;
delete cfg;
-#ifdef __OpenBSD__
- {
- QString libname = findMostRecentLib("/usr/lib", "crypto");
- if (!libname.isNull())
- _cryptoLib = ll->globalLibrary(libname.latin1());
- }
-#else
libpaths
- #ifdef _AIX
+#ifdef _AIX
<< "/opt/freeware/lib/"
- #endif
+#endif
<< "/usr/lib/"
+ << "@LOCALBASE@/lib/"
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
<< "/usr/ssl/lib/"
<< "/usr/local/lib/"
<< "/usr/local/openssl/lib/"
<< "/usr/local/ssl/lib/"
<< "/opt/openssl/lib/"
<< "/lib/"
+#endif
<< "";
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
// FIXME: #define here for the various OS types to optimize
libnamess
#ifdef hpux
@@ -324,10 +321,16 @@ KConfig *cfg;
<< "libcrypto.so.0"
#endif
;
+#endif
for (QStringList::Iterator it = libpaths.begin();
it != libpaths.end();
++it) {
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+ QString libname = findMostRecentLib(*it, "crypto");
+ if (!libname.isNull())
+ _cryptoLib = ll->globalLibrary(libname.latin1());
+#else
for (QStringList::Iterator shit = libnamesc.begin();
shit != libnamesc.end();
++shit) {
@@ -341,9 +344,9 @@ KConfig *cfg;
_cryptoLib = ll->globalLibrary(alib.latin1());
if (_cryptoLib) break;
}
+#endif
if (_cryptoLib) break;
}
-#endif
if (_cryptoLib) {
#ifdef KSSL_HAVE_SSL
@@ -462,16 +465,14 @@ KConfig *cfg;
#endif
}
-#ifdef __OpenBSD__
- {
- QString libname = findMostRecentLib("/usr/lib", "ssl");
- if (!libname.isNull())
- _sslLib = ll->globalLibrary(libname.latin1());
- }
-#else
for (QStringList::Iterator it = libpaths.begin();
it != libpaths.end();
++it) {
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+ QString libname = findMostRecentLib(*it, "ssl");
+ if (!libname.isNull())
+ _sslLib = ll->globalLibrary(libname.latin1());
+#else
for (QStringList::Iterator shit = libnamess.begin();
shit != libnamess.end();
++shit) {
@@ -485,9 +486,9 @@ KConfig *cfg;
_sslLib = ll->globalLibrary(alib.latin1());
if (_sslLib) break;
}
+#endif
if (_sslLib) break;
}
-#endif
if (_sslLib) {
#ifdef KSSL_HAVE_SSL
|
