From 8504c506af7727897b4243bf7b69ede8e9b0d3d7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 18 Apr 2009 23:13:42 +0000 Subject: [PATCH] * Sat Apr 18 2009 Rex Dieter 4.2.2-6 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370) --- kdelibs-4.2.2-kde#180785.patch | 16 ++++++++++++++++ kdelibs.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.2.2-kde#180785.patch diff --git a/kdelibs-4.2.2-kde#180785.patch b/kdelibs-4.2.2-kde#180785.patch new file mode 100644 index 0000000..0a1fca5 --- /dev/null +++ b/kdelibs-4.2.2-kde#180785.patch @@ -0,0 +1,16 @@ +--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/03/25 12:32:32 944314 ++++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/18 19:34:41 955904 +@@ -184,6 +184,12 @@ + */ + static void close_fds() + { ++ while (struct child *child = children) { ++ close(child->sock); ++ children = child->next; ++ free(child); ++ } ++ + if (d.deadpipe[0] != -1) + { + close(d.deadpipe[0]); + diff --git a/kdelibs.spec b/kdelibs.spec index 1276a23..b0f121c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.2.2 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -90,6 +90,7 @@ Patch26: kdelibs-4.2.2-plasma-focus.patch Patch100: kdelibs-4.2.2-kio_http.patch Patch101: kdelibs-4.2.2-kjob.patch Patch102: kdelibs-4.2.2-bidi-kde#189161.patch +Patch103: kdelibs-4.2.2-kde#180785.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -233,6 +234,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch100 -p0 -b .kio_http %patch101 -p0 -b .kjob %patch102 -p4 -b .bidi-kde#189161 +%patch103 -p4 -b .kde#180785 # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -417,6 +419,9 @@ rm -rf %{buildroot} %changelog +* Sat Apr 18 2009 Rex Dieter 4.2.2-6 +- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370) + * Fri Apr 10 2009 Rex Dieter 4.2.2-5 - fix bidi-related hangs in khtml (kde#189161)