Hello community, here is the log from the commit of package kinit.3714 for openSUSE:13.2:Update checked in at 2015-04-28 12:34:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/kinit.3714 (Old) and /work/SRC/openSUSE:13.2:Update/.kinit.3714.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinit.3714" Changes: -------- New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:13.2:Update/.kinit.3714.new/kinit.changes 2015-04-28 12:34:53.000000000 +0200 @@ -0,0 +1,154 @@ +------------------------------------------------------------------- +Sat Apr 4 14:40:51 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + +------------------------------------------------------------------- +Sat Mar 7 16:58:51 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + +------------------------------------------------------------------- +Sun Feb 8 18:15:24 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.7.0 + * OSX: load the correct shared libraries at runtime + * Mingw compilation fixes + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- +Sat Jan 3 18:03:24 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.6.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- +Sat Dec 6 12:53:45 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.5.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.5.0.php + +------------------------------------------------------------------- +Sun Nov 2 17:47:21 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- +Wed Oct 29 16:01:01 UTC 2014 - hrvoje.sen...@gmail.com + +- Devel package doesn't require kinit; it provides only DBus + interface file and cmake config files/macros + +------------------------------------------------------------------- +Sat Oct 4 17:59:47 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- +Tue Sep 9 09:49:32 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php +- Rebase fpie.patch + +------------------------------------------------------------------- +Sat Aug 2 10:20:15 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php + +------------------------------------------------------------------- +Sun Jul 27 01:07:34 UTC 2014 - hrvoje.sen...@gmail.com + +- Added fpie.patch: add -(f)pie link flags to start_kdeinit target + (also stop passing those flags to cmake cmdline) +- Added more_verbose.patch: add more usefull verbosity to kdeinit5 + and klauncher + +------------------------------------------------------------------- +Fri Jul 11 09:48:44 UTC 2014 - hrvoje.sen...@gmail.com + +- Define kf5_version within package + +------------------------------------------------------------------- +Tue Jul 1 21:35:59 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.0.0 + * Final release of KDE Frameworks 5 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.0.php + +------------------------------------------------------------------- +Sun Jun 1 18:02:30 UTC 2014 - hrvoje.sen...@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 + +------------------------------------------------------------------- +Sun May 4 01:41:14 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.99.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta2.php +- Added kdoctools-devel BuildRequires + +------------------------------------------------------------------- +Tue Apr 22 19:17:57 UTC 2014 - hrvoje.sen...@gmail.com + +- Added disable-OOM-protection.patch: it was not proved to be + needed feature, and creates potential security risk, bnc#862953 +- Drop unused and commented out parts of the spec + +------------------------------------------------------------------- +Sat Mar 29 19:47:41 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- +Sat Mar 15 17:13:24 UTC 2014 - hrvoje.sen...@gmail.com + +- Comment out start_kdeinit permissions checks/permissions until + review is done (the helper is anyway only started when called from + startkde, but we don't have it ready for packaging yet) + +------------------------------------------------------------------- +Tue Mar 4 16:39:47 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- +Sat Feb 8 02:18:50 UTC 2014 - hrvoje.sen...@gmail.com + +- Init kinit package + New: ---- baselibs.conf fpie.patch kinit-5.9.0.tar.xz kinit.changes kinit.spec more_verbose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinit.spec ++++++ # # spec file for package kinit # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_without lang %define _tar_path 5.9 Name: kinit Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kcrash-devel >= %{_tar_path} BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: kio-devel >= %{_tar_path} BuildRequires: kservice-devel >= %{_tar_path} BuildRequires: kwindowsystem-devel >= %{_tar_path} 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) %if %{with lang} Recommends: %{name}-lang = %{version} %endif 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 Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE more_verbose.patch -- add more usefull verbosity to kdeinit5 and klauncher Patch0: more_verbose.patch # PATCH-FIX-OPENSUSE fpie.patch -- add -(f)pie link flags to start_kdeinit target Patch1: fpie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Kdeinit is a process launcher somewhat similar to the famous init used for booting UNIX. %package devel Summary: Helper library to speed up start of applications on KDE workspaces Group: Development/Libraries/KDE Requires: extra-cmake-modules %description devel Kdeinit is a process launcher somewhat similar to the famous init used for booting UNIX. Development files. %lang_package %prep %setup -q %patch0 -p1 %patch1 -p1 %build %cmake_kf5 -d build %make_jobs %install %kf5_makeinstall -C build %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 echo "%doc %lang(de) %{_kf5_mandir}/de" >>%{name}5.lang echo "%doc %lang(it) %{_kf5_mandir}/it" >>%{name}5.lang echo "%doc %lang(nl) %{_kf5_mandir}/nl" >>%{name}5.lang echo "%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR" >>%{name}5.lang echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %if %{with lang} %files lang -f %{name}5.lang %endif %files %defattr(-,root,root) %doc COPYING* README* %{_kf5_bindir}/kdeinit5 %{_kf5_bindir}/kdeinit5_shutdown %{_kf5_bindir}/kdeinit5_wrapper %{_kf5_bindir}/kwrapper5 %{_kf5_libdir}/libkdeinit5_klauncher.so %{_kf5_libexecdir}/klauncher %{_kf5_bindir}/kshell5 %{_kf5_libexecdir}/start_kdeinit %{_kf5_libexecdir}/start_kdeinit_wrapper %doc %lang(en) %{_kf5_mandir}/*/kdeinit5.* %files devel %defattr(-,root,root) %{_kf5_libdir}/cmake/KF5Init/ %{_kf5_dbusinterfacesdir}/kf5_org.kde.KLauncher.xml %changelog ++++++ baselibs.conf ++++++ kinit kinit-devel++++++ fpie.patch ++++++ diff --git a/src/start_kdeinit/CMakeLists.txt b/src/start_kdeinit/CMakeLists.txt index 46d6cb3..31434df 100644 --- a/src/start_kdeinit/CMakeLists.txt +++ b/src/start_kdeinit/CMakeLists.txt @@ -2,6 +2,11 @@ add_executable(start_kdeinit start_kdeinit.c) if (Libcap_FOUND) target_link_libraries(start_kdeinit ${Libcap_LIBRARIES}) endif() + +set_property(TARGET start_kdeinit APPEND_STRING PROPERTY COMPILE_FLAGS " -fPIE") + +set_property(TARGET start_kdeinit APPEND_STRING PROPERTY LINK_FLAGS " -pie") + add_executable(start_kdeinit_wrapper start_kdeinit_wrapper.c) install(TARGETS start_kdeinit DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}) ++++++ more_verbose.patch ++++++ diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp index 3c3c913..0a59d38 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp @@ -448,7 +448,7 @@ static void reset_oom_protect() if (write(oom_pipe, &pid, sizeof(pid_t)) > 0) { sigsuspend(&oldsigs); // wait for the signal to come } else { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "Failed to reset OOM protection: %d\n", pid); #endif } @@ -512,7 +512,7 @@ static pid_t launch(int argc, const char *_name, const char *args, } } } -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: preparing to launch '%s'\n", libpath.isEmpty() ? execpath.constData() : libpath.toUtf8().constData()); #endif @@ -742,7 +742,7 @@ static pid_t launch(int argc, const char *_name, const char *args, d.n = read(d.fd[0], &d.result, 1); if (d.n == 1) { if (d.result == 2) { -#ifndef NDEBUG +#ifndef NODEBUG //fprintf(stderr, "kdeinit5: no kdeinit module, trying exec....\n"); #endif exec = true; @@ -1020,7 +1020,7 @@ static void start_klauncher() sprintf(args + 5, "%d", d.launcher[1]); d.launcher_pid = launch(2, "klauncher", args); close(d.launcher[1]); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched KLauncher, pid = %ld, result = %d\n", (long) d.launcher_pid, d.result); #endif @@ -1036,7 +1036,7 @@ static void launcher_died() } // KLauncher died... restart -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: KLauncher died unexpectedly.\n"); #endif // Make sure it's really dead. @@ -1055,7 +1055,7 @@ static void launcher_died() static bool handle_launcher_request(int sock, const char *who) { - (void)who; // for NDEBUG + (void)who; // for NODEBUG klauncher_header request_header; char *request_data = 0L; @@ -1098,7 +1098,7 @@ static bool handle_launcher_request(int sock, const char *who) int avoid_loops = 0; const char *startup_id_str = "0"; // krazy:exclude=doublequote_chars -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got %s '%s' from %s.\n", commandToString(request_header.cmd), name, who); @@ -1148,7 +1148,7 @@ static bool handle_launcher_request(int sock, const char *who) } if ((arg_n - request_data) != request_header.arg_length) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: EXEC request has invalid format.\n"); #endif free(request_data); @@ -1208,13 +1208,13 @@ static bool handle_launcher_request(int sock, const char *who) env_name = request_data; env_value = env_name + strlen(env_name) + 1; -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got SETENV '%s=%s' from %s.\n", env_name, env_value, who); #endif if (request_header.arg_length != (int)(strlen(env_name) + strlen(env_value) + 2)) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: SETENV request has invalid format.\n"); #endif free(request_data); @@ -1222,14 +1222,14 @@ static bool handle_launcher_request(int sock, const char *who) } qputenv(env_name, env_value); } else if (request_header.cmd == LAUNCHER_TERMINATE_KDE) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: terminate KDE.\n"); #endif #if HAVE_X11 kdeinit_xio_errhandler(0L); #endif } else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got termination request (PID %ld).\n", (long) getpid()); #endif if (d.launcher_pid) { @@ -1242,14 +1242,14 @@ static bool handle_launcher_request(int sock, const char *who) if (children) { close(d.wrapper); d.wrapper = -1; -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Closed sockets, but not exiting until all children terminate.\n"); #endif } else { raise(SIGTERM); } } else if (request_header.cmd == LAUNCHER_DEBUG_WAIT) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Debug wait activated.\n"); #endif d.debug_wait = true; @@ -1293,7 +1293,7 @@ static void handle_requests(pid_t waitForPid) do { exit_pid = waitpid(-1, &exit_status, WNOHANG); if (exit_pid > 0) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: PID %ld terminated.\n", (long) exit_pid); #endif if (waitForPid && (exit_pid == waitForPid)) { @@ -1308,7 +1308,7 @@ static void handle_requests(pid_t waitForPid) child_died(exit_pid, exit_status); if (d.wrapper < 0 && !children) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Last child terminated, exiting (PID %ld).\n", (long) getpid()); #endif @@ -1463,7 +1463,7 @@ int kdeinit_xio_errhandler(Display *disp) int kdeinit_x_errhandler(Display *dpy, XErrorEvent *err) { -#ifndef NDEBUG +#ifndef NODEBUG char errstr[256]; // kdeinit almost doesn't use X, and therefore there shouldn't be any X error XGetErrorText(dpy, err->error_code, errstr, 256); @@ -1536,7 +1536,7 @@ static int initXconnection() 0, BlackPixelOfScreen(DefaultScreenOfDisplay(X11display)), BlackPixelOfScreen(DefaultScreenOfDisplay(X11display))); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: opened connection to %s\n", DisplayString(X11display)); #endif int fd = XConnectionNumber(X11display); @@ -1595,7 +1595,7 @@ mac_fork_and_reexec_self() switch (x_fork_result) { case -1: -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "Mac OS X workaround fork() failed!\n"); #endif ::_exit(255); @@ -1766,7 +1766,7 @@ int main(int argc, char **argv) l.setLoadHints(QLibrary::ExportExternalSymbolsHint); (void)l.load(); } -#ifndef NDEBUG +#ifndef NODEBUG else { fprintf(stderr, "%s was not found.\n", extra_libs[i]); } @@ -1799,7 +1799,7 @@ int main(int argc, char **argv) qputenv("KDED_STARTED_BY_KDEINIT", "1"); pid = launch(1, KDED_EXENAME, 0); unsetenv("KDED_STARTED_BY_KDEINIT"); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result); #endif d.kded_pid = pid; @@ -1810,7 +1810,7 @@ int main(int argc, char **argv) for (int i = 1; i < argc; i++) { if (safe_argv[i][0] == '+') { pid = launch(1, safe_argv[i] + 1, 0); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i] + 1, (long) pid, d.result); #endif handle_requests(pid); @@ -1822,7 +1822,7 @@ int main(int argc, char **argv) // Ignore } else { pid = launch(1, safe_argv[i], 0); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i], (long) pid, d.result); #endif } diff --git a/src/klauncher/klauncher.cpp b/src/klauncher/klauncher.cpp index 1b43293..00241e1 100644 --- a/src/klauncher/klauncher.cpp +++ b/src/klauncher/klauncher.cpp @@ -65,7 +65,7 @@ // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds #define SLAVE_MAX_IDLE 30 -// #define KLAUNCHER_VERBOSE_OUTPUT +#define KLAUNCHER_VERBOSE_OUTPUT #include <QLoggingCategory> Q_DECLARE_LOGGING_CATEGORY(KLAUNCHER) @@ -1118,7 +1118,7 @@ KLauncher::requestSlave(const QString &protocol, requestStart(request); pid_t pid = request->pid; -// qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid; + qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid; // We don't care about this request any longer.... requestDone(request);
