head 1.15; access; symbols pkgsrc-2017Q3:1.14.0.68 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.64 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.62 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.60 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.58 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.56 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.54 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.52 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.50 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.48 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.46 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.44 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.42 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.40 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.38 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.36 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.34 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.32 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.30 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.14.0.28 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.26 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.24 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.22 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.20 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.18 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.16 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.14 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.14.0.12 pkgsrc-2010Q4-base:1.14 pkgsrc-2010Q3:1.14.0.10 pkgsrc-2010Q3-base:1.14 pkgsrc-2010Q2:1.14.0.8 pkgsrc-2010Q2-base:1.14 pkgsrc-2010Q1:1.14.0.6 pkgsrc-2010Q1-base:1.14 pkgsrc-2009Q4:1.14.0.4 pkgsrc-2009Q4-base:1.14 pkgsrc-2009Q3:1.14.0.2 pkgsrc-2009Q3-base:1.14 pkgsrc-2009Q2:1.13.0.14 pkgsrc-2009Q2-base:1.13 pkgsrc-2009Q1:1.13.0.12 pkgsrc-2009Q1-base:1.13 pkgsrc-2008Q4:1.13.0.10 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.8 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.6 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.4 pkgsrc-2008Q2-base:1.13 cwrapper:1.13.0.2 pkgsrc-2008Q1:1.12.0.14 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.12 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.10 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.8 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.6 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.4 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.2 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.10.0.6 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.4 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.2 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.9.0.10 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.8 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.6 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.9.0.4 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.2 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.2.0.4 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.2 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.15 date 2017.09.26.10.27.21; author wiz; state dead; branches; next 1.14; commitid 9ARpkXTuh9Wg2H8A; 1.14 date 2009.08.31.20.54.27; author wiz; state Exp; branches; next 1.13; 1.13 date 2008.05.17.02.28.17; author markd; state Exp; branches; next 1.12; 1.12 date 2006.09.11.19.03.50; author joerg; state Exp; branches; next 1.11; 1.11 date 2006.09.11.09.10.01; author joerg; state Exp; branches; next 1.10; 1.10 date 2005.12.11.10.53.54; author markd; state Exp; branches; next 1.9; 1.9 date 2004.08.21.12.16.45; author markd; state Exp; branches; next 1.8; 1.8 date 2004.02.04.13.58.39; author markd; state Exp; branches; next 1.7; 1.7 date 2003.05.22.02.42.42; author markd; state Exp; branches; next 1.6; 1.6 date 2003.05.13.10.01.54; author markd; state Exp; branches; next 1.5; 1.5 date 2003.03.11.13.10.36; author markd; state Exp; branches; next 1.4; 1.4 date 2002.08.28.07.15.44; author skrll; state Exp; branches; next 1.3; 1.3 date 2002.08.25.19.23.53; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.08.15.08.22.10; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.47; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.29; author jlam; state Exp; branches; next 1.1.1.1.2.3; 1.1.1.1.2.3 date 2002.08.22.11.13.43; author jlam; state Exp; branches; next ; desc @@ 1.15 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-bd,v 1.14 2009/08/31 20:54:27 wiz Exp $ --- kio/kssl/kopenssl.cc.orig 2006-07-22 20:16:39.000000000 +1200 +++ kio/kssl/kopenssl.cc @@@@ -96,9 +96,14 @@@@ static int (*K_BIO_write) (BIO *b, cons static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, const EVP_CIPHER *,unsigned char *,int , pem_password_cb *, void *) = 0L; +#if OPENSSL_VERSION_NUMBER < 0x00909000L static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; +#else +static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; +static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; +#endif static int (*K_X509_print_fp) (FILE *, X509*) = 0L; static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; @@@@ -217,7 +222,7 @@@@ void KOpenSSLProxy::destroy() { _me = 0L; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include #include #include @@@@ -240,10 +245,20 @@@@ static QString findMostRecentLib(QString for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) { QString numberpart = (*it).mid(s); uint endmaj = numberpart.find('.'); - if (endmaj == -1) - continue; bool ok; - int maj = numberpart.left(endmaj).toInt(&ok); + int maj; + if (endmaj == -1) { + int maj = numberpart.toInt(&ok); + if (!ok) + continue; + if (maj <= bestmaj) + continue; + bestmaj = maj; + bestmin = -1; + best = (*it); + continue; + } + maj = numberpart.left(endmaj).toInt(&ok); if (!ok) continue; int min = numberpart.mid(endmaj+1).toInt(&ok); @@@@ -280,42 +295,23 @@@@ KConfig *cfg; delete cfg; -#ifdef __OpenBSD__ - { - QString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto"); - if (!libname.isNull()) - _cryptoLib = ll->globalLibrary(libname.latin1()); - } -#elif defined(__CYGWIN__) - libpaths << "/usr/bin/" - << "/usr/local/bin" - << "/usr/local/openssl/bin" - << "/opt/openssl/bin" - << "/opt/kde3/bin" - << ""; - - libnamess << "cygssl-0.9.7.dll" - << "cygssl.dll" - << "libssl.dll" - << ""; - - libnamesc << "cygcrypto.dll" - << "libcrypto.dll" - << ""; -#else libpaths - #ifdef _AIX +#ifdef _AIX << "/opt/freeware/lib/" - #endif +#endif << "/usr/lib" KDELIBSUFF "/" + << "/usr/pkg/lib/" +#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) << "/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__) && !defined(__DragonFly__) // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux @@@@ -330,8 +326,12 @@@@ KConfig *cfg; << "libssl.so." SHLIB_VERSION_NUMBER #endif << "libssl.so" + #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + << "libssl.so.1" + #else << "libssl.so.0" #endif + #endif ; libnamesc @@@@ -347,14 +347,23 @@@@ KConfig *cfg; << "libcrypto.so." SHLIB_VERSION_NUMBER #endif << "libcrypto.so" + #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + << "libcrypto.so.1" + #else << "libcrypto.so.0" #endif + #endif ; #endif for (QStringList::Iterator it = libpaths.begin(); it != libpaths.end(); ++it) { +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + QString libname = findMostRecentLib(*it, "crypto"); + if (!libname.isNull()) + _cryptoLib = ll->globalLibrary(libname.latin1()); +#else for (QStringList::Iterator shit = libnamesc.begin(); shit != libnamesc.end(); ++shit) { @@@@ -368,6 +377,7 @@@@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } +#endif if (_cryptoLib) break; } @@@@ -404,9 +414,14 @@@@ KConfig *cfg; K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); +#if OPENSSL_VERSION_NUMBER < 0x00909000L K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); +#else + K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); + K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); +#endif K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); @@@@ -497,16 +512,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__) || defined(__DragonFly__) + QString libname = findMostRecentLib(*it, "ssl"); + if (!libname.isNull()) + _sslLib = ll->globalLibrary(libname.latin1()); +#else for (QStringList::Iterator shit = libnamess.begin(); shit != libnamess.end(); ++shit) { @@@@ -520,10 +533,10 @@@@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } +#endif if (_sslLib) break; } -#endif - + if (_sslLib) { #ifdef KSSL_HAVE_SSL // stand back from your monitor and look at this. it's fun! :) @@@@ -568,7 +581,7 @@@@ KConfig *cfg; K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); - K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); + K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); #endif @@@@ -957,6 +970,8 @@@@ int KOpenSSLProxy::PEM_write_bio_X509(BI } +#if OPENSSL_VERSION_NUMBER < 0x00909000L + ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); else return 0L; @@@@ -968,6 +983,13 @@@@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); else return -1; } +#else +int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { + if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) + return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); + else return -1; +} +#endif int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { @ 1.14 log @Fix build with openssl-1.0. From markd. Enable openssl again on NetBSD-current. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @Deal with openssl changes in -current. @ text @d1 1 a1 1 $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $ d102 26 a127 1 @@@@ -355,6 +351,11 @@@@ KConfig *cfg; d139 1 a139 1 @@@@ -368,6 +369,7 @@@@ KConfig *cfg; d147 1 a147 1 @@@@ -404,9 +406,14 @@@@ KConfig *cfg; d162 1 a162 1 @@@@ -497,16 +504,14 @@@@ KConfig *cfg; d184 1 a184 1 @@@@ -520,10 +525,10 @@@@ KConfig *cfg; d197 10 a206 1 @@@@ -957,6 +962,8 @@@@ int KOpenSSLProxy::PEM_write_bio_X509(BI d215 1 a215 1 @@@@ -968,6 +975,13 @@@@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out @ 1.12 log @Improve findMostRecent: when no minor version is available, assume it is -1 and continue the comparision. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig 2006-07-22 08:16:39.000000000 +0000 d5 16 a20 1 @@@@ -217,7 +217,7 @@@@ void KOpenSSLProxy::destroy() { d29 1 a29 1 @@@@ -240,10 +240,20 @@@@ static QString findMostRecentLib(QString d53 1 a53 1 @@@@ -280,42 +290,23 @@@@ KConfig *cfg; d102 1 a102 1 @@@@ -355,6 +346,11 @@@@ KConfig *cfg; d114 1 a114 1 @@@@ -368,6 +364,7 @@@@ KConfig *cfg; d122 16 a137 1 @@@@ -497,16 +494,14 @@@@ KConfig *cfg; d159 1 a159 1 @@@@ -520,10 +515,10 @@@@ KConfig *cfg; d172 23 @ 1.11 log @Use the NetBSD/OpenBSD shared library magic on DragonFly as well to fix SSL usage. Problem reported on DragonFly's user list. @ text @d14 25 a38 1 @@@@ -280,42 +280,23 @@@@ KConfig *cfg; d87 1 a87 1 @@@@ -355,6 +336,11 @@@@ KConfig *cfg; d99 1 a99 1 @@@@ -368,6 +354,7 @@@@ KConfig *cfg; d107 1 a107 1 @@@@ -497,16 +484,14 @@@@ KConfig *cfg; d129 1 a129 1 @@@@ -520,9 +505,9 @@@@ KConfig *cfg; d137 2 a138 1 d141 1 @ 1.10 log @Update to KDE 3.5 Many new features and refinements. Notable changes include: * Konqueror is the second web browser to pass the Acid2 CSS test, ahead of Firefox and Internet Explorer * Konqueror can also now free web pages from adverts with its ad-block feature * SuperKaramba is included in KDE, providing well-integrated and easy-to-install widgets for the user's desktop * Kopete has support for MSN and Yahoo! webcams * The edutainment module has three new applications (KGeography, Kanagram and blinKen), and has seen huge improvements in Kalzium @ text @d1 1 a1 1 $NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig 2005-10-11 04:05:44.000000000 +1300 d5 1 a5 1 @@@@ -216,7 +216,7 @@@@ void KOpenSSLProxy::destroy() { d10 1 a10 1 +#if defined(__OpenBSD__) || defined(__NetBSD__) d14 1 a14 1 @@@@ -279,42 +279,23 @@@@ KConfig *cfg; d48 2 a49 2 + << "@@LOCALBASE@@/lib/" +#if !defined(__NetBSD__) && !defined(__OpenBSD__) d59 1 a59 1 +#if !defined(__NetBSD__) && !defined(__OpenBSD__) d63 1 a63 1 @@@@ -354,6 +335,11 @@@@ KConfig *cfg; d67 1 a67 1 +#if defined(__NetBSD__) || defined(__OpenBSD__) d75 1 a75 1 @@@@ -367,6 +353,7 @@@@ KConfig *cfg; d83 1 a83 1 @@@@ -496,16 +483,14 @@@@ KConfig *cfg; d97 1 a97 1 +#if defined(__OpenBSD__) || defined(__NetBSD__) d105 1 a105 1 @@@@ -519,9 +504,9 @@@@ KConfig *cfg; @ 1.9 log @Update to KDE 3.3 * 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 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig 2004-05-23 08:55:48.000000000 +1200 d5 1 a5 1 @@@@ -215,7 +215,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -278,26 +278,23 @@@@ KConfig *cfg; d24 16 d58 1 a58 1 d63 1 a63 6 @@@@ -332,10 +329,16 @@@@ KConfig *cfg; << "libcrypto.so.0" #endif ; +#endif d68 3 a70 3 + QString libname = findMostRecentLib(*it, "crypto"); + if (!libname.isNull()) + _cryptoLib = ll->globalLibrary(libname.latin1()); d75 1 a75 1 @@@@ -349,9 +352,9 @@@@ KConfig *cfg; a81 1 -#endif d83 1 a83 3 if (_cryptoLib) { #ifdef KSSL_HAVE_SSL @@@@ -478,16 +481,14 @@@@ KConfig *cfg; d105 1 a105 1 @@@@ -501,9 +502,9 @@@@ KConfig *cfg; @ 1.8 log @Update to KDE-3.2.0. Changes: Libraries * Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett * Documentation parsing (kdoc based) and inclusion in generated .dcopidl files (note: kdebindings dcopidlng only) Alexander Kellett * Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett * Thumbnail generator for DVI files. Stefan Kebekus * Thumbnail generator for Xcursor files. Fredrik Hoeglund * KMainWindow can now maintain the statusbar and corresponding action (duplicate (99% of the time broken) code removed from countless applications in KDE). Benjamin Meyer * KMainWindow, KToolbar, and several other core classes now will only stores settings if those settings are not the default values (helping to reduce the huge size of config files). Benjamin Meyer * Add support for International Domain Names (IDN). Thiago Macieira, Waldo Bastian * KDE Password Registry and Wallet. George Staikos * SSL session ID reuse. George Staikos * KCookiejar: Support HttpOnly cookies. Waldo Bastian * KLocale: support for different calendar systems Hans Petter Bieker * KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker * Support data urls. See rfc 2397. Leo Savernik * New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner * New KFile permissions panel Tim Jansen * Support for mimetype inheritance and aliases David Faure * KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a KGuiItem instead (deprecating the old methods) Martijn Klingens * Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher * Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog David Faure * Add KSplashScreen, a splash screen class based on QSplashScreen (with support for KDE's Xinerama options) Chris Howells * KPasteTextAction: enhanced action for pasting text by offering a list with the clipboard history. Andras Mantia KHTML * Non-modal find dialog David Faure KDEfx * Added KCPUInfo class which makes it possible for applications to do runtime checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec. Fredrik Hoeglund * Added MMX and SSE2 optimizations to the blending functions in KImageEffect, that among other things are used to blend the translucent menus when the menu effect is set to software blend, and to tint icons when they're selected in icon views. Fredrik Hoeglund Kate Part * File type specific settings Christoph Cullmann * vi style cmd line Christoph Cullmann * Support variable lines in files Anders Lund * Color Schemes Christoph Cullmann * Indentation based code folding Christoph Cullmann * Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces Christoph Cullmann KImgIO * Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images Nadeem Hasan * Add TGA image plugin, supports reading and writing true color TGA images (compressed and uncompressed) Dominik Seichter Interfaces * Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau KSpell * Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin * Completely reworking the spell checking dialog. Adding language selection combo. Zack Rusin @ text @d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig 2003-11-30 22:47:08.000000000 +1300 d5 1 a5 1 @@@@ -207,7 +207,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -270,26 +270,23 @@@@ KConfig *cfg; d20 1 a20 1 - QString libname = findMostRecentLib("/usr/lib", "crypto"); d31 1 a31 1 << "/usr/lib/" d34 6 a39 6 << "/usr/ssl/lib/" << "/usr/local/lib/" << "/usr/local/openssl/lib/" << "/usr/local/ssl/lib/" << "/opt/openssl/lib/" << "/lib/" d47 1 a47 1 @@@@ -324,10 +321,16 @@@@ KConfig *cfg; d64 1 a64 1 @@@@ -341,9 +344,9 @@@@ KConfig *cfg; d75 1 a75 1 @@@@ -462,16 +465,14 @@@@ KConfig *cfg; d97 1 a97 1 @@@@ -485,9 +486,9 @@@@ KConfig *cfg; @ 1.7 log @Update KDE to 3.1.2. Changes: kdelibs: * https authentication through proxy fixed. * KZip failed for some .zip archives. * Fixed a bug in socket code that made KDEPrint crash. * kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5). kdebase: * kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard). * kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error message when AUTH failed ("Unknown Command" vs. "Authorization failed") * kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in the background if it could not grab the keyboard/mouse, preventing the screen from being locked manually. * kscreensaver: Screensavers are now stopped when asking for the password [#56803] * kio_smb: Several bugfixes for the smbro-ioslave. * kdesktop: fixed minicli layout problem with Qt 3.1.2 * kdm: fixed incorrect user window width with Qt 3.1.2 * Konqueror: Create DCOP interface for mainwindow when object begins to exist. * Konqueror: Fixed tab open delays when it can't reach website. * Konsole: Don't flicker when selecting entire lines. * Konsole: Crash, selection and sort fixes in schema and session editors. * Konsole: Fixed mouse-wheel in mouse mode. * Konsole: Allow programs to resize windows if enabled. * Konsole: Keep output steady when triple-click selecting. * Konsole: Added "Print" menu command. * kicker: Fixed kasbar only drawing last icon from a group. @ text @d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Wed May 7 23:46:34 2003 d5 2 a6 2 @@@@ -182,7 +182,7 @@@@ void KOpenSSLProxy::destroy() { _me = NULL; d14 1 a14 1 @@@@ -245,26 +245,23 @@@@ KConfig *cfg; d25 1 a25 1 libpaths d45 1 a45 1 libnamess d47 1 a47 1 @@@@ -299,10 +296,16 @@@@ KConfig *cfg; d64 1 a64 1 @@@@ -316,9 +319,9 @@@@ KConfig *cfg; d74 2 a75 2 #ifdef KSSL_HAVE_SSL @@@@ -418,16 +421,14 @@@@ KConfig *cfg; d97 1 a97 1 @@@@ -441,9 +442,9 @@@@ KConfig *cfg; d107 1 a107 1 #ifdef KSSL_HAVE_SSL @ 1.6 log @Add $LOCALBASE/lib to the path konqueror searches for libcrypto. Makes https work on systems that don't have libcrypto in /usr/lib, eg Solaris. @ text @d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig 2003-03-03 08:02:26.000000000 +1300 d5 1 a5 1 @@@@ -177,7 +177,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -240,26 +240,23 @@@@ KConfig *cfg; d47 2 a48 2 @@@@ -294,10 +291,16 @@@@ KConfig *cfg; << "libcrypto.so.0.9.6" d64 1 a64 1 @@@@ -311,9 +314,9 @@@@ KConfig *cfg; d75 1 a75 1 @@@@ -413,16 +416,14 @@@@ KConfig *cfg; d97 1 a97 1 @@@@ -436,9 +437,9 @@@@ KConfig *cfg; @ 1.5 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d1 1 a1 1 $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Fri Jan 3 17:58:50 2003 d5 1 a5 1 @@@@ -177,7 +177,7 @@@@ d14 1 a14 1 @@@@ -240,26 +240,22 @@@@ d32 1 d47 1 a47 1 @@@@ -294,10 +290,16 @@@@ d64 1 a64 1 @@@@ -311,9 +313,9 @@@@ d75 1 a75 1 @@@@ -413,16 +415,14 @@@@ d97 1 a97 1 @@@@ -436,9 +436,9 @@@@ @ 1.4 log @Update to KDE 3.0.3. While I'm here do the a.out dance for kuickshow and a couple of other minor clean ups. Changes are: kdelibs kprocess / kprocctrl: fix problem with hanging kdevelop. Javascript (core): more robust stack overflow check Javascript (html): allow to set a JS (non-CSS) property to a style object Javascript (html): improved result of navigator.platform using uname() Javascript (html): more aggressive garbage collection on clear, fixing many crashes Javascript (html): global object (window) has a correct object prototype now khtml: several crashes and bugs fixed kssl: Always verify the basic constraints on certificates (SECURITY) kdefx: Make the blending routine used by transparent menus work properly on big-endian platforms kdeui: Fix KDialog::setPlainCaption() kdebase Build fixes for IRIX / MipsPro (kcontrol, konqueror, konsole). Kicker: Quick browser escapes ampersand characters in file names. Konsole: Don't prepend ESC if Meta is pressed if key definition is for "+Alt". Konsole: Fixed crashes at startup related to broken font installations. Konsole: Fixed crashes when selecting in history buffer. krdb: Smarter handling of multiple and symlinked KDE and Qt installs when exporting plugin path to Qt. kdenetwork KMail: allow an ampersand as last char of an URL. KMail: Don't crash when custom drafts or sent-mail folders have been deleted or renamed. KMail: Fix auto charset detection for empty strings. KMail/KNode: Correctly handle quotes in user ids of OpenPGP keys. KMail: Make custom (global) Bcc headers work correctly with encryption and distribution list expansion. kdepim KAlarm: Fix session restoration often not occurring at login. KAlarm: Adjust wrong summer times stored by KDE 3.0.0 version of KAlarm. KAlarm: Make Close button on message window not the default button to reduce chance of accidental acknowledgement. KAlarm: Make Help button in configuration dialog display KAlarm handbook. KNotes: Compile fix for Qt 3.0.5 KOrganizer: Fixed context menu of todo list/view and event list which disappeared when using Qt 3.0.5 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Mon Aug 12 19:33:58 2002 d5 1 a5 1 @@@@ -174,7 +174,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -237,26 +237,22 @@@@ KConfig *cfg; d46 1 a46 1 @@@@ -285,10 +281,16 @@@@ KConfig *cfg; d63 1 a63 1 @@@@ -300,9 +302,9 @@@@ KConfig *cfg; d73 2 a74 2 #ifdef HAVE_SSL @@@@ -401,16 +403,14 @@@@ KConfig *cfg; d96 1 a96 1 @@@@ -422,9 +422,9 @@@@ KConfig *cfg; d106 1 a106 1 #ifdef HAVE_SSL @ 1.3 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-bd,v 1.1.2.2 2002/08/22 11:13:43 jlam Exp $ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Wed Aug 14 15:37:35 2002 d5 1 a5 9 @@@@ -105,6 +105,7 @@@@ static int (*K_SSL_CTX_use_certificate) static int (*K_SSL_get_error) (SSL*, int) = NULL; static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL; static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL; +static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL; static void (*K_sk_free) (STACK*) = NULL; static int (*K_sk_num) (STACK*) = NULL; static char* (*K_sk_pop) (STACK*) = NULL; @@@@ -173,7 +174,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -236,26 +237,22 @@@@ KConfig *cfg; d46 1 a46 1 @@@@ -284,10 +281,16 @@@@ KConfig *cfg; d63 1 a63 1 @@@@ -299,9 +302,9 @@@@ KConfig *cfg; d74 1 a74 9 @@@@ -348,6 +351,7 @@@@ KConfig *cfg; K_X509_REQ_free = (void (*)(X509_REQ*)) _cryptoLib->symbol("X509_REQ_free"); K_X509_REQ_new = (X509_REQ* (*)()) _cryptoLib->symbol("X509_REQ_new"); K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain"); + K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose"); K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free"); K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num"); K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop"); @@@@ -399,16 +403,14 @@@@ KConfig *cfg; d96 1 a96 1 @@@@ -420,9 +422,9 @@@@ KConfig *cfg; a106 11 @@@@ -930,6 +932,10 @@@@ char *KOpenSSLProxy::sk_value(STACK *s, void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) { if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x); +} + +void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) { + if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose); } @ 1.2 log @Bring in security fix for certificate handling. PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Wed May 8 19:28:06 2002 d5 9 a13 1 @@@@ -173,7 +173,7 @@@@ d22 1 a22 1 @@@@ -236,26 +236,22 @@@@ d54 1 a54 1 @@@@ -284,10 +280,16 @@@@ d71 1 a71 1 @@@@ -299,9 +301,9 @@@@ d82 9 a90 1 @@@@ -399,16 +401,14 @@@@ d112 1 a112 1 @@@@ -420,9 +420,9 @@@@ d123 11 @ 1.1.1.1 log @Initial import of a kdelibs3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-bd was added on branch buildlink2 on 2002-06-23 19:06:29 +0000 @ text @d1 106 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 106 $NetBSD: patch-bd,v 1.1.1.1.2.1 2002/06/23 19:06:29 jlam Exp $ --- kio/kssl/kopenssl.cc.orig Wed May 8 19:28:06 2002 +++ kio/kssl/kopenssl.cc @@@@ -173,7 +173,7 @@@@ _me = NULL; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include #include #include @@@@ -236,26 +236,22 @@@@ 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/" +#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 @@@@ -284,10 +280,16 @@@@ << "libcrypto.so.0.9.6" #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) { @@@@ -299,9 +301,9 @@@@ _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } +#endif if (_cryptoLib) break; } -#endif if (_cryptoLib) { #ifdef HAVE_SSL @@@@ -399,16 +401,14 @@@@ #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) { @@@@ -420,9 +420,9 @@@@ _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } +#endif if (_sslLib) break; } -#endif if (_sslLib) { #ifdef HAVE_SSL @ 1.1.1.1.2.3 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-bd,v 1.1.1.1.2.2 2002/08/22 11:13:43 jlam Exp $ d3 1 a3 1 --- kio/kssl/kopenssl.cc.orig Wed Aug 14 15:37:35 2002 d5 1 a5 9 @@@@ -105,6 +105,7 @@@@ static int (*K_SSL_CTX_use_certificate) static int (*K_SSL_get_error) (SSL*, int) = NULL; static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL; static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL; +static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL; static void (*K_sk_free) (STACK*) = NULL; static int (*K_sk_num) (STACK*) = NULL; static char* (*K_sk_pop) (STACK*) = NULL; @@@@ -173,7 +174,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -236,26 +237,22 @@@@ KConfig *cfg; d46 1 a46 1 @@@@ -284,10 +281,16 @@@@ KConfig *cfg; d63 1 a63 1 @@@@ -299,9 +302,9 @@@@ KConfig *cfg; d74 1 a74 9 @@@@ -348,6 +351,7 @@@@ KConfig *cfg; K_X509_REQ_free = (void (*)(X509_REQ*)) _cryptoLib->symbol("X509_REQ_free"); K_X509_REQ_new = (X509_REQ* (*)()) _cryptoLib->symbol("X509_REQ_new"); K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain"); + K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose"); K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free"); K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num"); K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop"); @@@@ -399,16 +403,14 @@@@ KConfig *cfg; d96 1 a96 1 @@@@ -420,9 +422,9 @@@@ KConfig *cfg; a106 11 @@@@ -930,6 +932,10 @@@@ char *KOpenSSLProxy::sk_value(STACK *s, void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) { if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x); +} + +void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) { + if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose); } @