Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Sat Jul 25 18:47:56 CEST 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-07-21 22:25:53.000000000 +0200 +++ kdelibs4/kdelibs4.changes 2009-07-24 14:31:24.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 24 14:31:03 CEST 2009 - llunak@novell.com + +- fix the OOM patch to not break 'ps ux' + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.ChKq20/_old 2009-07-25 18:47:03.000000000 +0200 +++ /var/tmp/diff_new_pack.ChKq20/_new 2009-07-25 18:47:03.000000000 +0200 @@ -39,7 +39,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.2.98 -Release: 1 +Release: 2 Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) ++++++ oom-protect.diff ++++++ --- /var/tmp/diff_new_pack.ChKq20/_old 2009-07-25 18:47:03.000000000 +0200 +++ /var/tmp/diff_new_pack.ChKq20/_new 2009-07-25 18:47:03.000000000 +0200 @@ -1,7 +1,7 @@ Index: kinit/start_kdeinit.c =================================================================== --- kinit/start_kdeinit.c (revision 0) -+++ kinit/start_kdeinit.c (revision 1000474) ++++ kinit/start_kdeinit.c (revision 1001887) @@ -0,0 +1,176 @@ +/* + * This file is part of the KDE libraries @@ -182,7 +182,7 @@ Index: kinit/start_kdeinit_wrapper.c =================================================================== --- kinit/start_kdeinit_wrapper.c (revision 0) -+++ kinit/start_kdeinit_wrapper.c (revision 1000474) ++++ kinit/start_kdeinit_wrapper.c (revision 1001887) @@ -0,0 +1,96 @@ +/* + * This file is part of the KDE libraries @@ -280,10 +280,52 @@ + return 1; +} +#endif +Index: kinit/proctitle.cpp +=================================================================== +--- kinit/proctitle.cpp (revision 1000152) ++++ kinit/proctitle.cpp (revision 1001887) +@@ -80,6 +80,7 @@ + + #if PF_ARGV_TYPE == PF_ARGV_WRITEABLE /* Only this mode uses LastArgv */ + static char *LastArgv = NULL; ++static char *cleanUpTo = NULL; + #endif + + /** +@@ -114,6 +115,7 @@ + LastArgv = argv[i] + strlen(argv[i]); + } + } ++ cleanUpTo = LastArgv; + + for (i = 0; envp[i] != NULL; i++) { + /* must not overwrite XDG_SESSION_COOKIE */ +@@ -201,17 +203,15 @@ + /* We can overwrite individual argv[] arguments. Semi-nice. */ + snprintf(Argv[0], maxlen, "%s", statbuf); + p = &Argv[0][i]; +- +- /* null terminate it, but don't clear the rest of the +- memory that is usually used for environment variables. Some ++ /* Clear the rest used by arguments, but don't clear the memory ++ that is usually used for environment variables. Some + tools, like ConsoleKit must have access to the process'es initial + environment (more exact, the XDG_SESSION_COOKIE variable stored there). + If this code causes another side effect, we have to specifically + always append those variables to our environment. */ ++ while (p < cleanUpTo) ++ *p++ = '\0'; + +- if (p < LastArgv) +- *p = '\0'; +- + Argv[1] = NULL; + # endif /* PF_ARGV_WRITEABLE */ + Index: kinit/kinit.cpp =================================================================== ---- kinit/kinit.cpp (revision 1000153) -+++ kinit/kinit.cpp (revision 1000474) +--- kinit/kinit.cpp (revision 1000152) ++++ kinit/kinit.cpp (revision 1001887) @@ -22,6 +22,7 @@ #define QT_NO_CAST_FROM_ASCII @@ -386,8 +428,8 @@ } Index: kinit/config-kdeinit.h.cmake =================================================================== ---- kinit/config-kdeinit.h.cmake (revision 1000153) -+++ kinit/config-kdeinit.h.cmake (revision 1000474) +--- kinit/config-kdeinit.h.cmake (revision 1000152) ++++ kinit/config-kdeinit.h.cmake (revision 1001887) @@ -1,8 +1,10 @@ -// These are for proctitle.cpp: @@ -402,8 +444,8 @@ +#cmakedefine KDEINIT_OOM_PROTECT 1 Index: kinit/CMakeLists.txt =================================================================== ---- kinit/CMakeLists.txt (revision 1000153) -+++ kinit/CMakeLists.txt (revision 1000474) +--- kinit/CMakeLists.txt (revision 1000152) ++++ kinit/CMakeLists.txt (revision 1001887) @@ -17,8 +17,6 @@ check_include_files(unistd.h HAVE_UNISTD_H) check_function_exists(pstat HAVE_PSTAT) @@ -413,24 +455,25 @@ # used by 4 executables in this file -@@ -149,7 +147,34 @@ +@@ -149,7 +147,35 @@ target_link_libraries( klauncher kdeinit_klauncher ) install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR} ) +########### start_kdeinit ############### -+ -+set(start_kdeinit_SRCS start_kdeinit.c) -+kde4_add_executable(start_kdeinit ${start_kdeinit_SRCS}) -+if(KDE4_ENABLE_FPIE) -+ macro_add_compile_flags(start_kdeinit ${KDE4_CXX_FPIE_FLAGS}) -+ macro_add_link_flags(start_kdeinit ${KDE4_PIE_LDFLAGS}) -+endif(KDE4_ENABLE_FPIE) -+ -+set(start_kdeinit_wrapper_SRCS start_kdeinit_wrapper.c) -+kde4_add_executable(start_kdeinit_wrapper ${start_kdeinit_wrapper_SRCS}) -+ -+install(TARGETS start_kdeinit DESTINATION ${LIBEXEC_INSTALL_DIR}) -+install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) ++if (NOT WIN32) ++ set(start_kdeinit_SRCS start_kdeinit.c) ++ kde4_add_executable(start_kdeinit ${start_kdeinit_SRCS}) ++ if(KDE4_ENABLE_FPIE) ++ macro_add_compile_flags(start_kdeinit ${KDE4_CXX_FPIE_FLAGS}) ++ macro_add_link_flags(start_kdeinit ${KDE4_PIE_LDFLAGS}) ++ endif(KDE4_ENABLE_FPIE) ++ ++ set(start_kdeinit_wrapper_SRCS start_kdeinit_wrapper.c) ++ kde4_add_executable(start_kdeinit_wrapper ${start_kdeinit_wrapper_SRCS}) ++ ++ install(TARGETS start_kdeinit DESTINATION ${LIBEXEC_INSTALL_DIR}) ++ install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) ++endif (NOT WIN32) + +if (CMAKE_SYSTEM_NAME MATCHES Linux) + MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org