From e106e884049471349b48c52553834196f24ae1e1c2afbb7914cea051c620f652 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 18:44:36 +0000 Subject: [PATCH] 4.100.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=26 --- disable-OOM-protection.patch | 13 ------------- kinit-4.100.0.tar.xz | 3 +++ kinit-4.99.0.tar.xz | 3 --- kinit.changes | 12 ++++++++++++ kinit.spec | 11 +++++------ 5 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 disable-OOM-protection.patch create mode 100644 kinit-4.100.0.tar.xz delete mode 100644 kinit-4.99.0.tar.xz diff --git a/disable-OOM-protection.patch b/disable-OOM-protection.patch deleted file mode 100644 index 15df0de..0000000 --- a/disable-OOM-protection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/start_kdeinit/CMakeLists.txt b/src/start_kdeinit/CMakeLists.txt -index 73e50b8..e84e6a9 100644 ---- a/src/start_kdeinit/CMakeLists.txt -+++ b/src/start_kdeinit/CMakeLists.txt -@@ -4,7 +4,7 @@ add_executable(start_kdeinit_wrapper start_kdeinit_wrapper.c) - install(TARGETS start_kdeinit DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) - install(TARGETS start_kdeinit_wrapper DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) - --if (CMAKE_SYSTEM_NAME MATCHES Linux) -+if (0) - MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") - set(KDEINIT_OOM_PROTECT 1) - install(CODE " diff --git a/kinit-4.100.0.tar.xz b/kinit-4.100.0.tar.xz new file mode 100644 index 0000000..67395f2 --- /dev/null +++ b/kinit-4.100.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd01a344a6621a5184a503410e55964bbab70800f9acd7796b12a387c1e89bf6 +size 2792932 diff --git a/kinit-4.99.0.tar.xz b/kinit-4.99.0.tar.xz deleted file mode 100644 index 2821b10..0000000 --- a/kinit-4.99.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d017bcadd4c089c7ee76a4a2a7d33a24479972c453be53119f70283cfa716d8f -size 2792356 diff --git a/kinit.changes b/kinit.changes index f8184ba..24705e9 100644 --- a/kinit.changes +++ b/kinit.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jun 1 18:02:30 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.100.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta3.php +- Drop disable-OOM-protection.patch, better solution applied upstream +- Added libcap-devel and libcap-progs BuildRequires, to enable capabilities + OOM-killer protection + ------------------------------------------------------------------- Sun May 4 01:41:14 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinit.spec b/kinit.spec index 09bcf56..ffd7c1f 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,18 +17,20 @@ Name: kinit -Version: 4.99.0 +Version: 4.100.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: fdupes BuildRequires: kcrash-devel >= %{_kf5_version} +BuildRequires: kdoctools-devel >= %{_kf5_version} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_kf5_version} -BuildRequires: kdoctools-devel >= %{_kf5_version} BuildRequires: kio-devel >= %{_kf5_version} BuildRequires: kservice-devel >= %{_kf5_version} BuildRequires: kwindowsystem-devel >= %{_kf5_version} +BuildRequires: libcap-devel +BuildRequires: libcap-progs BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 @@ -39,8 +41,6 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source0: kinit-%{version}.tar.xz -# PATCH-FIX-UPSTREAM disable-OOM-protection.patch -- it was not proved to be needed feature, and create potential security risk, bnc#862953 -Patch0: disable-OOM-protection.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,7 +59,6 @@ booting UNIX. Development files. %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_CXX_FLAGS="%{optflags} -fpie" -DCMAKE_C_FLAGS="%{optflags} -fpie" -DCMAKE_SHARED_LINKER_FLAGS="-pie" -DCMAKE_EXE_LINKER_FLAGS="-pie" -DCMAKE_MODULE_LINKER_FLAGS="-pie"