Hello community, here is the log from the commit of package kinit for openSUSE:Factory checked in at 2014-08-16 15:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-15 08:00:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kinit.new/kinit.changes 2014-08-16 15:42:34.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Aug 2 10:20:15 UTC 2014 - [email protected] + +- 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 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- kinit-5.0.0.tar.xz New: ---- fpie.patch kinit-5.1.0.tar.xz more_verbose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinit.spec ++++++ --- /var/tmp/diff_new_pack.D8Bchx/_old 2014-08-16 15:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.D8Bchx/_new 2014-08-16 15:42:34.000000000 +0200 @@ -17,11 +17,11 @@ Name: kinit -Version: 5.0.0 +Version: 5.1.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.0.0 +BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes BuildRequires: kcrash-devel >= %{kf5_version} BuildRequires: kdoctools-devel >= %{kf5_version} @@ -44,6 +44,10 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{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 @@ -63,9 +67,11 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -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" + %cmake_kf5 -d build %make_jobs %install ++++++ fpie.patch ++++++ diff --git a/src/start_kdeinit/CMakeLists.txt b/src/start_kdeinit/CMakeLists.txt index 56a91e3..1af14de 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 ${KF5_LIBEXEC_INSTALL_DIR}) ++++++ kinit-5.0.0.tar.xz -> kinit-5.1.0.tar.xz ++++++ ++++ 954478 lines of diff (skipped) ++++++ more_verbose.patch ++++++ diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp index 296ebfd..dedbc9c 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 31498e0..fbcb064 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 static const char *const s_DBusStartupTypeToString[] = { "DBusNone", "DBusUnique", "DBusMulti", "ERROR" }; @@ -617,7 +617,7 @@ KLauncher::requestStart(KLaunchRequest *request) request_header.arg_length = requestData.length(); #ifdef KLAUNCHER_VERBOSE_OUTPUT - // qDebug() << "Asking kdeinit to start" << request->name << request->arg_list + qDebug() << "Asking kdeinit to start" << request->name << request->arg_list << "cmd=" << commandToString(request_header.cmd); #endif @@ -782,7 +782,7 @@ KLauncher::start_service(KService::Ptr service, const QStringList &_urls, } #ifdef KLAUNCHER_VERBOSE_OUTPUT - // qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name + qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type]; #endif @@ -957,7 +957,7 @@ KLauncher::slotDequeue() if (request->status != KLaunchRequest::Launching) { // Request handled. #ifdef KLAUNCHER_VERBOSE_OUTPUT - // qDebug() << "Request handled already"; + qDebug() << "Request handled already"; #endif requestDone(request); continue; @@ -1063,8 +1063,8 @@ KLauncher::requestSlave(const QString &protocol, QString name = slaveModulePath; #endif - // qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol - // << " args=" << arg_list << endl; + qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol + << " args=" << arg_list << endl; #ifdef Q_OS_UNIX #ifndef USE_KPROCESS_FOR_KIOSLAVES @@ -1104,7 +1104,7 @@ KLauncher::requestSlave(const QString &protocol, requestStart(request); pid_t pid = request->pid; -// qDebug() << "Slave launched, pid = " << pid; + qDebug() << "Slave launched, pid = " << pid; // We don't care about this request any longer.... requestDone(request); @@ -1208,7 +1208,7 @@ KLauncher::slotGotOutput() #ifdef USE_KPROCESS_FOR_KIOSLAVES QProcess *p = static_cast<QProcess *>(sender()); QByteArray _stdout = p->readAllStandardOutput(); - // qDebug() << _stdout.data(); + qDebug() << _stdout.data(); #endif } @@ -1217,12 +1217,12 @@ KLauncher::slotFinished(int exitCode, QProcess::ExitStatus exitStatus) { #ifdef USE_KPROCESS_FOR_KIOSLAVES QProcess *p = static_cast<QProcess *>(sender()); - // qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus; + qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus; foreach (KLaunchRequest *request, requestList) { if (request->process == p) { #ifdef KLAUNCHER_VERBOSE_OUTPUT - // qDebug() << "found KProcess, request done"; + qDebug() << "found KProcess, request done"; #endif if (exitCode == 0 && exitStatus == QProcess::NormalExit) { request->status = KLaunchRequest::Done; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
