diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 20:17:46 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 20:17:46 +0100 |
| commit | b566058ccb7fa94c6e34fb1e1349b093d4482d6a (patch) | |
| tree | 34f3d392092770893605fc03cfce42726c445e0b /redhat/kdelibs | |
| parent | 4398af173f2663445e824a79c6367adab62c83e1 (diff) | |
| download | tde-packaging-b566058ccb7fa94c6e34fb1e1349b093d4482d6a.tar.gz tde-packaging-b566058ccb7fa94c6e34fb1e1349b093d4482d6a.zip | |
RPM packaging: lots of updates
Diffstat (limited to 'redhat/kdelibs')
| -rw-r--r-- | redhat/kdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch | 15 | ||||
| -rwxr-xr-x | redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec | 18 |
2 files changed, 31 insertions, 2 deletions
diff --git a/redhat/kdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch b/redhat/kdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch new file mode 100644 index 000000000..72346c83b --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch @@ -0,0 +1,15 @@ +--- kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp.ORI 2012-12-29 11:25:06.736204632 +0100 ++++ kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp 2012-12-29 11:25:32.731669416 +0100 +@@ -853,10 +853,12 @@ + permacache = d->cc->isPermanent(pc); + } + ++/* + if (!_IPmatchesCN && cp == KSSLCertificateCache::Accept) { + cp = KSSLCertificateCache::Prompt; + // ksv = KSSLCertificate::Ok; + } ++*/ + + // Precondition: cp is one of Reject, Accept or Prompt + switch (cp) { diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec index 7bca4cd14..82df03623 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec @@ -18,7 +18,7 @@ Name: trinity-tdelibs Version: 3.5.13.1 -Release: 1%{?dist}%{?_variant} +Release: 2%{?dist}%{?_variant} License: GPL Summary: TDE Libraries Group: Environment/Libraries @@ -32,6 +32,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdelibs-3.5.13.1.tar.gz +# [kdelibs] Security popup always appear on invalid SSL certificate, even when set +# to "always accept" [Bug #1287] +Patch1: kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch + Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} Obsoletes: trinity-kdelibs < %{version}-%{release} @@ -147,12 +151,21 @@ BuildRequires: libXcomposite-devel BuildRequires: xorg-x11-devel %endif +# ICEAUTH +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: iceauth +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} +Requires: xorg-x11-server-utils +%endif +%if 0%{?rhel} == 4 +Requires: xorg-x11 +%endif Requires: trinity-tqtinterface >= %{version} Requires: trinity-arts >= %{version} Requires: qt3 >= 3.3.8.d - %description Libraries for the Trinity Desktop Environment: TDE Libraries included: tdecore (TDE core library), kdeui (user interface), @@ -332,6 +345,7 @@ applications for TDE. %prep %setup -q -n kdelibs-3.5.13.1 +%patch1 -p1 %build |