packages: kde4-kdelibs/kde4-kdelibs-cacert.patch, kde4-kdelibs/kde4-kdelibs...

[arekm]

Author: arekm                        Date: Sat Jan 22 22:19:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; try to load /etc/certs/ca-certificates.crt

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-cacert.patch (1.3 -> 1.4) , kde4-kdelibs.spec (1.237 -> 1.238) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-cacert.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.3 packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.4
--- packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.3	Fri Jan 21 21:18:12 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-cacert.patch	Sat Jan 22 23:19:07 2011
@@ -20,3 +20,13 @@
              continue;
          }
 
+--- kdecore/network/ksslcertificatemanager.cpp~	2011-01-19 23:10:03.000000000 +0100
++++ kdecore/network/ksslcertificatemanager.cpp	2011-01-23 00:17:42.071601281 +0100
+@@ -224,6 +224,7 @@
+ 
+     certs.append(QSslCertificate::fromPath(userCertDir + QLatin1String("*"), QSsl::Pem,
+                                            QRegExp::Wildcard));
++    certs.append(QSslCertificate::fromPath("/etc/certs/ca-certificates.crt"));
+     foreach (const QSslCertificate &cert, certs) {
+         const QByteArray digest = cert.digest().toHex();
+         if (!group.hasKey(digest.constData())) {

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.237 packages/kde4-kdelibs/kde4-kdelibs.spec:1.238
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.237	Sat Jan 22 18:19:45 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Sat Jan 22 23:19:07 2011
@@ -18,7 +18,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.6.0
-Release:	2
+Release:	3
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -1108,6 +1108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.238  2011/01/22 22:19:07  arekm
+- rel 3; try to load /etc/certs/ca-certificates.crt
+
 Revision 1.237  2011/01/22 17:19:45  sparky
 - -devel R: soprano-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-cacert.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.237&r2=1.238&f=u