From 8407aab09c849692ff0b0d721fafe5b8c6135e78 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:04:15 +0000
Subject: [PATCH] auto-import changelog data from kdelibs-3.1.4-5.src.rpm * Sun
 May 16 2004 Than Ngo <than@redhat.com> 6:3.1.4-5 - KDE Telnet URI Handler
 File Vulnerability, vulnerability in the mailto handler, CAN-2004-0411

---
 kdelibs.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index d1b73f2..a23e4c2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,7 +20,7 @@
 %define menu_path /var/lib/menu
 
 Version: 3.1.4
-Release: 4
+Release: 5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -62,6 +62,10 @@ Patch30: kdelibs-3.1.3-gcc33.patch
 Patch31: kdelibs-3.1.3-fullscreen-gtk.patch
 Patch32: kdelibs-3.1.4-flags.patch
 
+# security fix
+Patch100: post-3.1.5-kdelibs-kapplication.patch
+Patch101: post-3.1.5-kdelibs-ktelnetservice.patch
+
 Requires: qt >= 1:%{qtversion}
 Requires: arts >= 8:1.1.4
 Requires: openssl = 0.9.7a
@@ -167,6 +171,10 @@ format for easy browsing.
 %patch31 -p1 -b .fullscreen
 %patch32 -p1 -b .flags
 
+# security fix
+%patch100 -p1 -b .kmailhandler
+%patch101 -p0 -b .telnet
+
 # add redhat into KDE_VERSION_STRING
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
 
@@ -174,7 +182,7 @@ perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{ver
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %if %{libtool}
-make -f admin/Makefile.common cvs
+   make -f admin/Makefile.common cvs
 %endif
 
 # set some default FLAGS
@@ -230,12 +238,12 @@ fi
 perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
 %endif
 
-make %{?smp_mflags}
+make %{?_smp_mflags}
 make apidox
 
 # build desktop create kde menu tool
 %if %{desktop_file}
-gcc $FLAGS -o desktop-create-kmenu %{SOURCE1}
+   gcc $FLAGS -o desktop-create-kmenu %{SOURCE1}
 %endif
 
 %install
@@ -407,6 +415,9 @@ fi
 %doc %{_docdir}/HTML/en/kdelibs-apidocs
 
 %changelog
+* Sun May 16 2004 Than Ngo <than@redhat.com> 6:3.1.4-5
+- KDE Telnet URI Handler File Vulnerability, vulnerability in the mailto handler, CAN-2004-0411
+
 * Fri Oct 17 2003 Than Ngo <than@redhat.com> 6:3.1.4-4
 - fixed icon scale patch, thanks to Thomas Wörner