457be5bac5
* Rewrite the name-resolution routines so that true asynchronous lookups
are possible (multithreaded). Thiago Macieira
* kconf_update has now support for updating files other than config
files. Waldo Bastian
* Crypto certificates import without user interaction Helge Deller
* KEditToolbar: Add support for arranging actions via drag&drop. Sandro
Giessl
* Move KNewStuff to kdelibs, making it usable for KDE-Edu etc. Josef
Spillner
* Introduce KIMIface, a generic DCOP interface to instant messaging/chat
clients, and support libraries for other KDE apps, enabling loosely
coupled integration. Will Stephenson
* Show actions icons in the configure shortcut dialog. Olivier Goffart
* KKeyDialog: add widget (based on klistviewsearchline) for searching
shortcuts Cristian Tibirna
* User visible feedback if invocation of browser, help Center or mailer
fails
* KImgIO
o Add EXR image plugin, supports reading high dynamic range files.
Brad Hards
o Add support for SGI images (a.k.a. "RGB" images). These do typically
have file extensions *.rgb, *.rgba, *.sgi, or *.bw. The SGI image
file format is a de-facto standard for textures, for example in 3D
modeling. Melchior Franz
o Add read support for DDS images (Direct Draw Surface). This format
is mainly used for textures in DirectX. Ignacio Castaño
* libkabc
o Write support and SSL/TLS for the LDAP resource Szombathelyi György
* KLocale
o Try harder to find message translations if a string is not translated
in the primary language of the user, but available in other languages
that the user has chosen in kcontrol. Heiko Evermann
* KSpell2
o Introduction of the new spellchecking library fixing all of KSpell
shortcomings. Zack Rusin
* KHTML part
o KHTML: Merge text shifting from WebCore. Leo Savernik
o KHTML: Type-ahead find Arend van Beelen jr.
o Copy To->IM Contact... context menu entry. Using kimproxy, allow one
to initiate a file transfer from Konqueror. Will Stephenson
o Added "Open in This Window" in popup frame submenu
o New context menu when text is selected which allows lookup in default
search engine
o Fixed and improved Access Key support: now activated by pressing and
releasing the ctrl key. When activated, the accesskey mode displays all
accesskeys available in tooltips Jean-Baptiste Mardelle
107 lines
3 KiB
Text
107 lines
3 KiB
Text
$NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
|
|
|
|
--- kio/kssl/kopenssl.cc.orig 2004-05-23 08:55:48.000000000 +1200
|
|
+++ kio/kssl/kopenssl.cc
|
|
@@ -215,7 +215,7 @@ void KOpenSSLProxy::destroy() {
|
|
_me = 0L;
|
|
}
|
|
|
|
-#ifdef __OpenBSD__
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
#include <qdir.h>
|
|
#include <qstring.h>
|
|
#include <qstringlist.h>
|
|
@@ -278,26 +278,23 @@ KConfig *cfg;
|
|
|
|
delete cfg;
|
|
|
|
-#ifdef __OpenBSD__
|
|
- {
|
|
- QString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
|
|
- if (!libname.isNull())
|
|
- _cryptoLib = ll->globalLibrary(libname.latin1());
|
|
- }
|
|
-#else
|
|
libpaths
|
|
- #ifdef _AIX
|
|
+#ifdef _AIX
|
|
<< "/opt/freeware/lib/"
|
|
- #endif
|
|
+#endif
|
|
<< "/usr/lib" KDELIBSUFF "/"
|
|
+ << "@LOCALBASE@/lib/"
|
|
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
|
|
<< "/usr/ssl/lib" KDELIBSUFF "/"
|
|
<< "/usr/local/lib" KDELIBSUFF "/"
|
|
<< "/usr/local/openssl/lib" KDELIBSUFF "/"
|
|
<< "/usr/local/ssl/lib" KDELIBSUFF "/"
|
|
<< "/opt/openssl/lib" KDELIBSUFF "/"
|
|
<< "/lib" KDELIBSUFF "/"
|
|
+#endif
|
|
<< "";
|
|
|
|
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
|
|
// FIXME: #define here for the various OS types to optimize
|
|
libnamess
|
|
#ifdef hpux
|
|
@@ -332,10 +329,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) {
|
|
@@ -349,9 +352,9 @@ KConfig *cfg;
|
|
_cryptoLib = ll->globalLibrary(alib.latin1());
|
|
if (_cryptoLib) break;
|
|
}
|
|
+#endif
|
|
if (_cryptoLib) break;
|
|
}
|
|
-#endif
|
|
|
|
if (_cryptoLib) {
|
|
#ifdef KSSL_HAVE_SSL
|
|
@@ -478,16 +481,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) {
|
|
@@ -501,9 +502,9 @@ KConfig *cfg;
|
|
_sslLib = ll->globalLibrary(alib.latin1());
|
|
if (_sslLib) break;
|
|
}
|
|
+#endif
|
|
if (_sslLib) break;
|
|
}
|
|
-#endif
|
|
|
|
if (_sslLib) {
|
|
#ifdef KSSL_HAVE_SSL
|