Hello community,
here is the log from the commit of package kinit for openSUSE:Factory checked in at 2014-06-10 14:36:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kinit (Old)
and /work/SRC/openSUSE:Factory/.kinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kinit/kinit.changes 2014-05-14 20:27:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kinit.new/kinit.changes 2014-06-10 14:36:57.000000000 +0200
@@ -1,0 +2,13 @@
+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
+- Add baselibs.conf
+
+-------------------------------------------------------------------
Old:
----
disable-OOM-protection.patch
kinit-4.99.0.tar.xz
New:
----
baselibs.conf
kinit-4.100.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kinit.spec ++++++
--- /var/tmp/diff_new_pack.pcliMd/_old 2014-06-10 14:36:57.000000000 +0200
+++ /var/tmp/diff_new_pack.pcliMd/_new 2014-06-10 14:36:57.000000000 +0200
@@ -17,30 +17,32 @@
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
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(x11)
+Recommends: %{name}-lang = %{version}
Summary: Helper library to speed up start of applications on KDE workspaces
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
+Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz
+Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -57,9 +59,9 @@
Kdeinit is a process launcher somewhat similar to the famous init used for
booting UNIX. Development files.
+%lang_package
%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"
@@ -69,10 +71,14 @@
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
+ %find_lang %{name}5
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%files lang -f %{name}5.lang
+
%files
%defattr(-,root,root)
%doc COPYING* README*
++++++ baselibs.conf ++++++
kinit
kinit-devel
requires "kinit-<targettype> = <version>"
++++++ kinit-4.99.0.tar.xz -> kinit-4.100.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/CMakeLists.txt new/kinit-4.100.0/CMakeLists.txt
--- old/kinit-4.99.0/CMakeLists.txt 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/CMakeLists.txt 2014-06-01 14:21:12.000000000 +0200
@@ -2,8 +2,8 @@
project(KInit)
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+find_package(ECM 0.0.14 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(REQUIRED_QT_VERSION "5.2")
find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core Gui DBus)
@@ -15,8 +15,8 @@
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
-set(KF5_VERSION "4.99.0") # handled by release scripts
-set(KF5_DEP_VERSION "4.99.0") # handled by release scripts
+set(KF5_VERSION "4.100.0") # handled by release scripts
+set(KF5_DEP_VERSION "4.100.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kinit_version.h"
@@ -47,6 +47,15 @@
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
+if (NOT WIN32)
+find_package(Libcap)
+set_package_properties(Libcap PROPERTIES
+ TYPE OPTIONAL
+ PURPOSE "KInit needs setcap in order to install start_kdeinit with CAP_SYS_RESOURCE capabilities"
+ )
+endif ()
+set(HAVE_CAPABILITIES ${Libcap_FOUND})
+
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Init")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5InitConfig.cmake.in"
@@ -55,6 +64,10 @@
)
add_definitions(-DTRANSLATION_DOMAIN=\"kinit5\")
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ ki18n_install(po)
+ kdoctools_install(po)
+endif()
add_subdirectory(src)
add_subdirectory(docs)
@@ -65,6 +78,5 @@
install(FILES
kde5init_dummy.cpp.in
- kde5init_win32lib_dummy.cpp.in
DESTINATION ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/KF5InitMacros.cmake new/kinit-4.100.0/KF5InitMacros.cmake
--- old/kinit-4.99.0/KF5InitMacros.cmake 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/KF5InitMacros.cmake 2014-06-01 14:21:12.000000000 +0200
@@ -18,10 +18,6 @@
_FIND_KDEINIT_FILE(_KDE5INIT_DUMMY_FILEPATH "")
configure_file(${_KDE5INIT_DUMMY_FILEPATH} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
- # under Windows, build a normal executable and additionally a dummy kdeinit5_foo.lib, whose only purpose on windows is to
- # keep the linking logic from the CMakeLists.txt on UNIX working (under UNIX all necessary libs are linked against the kdeinit
- # library instead against the executable, under windows we want to have everything in the executable, but for compatibility we have to
- # keep the library there-
if(WIN32)
if (MINGW)
list(FIND _SRCS ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_res.o _res_position)
@@ -33,22 +29,18 @@
list(REMOVE_AT _SRCS ${_res_position})
endif(NOT _res_position EQUAL -1)
- _FIND_KDEINIT_FILE(_KDE5INIT_WIN32_DUMMY_FILEPATH "_win32lib")
- set(_KDEINIT5_TARGET_NAME_ ${_target_NAME})
- configure_file(${_KDE5INIT_WIN32_DUMMY_FILEPATH} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp)
- add_library(kdeinit_${_target_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp)
-
- add_executable(${_target_NAME} ${_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
+ # We don't need a shared library on Windows, use a static library that gets included in the executable.
+ # Since Windows doesn't use fork()+exec() there is no use for this library by kdeinit.
+ # Having the static library ensures that target_link_libraries(myexe kdeinit_foo) also works on Windows and not just on UNIX
+ add_library(kdeinit_${_target_NAME} STATIC ${_SRCS})
else()
-
+ # Use a shared library on UNIX so that kdeinit can dlopen() it
add_library(kdeinit_${_target_NAME} SHARED ${_SRCS})
-
- if (APPLE)
- set(_resourcefile ${MACOSX_BUNDLE_ICON_FILE})
- endif()
- add_executable(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
endif()
-
+ if (APPLE)
+ set(_resourcefile ${MACOSX_BUNDLE_ICON_FILE})
+ endif()
+ add_executable(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit5_${_target_NAME})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/cmake/FindLibcap.cmake new/kinit-4.100.0/cmake/FindLibcap.cmake
--- old/kinit-4.99.0/cmake/FindLibcap.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kinit-4.100.0/cmake/FindLibcap.cmake 2014-06-01 14:21:12.000000000 +0200
@@ -0,0 +1,59 @@
+# Try to find the setcap binary and cap libraries
+#
+# This will define:
+#
+# Libcap_FOUND - system has the cap library and setcap binary
+# Libcap_LIBRARIES - cap libraries to link against
+# SETCAP_EXECUTABLE - path of the setcap binary
+# In addition, the following targets are defined:
+#
+# Libcap::SetCapabilities
+#
+
+
+# Copyright (c) 2014, Hrvoje Senjan,
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_program(SETCAP_EXECUTABLE NAMES setcap DOC "The setcap executable")
+
+find_library(Libcap_LIBRARIES NAMES cap DOC "The cap (capabilities) library")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libcap FOUND_VAR Libcap_FOUND
+ REQUIRED_VARS SETCAP_EXECUTABLE Libcap_LIBRARIES)
+
+if(Libcap_FOUND AND NOT TARGET Libcap::SetCapabilities)
+ add_executable(Libcap::SetCapabilities IMPORTED)
+ set_target_properties(Libcap::SetCapabilities PROPERTIES
+ IMPORTED_LOCATION "${SETCAP_EXECUTABLE}"
+ )
+endif()
+
+mark_as_advanced(SETCAP_EXECUTABLE Libcap_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(Libcap PROPERTIES
+ URL https://sites.google.com/site/fullycapable/
+ DESCRIPTION "Capabilities are a measure to limit the omnipotence of the superuser.")
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/kde5init_win32lib_dummy.cpp.in new/kinit-4.100.0/kde5init_win32lib_dummy.cpp.in
--- old/kinit-4.99.0/kde5init_win32lib_dummy.cpp.in 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/kde5init_win32lib_dummy.cpp.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-/* dummy file, used by KF5_ADD_KDEINIT_EXECUTABLE() under Windows,
- * so that the created static library is not completely empty */
-
-extern "C" int kdeinit_${_KDEINIT5_TARGET_NAME_}_dummy(void) { return 42; }
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/po/gl/kinit5.po new/kinit-4.100.0/po/gl/kinit5.po
--- old/kinit-4.99.0/po/gl/kinit5.po 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/po/gl/kinit5.po 2014-06-01 14:21:12.000000000 +0200
@@ -14,9 +14,9 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-04-27 20:57+0000\n"
-"PO-Revision-Date: 2014-01-06 15:27+0100\n"
+"PO-Revision-Date: 2014-05-12 23:26+0200\n"
"Last-Translator: Marce Villarino \n"
-"Language-Team: Galician \n"
+"Language-Team: Galician \n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +93,7 @@
#: klauncher/klauncher.cpp:846
#, kde-format
msgid "Launching %1"
-msgstr "Iniciando %1"
+msgstr "Estase a iniciar %1"
#: klauncher/klauncher.cpp:1039
#, kde-format
@@ -101,10 +101,9 @@
msgstr "Non se coñece o protocolo «%1».\n"
#: klauncher/klauncher.cpp:1045
-#, fuzzy, kde-format
-#| msgid "Could not find service '%1'."
+#, kde-format
msgid "Could not find the '%1' plugin.\n"
-msgstr "Non foi posíbel atopar o servizo «%1»."
+msgstr "Non foi posíbel atopar o complemento «%1».\n"
#: klauncher/klauncher.cpp:1112
#, kde-format
@@ -112,16 +111,12 @@
msgstr "Produciuse un erro ao cargar «%1».\n"
#: klauncher/klauncher_main.cpp:142
-#, fuzzy
-#| msgid ""
-#| "klauncher: This program is not supposed to be started manually.\n"
-#| "klauncher: It is started automatically by kdeinit4.\n"
msgid ""
"klauncher: This program is not supposed to be started manually.\n"
"klauncher: It is started automatically by kdeinit5.\n"
msgstr ""
"klauncher: Este programa non está pensado para ser iniciado manualmente.\n"
-"klauncher: Iníciase automaticamente por kdeinit.\n"
+"klauncher: Iníciase automaticamente por kdeinit5.\n"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/po/nds/kinit5.po new/kinit-4.100.0/po/nds/kinit5.po
--- old/kinit-4.99.0/po/nds/kinit5.po 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/po/nds/kinit5.po 2014-06-01 14:21:12.000000000 +0200
@@ -9,7 +9,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-04-27 20:57+0000\n"
-"PO-Revision-Date: 2014-03-31 23:29+0200\n"
+"PO-Revision-Date: 2014-05-11 00:55+0200\n"
"Last-Translator: Sönke Dibbern \n"
"Language-Team: Low Saxon \n"
"Language: nds\n"
@@ -42,7 +42,7 @@
#: kdeinit/kinit.cpp:642
#, kde-format
msgid "Could not find '%1' executable."
-msgstr "Dat Programm \"%1\" lett sik nich finnen."
+msgstr "Dat Programm „%1“ lett sik nich finnen."
#: kdeinit/kinit.cpp:670
#, kde-format
@@ -50,7 +50,7 @@
"Could not open library '%1'.\n"
"%2"
msgstr ""
-"De Bibliotheek \"%1\" lett sik nich opmaken.\n"
+"De Bibliotheek „%1“ lett sik nich opmaken.\n"
"%2"
#: kdeinit/kinit.cpp:712
@@ -59,28 +59,28 @@
"Could not find 'kdemain' in '%1'.\n"
"%2"
msgstr ""
-"\"kdemain\" lett sik nich binnen \"%1\" finnen.\n"
+"„kdemain“ lett sik nich binnen „%1“ finnen.\n"
"%2"
#: klauncher/klauncher.cpp:484
#, kde-format
msgid "KDEInit could not launch '%1'"
-msgstr "KDEInit kann \"%1\" nich starten."
+msgstr "KDEInit kann „%1“ nich starten."
#: klauncher/klauncher.cpp:677 klauncher/klauncher.cpp:691
#, kde-format
msgid "Could not find service '%1'."
-msgstr "De Deenst \"%1\" lett sik nich finnen."
+msgstr "De Deenst „%1“ lett sik nich finnen."
#: klauncher/klauncher.cpp:709
#, kde-format
msgid "Service '%1' must be executable to run."
-msgstr "De Deenst \"%1\" mutt utföhrbor wesen, wenn he lopen schall."
+msgstr "De Deenst „%1“ mutt utföhrbor wesen, wenn he lopen schall."
#: klauncher/klauncher.cpp:711 klauncher/klauncher.cpp:752
#, kde-format
msgid "Service '%1' is malformatted."
-msgstr "De Deenst \"%1\" is leeg formateert."
+msgstr "De Deenst „%1“ is leeg formateert."
#: klauncher/klauncher.cpp:846
#, kde-format
@@ -90,17 +90,17 @@
#: klauncher/klauncher.cpp:1039
#, kde-format
msgid "Unknown protocol '%1'.\n"
-msgstr "Protokoll \"%1\" is nich begäng.\n"
+msgstr "Protokoll „%1“ is nich begäng.\n"
#: klauncher/klauncher.cpp:1045
#, kde-format
msgid "Could not find the '%1' plugin.\n"
-msgstr "Dat Moduul \"%1\" lett sik nich finnen.\n"
+msgstr "Dat Moduul „%1“ lett sik nich finnen.\n"
#: klauncher/klauncher.cpp:1112
#, kde-format
msgid "Error loading '%1'.\n"
-msgstr "Fehler bi't Laden vun \"%1\".\n"
+msgstr "Fehler bi't Laden vun „%1“.\n"
#: klauncher/klauncher_main.cpp:142
msgid ""
@@ -108,7 +108,7 @@
"klauncher: It is started automatically by kdeinit5.\n"
msgstr ""
"klauncher: Dit Programm schall nich vun Hand opropen warrn.\n"
-"klauncher: \"kdeinit5\" röppt dat automaatsch op.\n"
+"klauncher: „kdeinit5“ röppt dat automaatsch op.\n"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/po/uk/kinit5.po new/kinit-4.100.0/po/uk/kinit5.po
--- old/kinit-4.99.0/po/uk/kinit5.po 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/po/uk/kinit5.po 2014-06-01 14:21:12.000000000 +0200
@@ -380,7 +380,7 @@
#~ msgid "Password must be at least 1 character long"
#~ msgid_plural "Password must be at least %1 characters long"
-#~ msgstr[0] "Довжина пароля повинна бути щонайменше %1 символ"
+#~ msgstr[0] "Довжина пароля повинна бути щонайменше один символ"
#~ msgstr[1] "Довжина пароля повинна бути щонайменше %1 символи"
#~ msgstr[2] "Довжина пароля повинна бути щонайменше %1 символів"
#~ msgstr[3] "Довжина пароля повинна бути щонайменше один символ"
@@ -4109,7 +4109,7 @@
#~ msgid "1 match found."
#~ msgid_plural "%1 matches found."
-#~ msgstr[0] "Знайдено %1 відповідний варіант."
+#~ msgstr[0] "Знайдено 1 відповідний варіант."
#~ msgstr[1] "Знайдено %1 відповідних варіанта."
#~ msgstr[2] "Знайдено %1 відповідних варіантів."
#~ msgstr[3] "Знайдено 1 відповідний варіант."
@@ -4357,7 +4357,7 @@
#~ msgid "but your pattern only defines 1 capture."
#~ msgid_plural "but your pattern only defines %1 captures."
-#~ msgstr[0] "в той час, як взірець визначає тільки %1 захоплення."
+#~ msgstr[0] "в той час, як взірець визначає тільки одне захоплення."
#~ msgstr[1] "в той час, як взірець визначає тільки %1 захоплення."
#~ msgstr[2] "в той час, як взірець визначає тільки %1 захоплень."
#~ msgstr[3] "в той час, як взірець визначає тільки одне захоплення."
@@ -6360,7 +6360,7 @@
#~ msgid_plural ""
#~ "The shortcut '%2' conflicts with the following key combinations:\n"
#~ msgstr[0] ""
-#~ "Клавіатурне скорочення «%2» суперечить наступним комбінаціям клавіш:\n"
+#~ "Клавіатурне скорочення «%2» суперечить наступній комбінації клавіш:\n"
#~ msgstr[1] ""
#~ "Клавіатурне скорочення «%2» суперечить наступним комбінаціям клавіш:\n"
#~ msgstr[2] ""
@@ -6371,7 +6371,7 @@
#~ msgctxt "%1 is the number of shortcuts with which there is a conflict"
#~ msgid "Conflict with Registered Global Shortcut"
#~ msgid_plural "Conflict with Registered Global Shortcuts"
-#~ msgstr[0] "Конфлікт з зареєстрованими загальними скороченнями"
+#~ msgstr[0] "Конфлікт з зареєстрованим загальним скороченням"
#~ msgstr[1] "Конфлікт з зареєстрованими загальними скороченнями"
#~ msgstr[2] "Конфлікт з зареєстрованими загальними скороченнями"
#~ msgstr[3] "Конфлікт з зареєстрованим загальним скороченням"
@@ -6379,7 +6379,7 @@
#~ msgctxt "%1 is the number of conflicts"
#~ msgid "Shortcut Conflict"
#~ msgid_plural "Shortcut Conflicts"
-#~ msgstr[0] "Конфлікти скорочень"
+#~ msgstr[0] "Конфлікт скорочень"
#~ msgstr[1] "Конфлікти скорочень"
#~ msgstr[2] "Конфлікти скорочень"
#~ msgstr[3] "Конфлікт скорочень"
@@ -7079,7 +7079,7 @@
#~ msgid "&Send File"
#~ msgid_plural "&Send Files"
-#~ msgstr[0] "&Надіслати файли"
+#~ msgstr[0] "&Надіслати файл"
#~ msgstr[1] "&Надіслати файли"
#~ msgstr[2] "&Надіслати файли"
#~ msgstr[3] "&Надіслати файл"
@@ -7689,7 +7689,7 @@
#~ msgid "&Show Blocked Popup Window"
#~ msgid_plural "&Show %1 Blocked Popup Windows"
-#~ msgstr[0] "&Показати %1 заблокований вигульк"
+#~ msgstr[0] "&Показати заблокований вигульк"
#~ msgstr[1] "&Показати %1 заблоковані вигульки"
#~ msgstr[2] "&Показати %1 заблокованих вигульків"
#~ msgstr[3] "&Показати заблокований вигульк"
@@ -8692,7 +8692,7 @@
#~ msgid "Loading one preview"
#~ msgid_plural "Loading %1 previews"
-#~ msgstr[0] "Завантаження %1 ескізу"
+#~ msgstr[0] "Завантаження ескізу"
#~ msgstr[1] "Завантаження %1 ескізів"
#~ msgstr[2] "Завантаження %1 ескізів"
#~ msgstr[3] "Завантаження ескізу"
@@ -8815,14 +8815,14 @@
#~ msgctxt "fan as in supporter"
#~ msgid "1 fan"
#~ msgid_plural "%1 fans"
-#~ msgstr[0] "%1 прихильник"
+#~ msgstr[0] "1 прихильник"
#~ msgstr[1] "%1 прихильники"
#~ msgstr[2] "%1 прихильників"
#~ msgstr[3] "1 прихильник"
#~ msgid "1 download"
#~ msgid_plural "%1 downloads"
-#~ msgstr[0] "%1 звантаження"
+#~ msgstr[0] "1 звантаження"
#~ msgstr[1] "%1 звантаження"
#~ msgstr[2] "%1 звантажень"
#~ msgstr[3] "1 звантаження"
@@ -8874,7 +8874,7 @@
#~ msgid_plural ""
#~ "The server does not recognize any of the categories to which you are "
#~ "trying to upload: %2"
-#~ msgstr[0] "Серверу невідомі категорії вашого вивантаження: %2"
+#~ msgstr[0] "Серверу невідома категорія вашого вивантаження: %2"
#~ msgstr[1] "Серверу невідома категорія ваших вивантажень: %2"
#~ msgstr[2] "Серверу невідома категорія ваших вивантажень: %2"
#~ msgstr[3] "Серверу невідома категорія вашого вивантаження: %2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/po/x-test/kinit5.po new/kinit-4.100.0/po/x-test/kinit5.po
--- old/kinit-4.99.0/po/x-test/kinit5.po 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/po/x-test/kinit5.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,117 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: kinit5\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-04-27 20:57+0000\n"
-"PO-Revision-Date: 2014-04-27 21:05+0000\n"
-"Last-Translator: transxx.py program \n"
-"Language-Team: KDE Test Language \n"
-"Language: x-test\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: kdeinit/kinit.cpp:526
-msgid ""
-"Unable to start new process.\n"
-"The system may have reached the maximum number of open files possible or the "
-"maximum number of open files that you are allowed to use has been reached."
-msgstr ""
-"xxUnable to start new process.\n"
-"The system may have reached the maximum number of open files possible or the "
-"maximum number of open files that you are allowed to use has been reached.xx"
-
-#: kdeinit/kinit.cpp:551
-msgid ""
-"Unable to create new process.\n"
-"The system may have reached the maximum number of processes possible or the "
-"maximum number of processes that you are allowed to use has been reached."
-msgstr ""
-"xxUnable to create new process.\n"
-"The system may have reached the maximum number of processes possible or the "
-"maximum number of processes that you are allowed to use has been reached.xx"
-
-#: kdeinit/kinit.cpp:642
-#, kde-format
-msgid "Could not find '%1' executable."
-msgstr "xxCould not find '%1' executable.xx"
-
-#: kdeinit/kinit.cpp:670
-#, kde-format
-msgid ""
-"Could not open library '%1'.\n"
-"%2"
-msgstr ""
-"xxCould not open library '%1'.\n"
-"%2xx"
-
-#: kdeinit/kinit.cpp:712
-#, kde-format
-msgid ""
-"Could not find 'kdemain' in '%1'.\n"
-"%2"
-msgstr ""
-"xxCould not find 'kdemain' in '%1'.\n"
-"%2xx"
-
-#: klauncher/klauncher.cpp:484
-#, kde-format
-msgid "KDEInit could not launch '%1'"
-msgstr "xxKDEInit could not launch '%1'xx"
-
-#: klauncher/klauncher.cpp:677 klauncher/klauncher.cpp:691
-#, kde-format
-msgid "Could not find service '%1'."
-msgstr "xxCould not find service '%1'.xx"
-
-#: klauncher/klauncher.cpp:709
-#, kde-format
-msgid "Service '%1' must be executable to run."
-msgstr "xxService '%1' must be executable to run.xx"
-
-#: klauncher/klauncher.cpp:711 klauncher/klauncher.cpp:752
-#, kde-format
-msgid "Service '%1' is malformatted."
-msgstr "xxService '%1' is malformatted.xx"
-
-#: klauncher/klauncher.cpp:846
-#, kde-format
-msgid "Launching %1"
-msgstr "xxLaunching %1xx"
-
-#: klauncher/klauncher.cpp:1039
-#, kde-format
-msgid "Unknown protocol '%1'.\n"
-msgstr ""
-"xxUnknown protocol '%1'.\n"
-"xx\n"
-
-#: klauncher/klauncher.cpp:1045
-#, kde-format
-msgid "Could not find the '%1' plugin.\n"
-msgstr ""
-"xxCould not find the '%1' plugin.\n"
-"xx\n"
-
-#: klauncher/klauncher.cpp:1112
-#, kde-format
-msgid "Error loading '%1'.\n"
-msgstr ""
-"xxError loading '%1'.\n"
-"xx\n"
-
-#: klauncher/klauncher_main.cpp:142
-msgid ""
-"klauncher: This program is not supposed to be started manually.\n"
-"klauncher: It is started automatically by kdeinit5.\n"
-msgstr ""
-"xxklauncher: This program is not supposed to be started manually.\n"
-"klauncher: It is started automatically by kdeinit5.\n"
-"xx\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/CMakeLists.txt new/kinit-4.100.0/src/CMakeLists.txt
--- old/kinit-4.99.0/src/CMakeLists.txt 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/CMakeLists.txt 2014-06-01 14:21:12.000000000 +0200
@@ -3,6 +3,15 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/../KF5InitMacros.cmake)
include(ECMMarkNonGuiExecutable)
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ if (Libcap_FOUND)
+ message(STATUS "Using capabilities kdeinit wrapper in order to protect it from bad Linux OOM-killer")
+ else()
+ message(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
+ endif()
+ set(KDEINIT_OOM_PROTECT 1)
+endif ()
+
configure_file(config-kdeinit.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdeinit.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/config-kdeinit.h.cmake new/kinit-4.100.0/src/config-kdeinit.h.cmake
--- old/kinit-4.99.0/src/config-kdeinit.h.cmake 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/config-kdeinit.h.cmake 2014-06-01 14:21:12.000000000 +0200
@@ -13,6 +13,7 @@
#cmakedefine01 CAN_CLOBBER_ARGV
#cmakedefine01 HAVE_X11
+#cmakedefine01 HAVE_CAPABILITIES
#cmakedefine01 HAVE_SYS_SELECT_H
/* for start_kdeinit */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/kdeinit/kinit_win.cpp new/kinit-4.100.0/src/kdeinit/kinit_win.cpp
--- old/kinit-4.99.0/src/kdeinit/kinit_win.cpp 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/kdeinit/kinit_win.cpp 2014-06-01 14:21:12.000000000 +0200
@@ -48,7 +48,9 @@
#include
+#ifdef Q_CC_MSVC
typedef unsigned int pid_t;
+#endif
//#define ENABLE_SUICIDE
//#define ENABLE_EXIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/klauncher/klauncher.h new/kinit-4.100.0/src/klauncher/klauncher.h
--- old/kinit-4.99.0/src/klauncher/klauncher.h 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/klauncher/klauncher.h 2014-06-01 14:21:12.000000000 +0200
@@ -34,7 +34,7 @@
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
#define USE_KPROCESS_FOR_KIOSLAVES
#endif
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
typedef unsigned int pid_t;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/start_kdeinit/CMakeLists.txt new/kinit-4.100.0/src/start_kdeinit/CMakeLists.txt
--- old/kinit-4.99.0/src/start_kdeinit/CMakeLists.txt 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/start_kdeinit/CMakeLists.txt 2014-06-01 14:21:12.000000000 +0200
@@ -1,14 +1,24 @@
add_executable(start_kdeinit start_kdeinit.c)
+if (Libcap_FOUND)
+ target_link_libraries(start_kdeinit ${Libcap_LIBRARIES})
+endif()
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)
- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
- set(KDEINIT_OOM_PROTECT 1)
- install(CODE "
- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}/start_kdeinit\")
- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
+if (KDEINIT_OOM_PROTECT)
+ if (Libcap_FOUND)
+ install( CODE "execute_process(
+ COMMAND
+ ${SETCAP_EXECUTABLE}
+ CAP_SYS_RESOURCE=+ep
+ $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}/start_kdeinit)"
+ )
+ else()
+ install(CODE "
+ set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}/start_kdeinit\")
+ EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
")
+ endif ()
endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-4.99.0/src/start_kdeinit/start_kdeinit.c new/kinit-4.100.0/src/start_kdeinit/start_kdeinit.c
--- old/kinit-4.99.0/src/start_kdeinit/start_kdeinit.c 2014-05-05 02:27:23.000000000 +0200
+++ new/kinit-4.100.0/src/start_kdeinit/start_kdeinit.c 2014-06-01 14:21:12.000000000 +0200
@@ -27,6 +27,9 @@
#include
#include
#include
+#if HAVE_CAPABILITIES
+#include
+#endif
#define EXECUTE CMAKE_INSTALL_PREFIX"/"BIN_INSTALL_DIR "/kdeinit5"
@@ -98,6 +101,9 @@
unsigned i;
char **orig_environ = NULL;
char header[ 7 ];
+#if HAVE_CAPABILITIES
+ cap_t caps;
+#endif
if (pipe(pipes) < 0) {
perror("pipe()");
return 1;
@@ -111,6 +117,14 @@
perror("fork()");
return 1;
default: /* parent, drop privileges and exec */
+#if HAVE_CAPABILITIES
+ caps = cap_init();
+ if (cap_set_proc(caps) < 0) {
+ perror("cap_set_proc()");
+ return 1;
+ }
+ cap_free(caps);
+#endif
if (setgid(getgid())) {
perror("setgid()");
return 1;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org