head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.44 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.42 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.40 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.38 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.36 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.34 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.32 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.30 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.28 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.26 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.24 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.22 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.20 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.18 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.16 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.14 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.12 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.10 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.8 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.6 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.4 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.12 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.10 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.8 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.6 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 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.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.5 date 2005.01.03.14.32.33; author wiz; state dead; branches; next 1.4; 1.4 date 2002.10.26.13.07.29; author bouyer; state Exp; branches; next 1.3; 1.3 date 2002.08.25.18.40.36; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.08.15.08.38.34; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.11.17.12.01.35; author skrll; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.08.22.11.13.36; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-bt,v 1.4 2002/10/26 13:07:29 bouyer Exp $ --- kssl/kopenssl.cc.orig Wed Sep 5 00:08:18 2001 +++ kssl/kopenssl.cc @@@@ -92,6 +92,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_value) (STACK*, int) = NULL; @@@@ -117,7 +118,7 @@@@ void KOpenSSLProxy::destroy() { _me = NULL; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include #include #include @@@@ -180,20 +181,16 @@@@ KConfig *cfg; delete cfg; -#ifdef __OpenBSD__ - { - QString libname = findMostRecentLib("/usr/lib", "crypto"); - if (!libname.isNull()) - _cryptoLib = ll->globalLibrary(libname.latin1()); - } -#else - libpaths << "/usr/lib/" - << "/usr/local/lib/" + libpaths << "/usr/lib/"; +#if !defined(__OpenBSD__) && !defined(__NetBSD__) + libpaths << "/usr/local/lib/" << "/usr/local/openssl/lib/" << "/usr/local/ssl/lib/" - << "/opt/openssl/lib/" + << "/opt/openssl/lib/"; - << ""; +#endif + libpaths << ""; +#if !defined(__OpenBSD__) && !defined(__NetBSD__) // FIXME: #define here for the various OS types to optimize libnamess << "libssl.so.0" << "libssl.so" @@@@ -202,10 +199,16 @@@@ KConfig *cfg; libnamesc << "libcrypto.so.0" << "libcrypto.so" << "libcrypto.sl"; +#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) { @@@@ -213,9 +216,9 @@@@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } +#endif if (_cryptoLib) break; } -#endif if (_cryptoLib) { #ifdef HAVE_SSL @@@@ -254,6 +257,7 @@@@ KConfig *cfg; X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse"); K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free"); 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_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value"); @@@@ -263,16 +267,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) { @@@@ -280,9 +282,9 @@@@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } +#endif if (_sslLib) break; } -#endif if (_sslLib) { #ifdef HAVE_SSL @@@@ -742,6 +744,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.4 log @Fixes for Solaris: Add libgcc to libraries list Set KDED_WORKAROUND for non-NetBSD case too Solaris's grep and sh works in a different way, we need a different BUILDLINK_FILES_CMD Fix typos in c++ file in !netbsd case Use CXXLINK for linking c++ libraries @ text @d1 1 a1 1 $NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $ @ 1.3 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-bt,v 1.1.2.1 2002/08/22 11:13:36 jlam Exp $ d40 2 a41 1 << "/opt/openssl/lib/" @ 1.2 log @Bring in security fix for certificate handling. PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Fix the PASV response decode in kio_ftp as reported in pkg/13344. This is in line with rfc1123 sec 4.1.2.6. Fix the search method for lib{ssl,crypto} in kopenssl.cc @ text @d5 9 a13 1 @@@@ -117,7 +117,7 @@@@ d22 1 a22 1 @@@@ -180,20 +180,16 @@@@ d49 1 a49 1 @@@@ -202,10 +198,16 @@@@ d66 1 a66 1 @@@@ -213,9 +215,9 @@@@ d77 9 a85 1 @@@@ -263,16 +265,14 @@@@ d107 1 a107 1 @@@@ -280,9 +280,9 @@@@ d118 11 @ 1.1.2.1 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-bt,v 1.2 2002/08/15 08:38:34 skrll Exp $ d5 1 a5 9 @@@@ -92,6 +92,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_value) (STACK*, int) = NULL; @@@@ -117,7 +118,7 @@@@ void KOpenSSLProxy::destroy() { d14 1 a14 1 @@@@ -180,20 +181,16 @@@@ KConfig *cfg; d41 1 a41 1 @@@@ -202,10 +199,16 @@@@ KConfig *cfg; d58 1 a58 1 @@@@ -213,9 +216,9 @@@@ KConfig *cfg; d69 1 a69 9 @@@@ -254,6 +257,7 @@@@ KConfig *cfg; X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse"); K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free"); 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_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value"); @@@@ -263,16 +267,14 @@@@ KConfig *cfg; d91 1 a91 1 @@@@ -280,9 +282,9 @@@@ KConfig *cfg; a101 11 @@@@ -742,6 +744,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); } @