diff options
author | skrll <skrll> | 2002-08-15 08:22:09 +0000 |
---|---|---|
committer | skrll <skrll> | 2002-08-15 08:22:09 +0000 |
commit | b7f5909042e74b31ab9ffed51e6c778831e099e9 (patch) | |
tree | 6f05e3e42d8c3d323c60c1f7053daa2a977fa8ca /x11 | |
parent | 73be428f98cc97353b7c01a20a285a05855a3253 (diff) | |
download | pkgsrc-b7f5909042e74b31ab9ffed51e6c778831e099e9.tar.gz |
Bring in security fix for certificate handling.
PKGREVISION++
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdelibs3/Makefile | 3 | ||||
-rw-r--r-- | x11/kdelibs3/distinfo | 7 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bd | 43 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-be | 19 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bz | 15 |
5 files changed, 71 insertions, 16 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 4d74bbe775b..663cbbc40d9 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/07/17 07:54:12 skrll Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/15 08:22:09 skrll Exp $ DISTNAME= kdelibs-3.0.2 +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 72725701347..03c7c7667e2 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/17 07:54:12 skrll Exp $ +$NetBSD: distinfo,v 1.4 2002/08/15 08:22:09 skrll Exp $ SHA1 (kdelibs-3.0.2.tar.bz2) = 6985e289b22a728045f829cb52412270f03b10cf Size (kdelibs-3.0.2.tar.bz2) = 7612798 bytes @@ -31,8 +31,8 @@ SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61 SHA1 (patch-ba) = d834df468158dee2c4787e0602583d5019708197 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea -SHA1 (patch-bd) = baf32fc59a1faf040d03648d384f3be2d074d583 -SHA1 (patch-be) = 24a1121eb9d26bd981f356bee8a8b6366e85d819 +SHA1 (patch-bd) = 3743da1e39eb09010afedc262612b8b280524088 +SHA1 (patch-be) = ac3f6b0a807e962440be86913579a6ecbcdc1fec SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7 SHA1 (patch-bh) = 92ac4dd4d340a0dd962d577300895511ea439029 @@ -53,3 +53,4 @@ SHA1 (patch-bv) = b25498d7705b1c9fae59dbe3ef68dd8bb5145419 SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0 SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019 SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6 +SHA1 (patch-bz) = a1c226f880b66f6e126a9021fd866a6532594cdd diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd index 278c8a2407f..09cfb260643 100644 --- a/x11/kdelibs3/patches/patch-bd +++ b/x11/kdelibs3/patches/patch-bd @@ -1,8 +1,16 @@ -$NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ +$NetBSD: patch-bd,v 1.2 2002/08/15 08:22:10 skrll Exp $ ---- kio/kssl/kopenssl.cc.orig Wed May 8 19:28:06 2002 +--- kio/kssl/kopenssl.cc.orig Wed Aug 14 15:37:35 2002 +++ kio/kssl/kopenssl.cc -@@ -173,7 +173,7 @@ +@@ -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() { _me = NULL; } @@ -11,7 +19,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ #include <qdir.h> #include <qstring.h> #include <qstringlist.h> -@@ -236,26 +236,22 @@ +@@ -236,26 +237,22 @@ KConfig *cfg; delete cfg; @@ -43,7 +51,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux -@@ -284,10 +280,16 @@ +@@ -284,10 +281,16 @@ KConfig *cfg; << "libcrypto.so.0.9.6" #endif ; @@ -60,7 +68,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ for (QStringList::Iterator shit = libnamesc.begin(); shit != libnamesc.end(); ++shit) { -@@ -299,9 +301,9 @@ +@@ -299,9 +302,9 @@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } @@ -71,7 +79,15 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ if (_cryptoLib) { #ifdef HAVE_SSL -@@ -399,16 +401,14 @@ +@@ -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; #endif } @@ -93,7 +109,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ for (QStringList::Iterator shit = libnamess.begin(); shit != libnamess.end(); ++shit) { -@@ -420,9 +420,9 @@ +@@ -420,9 +422,9 @@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } @@ -104,3 +120,14 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ if (_sslLib) { #ifdef HAVE_SSL +@@ -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); + } + + diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be index 4847ca14e19..fb2d339b2d8 100644 --- a/x11/kdelibs3/patches/patch-be +++ b/x11/kdelibs3/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ +$NetBSD: patch-be,v 1.2 2002/08/15 08:22:10 skrll Exp $ ---- kio/kssl/ksslcertificate.cc.orig Sat Dec 1 03:30:25 2001 +--- kio/kssl/ksslcertificate.cc.orig Wed Aug 14 15:48:38 2002 +++ kio/kssl/ksslcertificate.cc -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ public: KSSLCertificate::KSSLCertificate() { d = new KSSLCertificatePrivate; d->m_stateCached = false; @@ -11,7 +11,7 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ #ifdef HAVE_SSL d->m_cert = NULL; #endif -@@ -100,7 +100,7 @@ +@@ -100,7 +100,7 @@ KSSLCertificate::KSSLCertificate() { KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) { d = new KSSLCertificatePrivate; d->m_stateCached = false; @@ -20,3 +20,14 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $ #ifdef HAVE_SSL d->m_cert = NULL; setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert())); +@@ -541,9 +541,8 @@ KSSLCertificate::KSSLValidation KSSLCert + + //kdDebug(7029) << "KSSL setting CRL.............." << endl; + // int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); +- // + +- // int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); ++ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER); + + //kdDebug(7029) << "KSSL verifying.............." << endl; + certStoreCTX->error = X509_V_OK; diff --git a/x11/kdelibs3/patches/patch-bz b/x11/kdelibs3/patches/patch-bz new file mode 100644 index 00000000000..5492635d414 --- /dev/null +++ b/x11/kdelibs3/patches/patch-bz @@ -0,0 +1,15 @@ +$NetBSD: patch-bz,v 1.1 2002/08/15 08:22:10 skrll Exp $ + +--- kio/kssl/kopenssl.h.orig Wed Apr 10 23:00:44 2002 ++++ kio/kssl/kopenssl.h +@@ -309,6 +309,10 @@ public: + */ + void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x); + ++ /* ++ * X509_STORE_CTX_set_purpose - set the purpose of the certificate ++ */ ++ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose); + + /* + * X509_verify_cert - verify the certificate |