From 71eed755e39a5bad4b052d0d2226a7d71e9ec0ea Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Jan 2016 14:45:54 -0600 Subject: [PATCH] pull in fix from reviewboard 126681 --- kf5-kwallet.spec | 7 ++++++- kwallet-5.18.0-rb126681.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 kwallet-5.18.0-rb126681.patch diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec index f70df2a..1b28a06 100644 --- a/kf5-kwallet.spec +++ b/kf5-kwallet.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 solution for password management License: LGPLv2+ @@ -18,6 +18,8 @@ URL: http://projects.kde.org/kwallet Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz ## upstream patches +# http://reviewboard.kde.org/r/126681 +Patch1: kwallet-5.18.0-rb126681.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} @@ -108,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Jan 08 2016 Rex Dieter 5.18.0-2 +- pull in fix from reviewboard 126681 + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0 diff --git a/kwallet-5.18.0-rb126681.patch b/kwallet-5.18.0-rb126681.patch new file mode 100644 index 0000000..f43408f --- /dev/null +++ b/kwallet-5.18.0-rb126681.patch @@ -0,0 +1,12 @@ +diff -up kwallet-5.18.0/src/runtime/kwalletd/main.cpp.rb126681 kwallet-5.18.0/src/runtime/kwalletd/main.cpp +--- kwallet-5.18.0/src/runtime/kwalletd/main.cpp.rb126681 2016-01-02 10:52:34.000000000 -0600 ++++ kwallet-5.18.0/src/runtime/kwalletd/main.cpp 2016-01-08 14:43:51.144687579 -0600 +@@ -93,7 +93,7 @@ static int waitForEnvironment() + char str[BSIZE] = {'\0'}; + + int chop = 0; +- FILE *s3 = fdopen(s2, "r"); ++ FILE *s3 = fdopen(dup(s2), "r"); + while(!feof(s3)) { + if (fgets(str, BSIZE, s3)) { + chop = strlen(str) - 1;