Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 492354 - [kde overlay] kde-base/ksmserver-9999: Failed Patch: ksmserver-4.10.50-noplasmalock.patch !
Summary: [kde overlay] kde-base/ksmserver-9999: Failed Patch: ksmserver-4.10.50-noplas...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] KDE (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
: 492736 (view as bug list)
Depends on:
Blocks:
 
Reported: 2013-11-23 12:43 UTC by Jakub Caban
Modified: 2013-12-01 19:43 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jakub Caban 2013-11-23 12:43:58 UTC
Build fails due to failed patching. Removing the patch resolves the problem for me.

Reproducible: Always

Steps to Reproduce:
1. emerge =kde-base/ksmserver-9999
2.
3.
Actual Results:  
Patch fails
Comment 1 Johannes Huber (RETIRED) gentoo-dev 2013-11-23 13:07:01 UTC
Needs more review because these patches where made to fix a security problem.
Comment 2 Jakub Caban 2013-11-23 13:13:17 UTC
Can I help in any way?
Comment 3 Johannes Huber (RETIRED) gentoo-dev 2013-11-23 13:22:28 UTC
(In reply to Jakub Caban from comment #2)
> Can I help in any way?

Any help is welcome of course. If you want you can analyze the latest changes in upstream repo (kde-workspace, Branch KDE/4.11) and test the security problem reported in bug 462152.

downstream patching is made in following packages:

kde-base/ksmserver
kde-base/plasma-workspace
kde-base/systemsettings
Comment 4 Duncan 2013-11-25 21:44:14 UTC
Could someone with summary-change privs add ksmserver-4.11.49.9999 to the summary?  Same failed patch with it.
Comment 5 Duncan 2013-11-25 22:44:05 UTC
Upstream commit 719554

commit 719554e489634d716c92ef2781c554789c88dc70
Author: Aaron Seigo <aseigo@kde.org>
Date:   Fri Nov 22 22:13:17 2013 +0100

    also respect locking manually

    the code now:

    * shows the lock GUI immediately if called by dbus or in testing
    * a new screen is attached after the lock grace
    * otherwise behaves as it did prior to this commit ...

    catching those two issues meant additional state tracking, but all
    the ways i can find to lock work now.


Among changes to other files it touches ksldapp.cpp, the same file gentoo's patch touches, in the same area (around line 270, line numbers change a bit).
Comment 6 Johannes Huber (RETIRED) gentoo-dev 2013-11-27 21:51:49 UTC
*** Bug 492736 has been marked as a duplicate of this bug. ***
Comment 7 Andreas K. Hüttel archtester gentoo-dev 2013-12-01 19:43:29 UTC
Updated the patch for the new code. Not 100% sure if it is still needed but there are conflicting reports on the upstream bug.