Mailinglist Archive: opensuse-commit (875 mails)

< Previous

Hello community,

here is the log from the commit of package kdebase4-workspace
checked in at Wed Jul 9 21:11:50 CEST 2008.

--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-06-30
23:59:06.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-07-09
21:10:06.411632000 +0200
@@ -1,0 +2,10 @@
+Mon Jul 7 11:52:13 CEST 2008 - dmueller@xxxxxxx
+
+- update to 4.0.85
+
+-------------------------------------------------------------------
+Wed Jul 2 17:50:07 CEST 2008 - schwab@xxxxxxx
+
+- Fix broken use of ptrace.
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change

Old:
----
kdebase-workspace-4.0.84.tar.bz2

New:
----
kdebase-workspace-4.0.85.tar.bz2
r829672.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.s26803/_old 2008-07-09 21:10:48.000000000 +0200
+++ /var/tmp/diff_new_pack.s26803/_new 2008-07-09 21:10:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.0.84)
+# spec file for package kdebase4-wallpapers (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,7 +21,7 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.0.84
+Version: 4.0.85
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +59,10 @@
/usr/share/wallpapers

%changelog
+* Mon Jul 07 2008 dmueller@xxxxxxx
+- update to 4.0.85
+* Wed Jul 02 2008 schwab@xxxxxxx
+- Fix broken use of ptrace.
* Mon Jun 30 2008 dmueller@xxxxxxx
- branch diff update
* Tue Jun 24 2008 dmueller@xxxxxxx

++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.s26803/_old 2008-07-09 21:10:48.000000000 +0200
+++ /var/tmp/diff_new_pack.s26803/_new 2008-07-09 21:10:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.0.84)
+# spec file for package kdebase4-workspace (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,7 +26,7 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.0.84
+Version: 4.0.85
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
Source2: titlebar_decor.png
@@ -57,6 +57,7 @@
Patch85: windeco-color.diff
Patch87: klipperrc.diff
Patch88: kde4-migrate.diff
+Patch89: r829672.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
%if %suse_version > 1030
@@ -111,6 +112,7 @@
%patch85
%patch87
%patch88
+%patch89

%build
%cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm
-DKDE4_KCHECKPASS_PAM_SERVICE=xdm
@@ -130,7 +132,7 @@
sed -ri "s,.*%{_kde_config_dir}/kdm/README,," filelists/kdm
sed -ri "s,.*(%{_kde_config_dir}/kdm/kdmrc),%config(noreplace) \1,"
filelists/kdm
rm -f $RPM_BUILD_ROOT/%{_kde_config_dir}/kdm/README
- sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/circles.*,," filelists/kdm
+ sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/oxygen.*,," filelists/kdm
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm
mv $RPM_BUILD_ROOT/usr/share/wallpapers/EOS $RPM_BUILD_ROOT/usr/share/
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Code_Poets_Dream
@@ -224,7 +226,7 @@
%doc COPYING
%config(noreplace) %_kde_config_dir/kdm/backgroundrc
%_kde_share_dir/apps/kdm/pics
-%_kde_share_dir/apps/kdm/themes/circles
+%_kde_share_dir/apps/kdm/themes/oxygen

%package ksysguardd
License: GPL v2 or later
@@ -714,6 +716,10 @@
/usr/share/icons/Oxygen_Zion_Big

%changelog
+* Mon Jul 07 2008 dmueller@xxxxxxx
+- update to 4.0.85
+* Wed Jul 02 2008 schwab@xxxxxxx
+- Fix broken use of ptrace.
* Mon Jun 30 2008 dmueller@xxxxxxx
- branch diff update
* Tue Jun 24 2008 dmueller@xxxxxxx

++++++ 4_1_BRANCH.diff ++++++
++++ 35087 lines (skipped)
++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff
++++ and kdebase4-workspace/4_1_BRANCH.diff

++++++ kdebase-workspace-4.0.84.tar.bz2 -> kdebase-workspace-4.0.85.tar.bz2
++++++
KDE/kdebase4-workspace/kdebase-workspace-4.0.84.tar.bz2
kdebase4-workspace/kdebase-workspace-4.0.85.tar.bz2 differ: byte 11, line 1

++++++ r829672.diff ++++++
------------------------------------------------------------------------
r829672 | mueller | 2008-07-08 22:21:58 +0200 (Tue, 08 Jul 2008) | 3 lines

fix ptrace support for ppc64 and ia64, patch by Andreas Schwab at
suse.de

------------------------------------------------------------------------
Index: libs/ksysguard/processui/KMonitorProcessIO.cpp
===================================================================
--- libs/ksysguard/processui/KMonitorProcessIO.cpp (revision 829671)
+++ libs/ksysguard/processui/KMonitorProcessIO.cpp (revision 829672)
@@ -39,42 +39,39 @@
#include <sys/syscall.h>
#include <sys/user.h>
#include <ctype.h>
-#ifdef HAVE_SYS_ENDIAN_H
- //Required to define _BIG_ENDIAN on big endian systems
-#include <sys/endian.h>
-#else
-#include <endian.h>
-#endif
-#if defined(_BIG_ENDIAN) && defined(HAVE_BYTESWAP_H)
-//Required for bswap on big endian systems
-#include <byteswap.h>
-#endif

#ifdef __i386__
- #define REG_ORIG_ACCUM orig_eax
- #define REG_ACCUM eax
- #define REG_PARAM1 ebx
- #define REG_PARAM2 ecx
- #define REG_PARAM3 edx
-#else
+ #define REG_ORIG_ACCUM(regs) regs.orig_eax
+ #define REG_ACCUM(regs) regs.eax
+ #define REG_PARAM1(regs) regs.ebx
+ #define REG_PARAM2(regs) regs.ecx
+ #define REG_PARAM3(regs) regs.edx
+#endif
#ifdef __amd64__
- #define REG_ORIG_ACCUM orig_rax
- #define REG_ACCUM rax
- #define REG_PARAM1 rdi
- #define REG_PARAM2 rsi
- #define REG_PARAM3 rdx
-#else
+ #define REG_ORIG_ACCUM(regs) regs.orig_rax
+ #define REG_ACCUM(regs) regs.rax
+ #define REG_PARAM1(regs) regs.rdi
+ #define REG_PARAM2(regs) regs.rsi
+ #define REG_PARAM3(regs) regs.rdx
+#endif
#if defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__) ||
defined(__PPC__) || defined(powerpc)
- #define REG_ORIG_ACCUM gpr[0]
- #define REG_ACCUM gpr[3]
- #define REG_PARAM1 orig_gpr3
- #define REG_PARAM2 gpr[4]
- #define REG_PARAM3 gpr[5]
+ #define REG_ORIG_ACCUM(regs) regs.gpr[0]
+ #define REG_ACCUM(regs) regs.gpr[3]
+ #define REG_PARAM1(regs) regs.orig_gpr3
+ #define REG_PARAM2(regs) regs.gpr[4]
+ #define REG_PARAM3(regs) regs.gpr[5]
#ifndef PT_ORIG_R3
#define PT_ORIG_R3 34
#endif
#endif
-#endif
+#ifdef __ia64__
+ #undef slots
+ #include <sys/rse.h>
+ #define REG_ORIG_ACCUM(regs) regs.pt.gr[15]
+ #define REG_ACCUM(regs) (regs.pt.gr[10] ? -regs.pt.gr[8] :
regs.pt.gr[8])
+ #define REG_PARAM1(regs) regs.arg[0]
+ #define REG_PARAM2(regs) regs.arg[1]
+ #define REG_PARAM3(regs) regs.arg[2]
#endif

#include "KMonitorProcessIO.h"
@@ -221,7 +218,7 @@ void KMonitorProcessIO::update(bool modi

int status;
int pid = waitpid(-1, &status, WNOHANG | WUNTRACED | WCONTINUED);
- if (!WIFSTOPPED(status)) {
+ if (pid == -1 || !WIFSTOPPED(status)) {
if(modified)
ensureCursorVisible();
return;
@@ -233,35 +230,62 @@ void KMonitorProcessIO::update(bool modi
regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_R4, 0);
regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_R5, 0);
regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_ORIG_R3, 0);
-#else
+#endif
+#ifdef __ia64__
+ struct {
+ struct pt_all_user_regs pt;
+ unsigned long arg[3];
+ } regs;
+ ptrace(PTRACE_GETREGS, pid, 0, &regs.pt);
+ if (REG_ORIG_ACCUM(regs) >= 0) {
+ unsigned long *out0 = ia64_rse_skip_regs((unsigned long
*)regs.pt.ar[17], -(regs.pt.cfm & 0x7f) + ((regs.pt.cfm >> 7) & 0x7f));
+ regs.arg[0] = ptrace(PTRACE_PEEKDATA, pid,
ia64_rse_skip_regs(out0, 0), 0);
+ regs.arg[1] = ptrace(PTRACE_PEEKDATA, pid,
ia64_rse_skip_regs(out0, 1), 0);
+ regs.arg[2] = ptrace(PTRACE_PEEKDATA, pid,
ia64_rse_skip_regs(out0, 2), 0);
+ }
+#endif
+#if defined __i386__ || defined __amd64__
struct user_regs_struct regs;
ptrace(PTRACE_GETREGS, pid, 0, &regs);
#endif
/*unsigned int b = ptrace(PTRACE_PEEKTEXT, pid, regs.eip, 0);*/
- if (mIncludeChildProcesses && (regs.REG_ORIG_ACCUM == SYS_fork ||
regs.REG_ORIG_ACCUM == SYS_clone)) {
- if (regs.REG_ACCUM > 0)
- attach(regs.REG_ACCUM);
- }
- if ((regs.REG_ORIG_ACCUM == SYS_read || regs.REG_ORIG_ACCUM ==
SYS_write) && (regs.REG_PARAM3 == regs.REG_ACCUM)) {
- for (unsigned int i = 0; i < regs.REG_PARAM3; i++) {
- unsigned int a = ptrace(PTRACE_PEEKTEXT, pid,
regs.REG_PARAM2 + i, 0);
-#ifdef _BIG_ENDIAN
- a = bswap_32(a);
-#endif
+ if (mIncludeChildProcesses && (
+#ifdef SYS_fork
+ REG_ORIG_ACCUM(regs) == SYS_fork ||
+#endif
+#ifdef SYS_clone
+ REG_ORIG_ACCUM(regs) == SYS_clone ||
+#endif
+#ifdef SYS_clone2
+ REG_ORIG_ACCUM(regs) == SYS_clone2 ||
+#endif
+ 0)) {
+ if (REG_ACCUM(regs) > 0)
+ attach(REG_ACCUM(regs));
+ }
+ if ((REG_ORIG_ACCUM(regs) == SYS_read || REG_ORIG_ACCUM(regs) ==
SYS_write) && (REG_PARAM3(regs) == REG_ACCUM(regs))) {
+ for (unsigned long i = 0; i < REG_PARAM3(regs); i++) {
+ union {
+ unsigned long l;
+ unsigned char c[sizeof(long)];
+ } a;
+ a.l = ptrace(PTRACE_PEEKDATA, pid, REG_PARAM2(regs) +
i, 0);
if(!modified) {
//Before we add text or change the color, make
sure we are at the end
moveCursor(QTextCursor::End);
}
- if(regs.REG_ORIG_ACCUM != lastdir) {
- if(regs.REG_ORIG_ACCUM == SYS_read)
+ if(REG_ORIG_ACCUM(regs) != lastdir) {
+ if(REG_ORIG_ACCUM(regs) == SYS_read)
setTextColor(readColor);
else
setTextColor(writeColor);
- lastdir = regs.REG_ORIG_ACCUM;
+ lastdir = REG_ORIG_ACCUM(regs);
+ }
+ for (unsigned j = 0; j < sizeof(a.c) && i <
REG_PARAM3(regs); i++, j++) {
+ unsigned char c = a.c[j];
+ /** Use the KTextEditVT specific function to
parse the character 'c' */
+ insertVTChar(QChar(c));
}
- char c = a&0xff;
- /** Use the KTextEditVT specific function to parse the
character 'c' */
- insertVTChar(QChar(c));
}
modified = true;
}

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (875 mails)

commit kdebase4-workspace

Search this list

List Navigation

This Thread