Hello community,
here is the log from the commit of package xosview
checked in at Mon Dec 11 20:42:47 CET 2006.
--------
--- xosview/xosview.changes 2006-07-31 12:03:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/xosview/xosview.changes 2006-12-11 11:53:37.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Dec 11 11:52:48 CET 2006 - werner@suse.de
+
+- Expand search path for app-defaults to /usr/share/X11 (#227401)
+
+-------------------------------------------------------------------
New:
----
xosview-1.8.3-appdef.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.UI3krb/_old 2006-12-11 20:42:41.000000000 +0100
+++ /var/tmp/diff_new_pack.UI3krb/_new 2006-12-11 20:42:41.000000000 +0100
@@ -12,14 +12,14 @@
Name: xosview
BuildRequires: desktop-data-SuSE gcc-c++ pkgconfig update-desktop-files xorg-x11-devel
-License: GPL, BSD
+License: BSD License and BSD-like, Other License(s), see package
Group: System/Monitoring
Autoreqprov: on
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
Version: 1.8.3
-Release: 2
+Release: 25
Summary: System Load Information
URL: http://sourceforge.net/projects/xosview/
Source: xosview-%{version}.tar.bz2
@@ -33,6 +33,7 @@
Patch7: xosview-%{version}-longint.patch
Patch8: xosview-1.8.2-float-conv.patch
Patch9: xosview-1.8.2-configure.patch
+Patch10: xosview-1.8.3-appdef.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
@@ -66,6 +67,7 @@
%patch7 -p0 -b ".ulong"
%patch8 -p0 -b ".float-conv"
%patch9 -p0 -b ".conf"
+%patch10 -p0 -b ".appdef"
%patch
%{?suse_update_config:%{suse_update_config -f config}}
@@ -121,6 +123,8 @@
%doc %{_docdir}/xosview/README.linux
%changelog -n xosview
+* Mon Dec 11 2006 - werner@suse.de
+- Expand search path for app-defaults to /usr/share/X11 (#227401)
* Mon Jul 31 2006 - werner@suse.de
- Correct mandir for the manual page
* Thu Jul 27 2006 - werner@suse.de
@@ -279,8 +283,8 @@
- detect kernel-version from UTS-Release (not from uname -r)
* Thu May 28 1998 - werner@suse.de
- New version 1.6.0
-- Remove suid bit from binary
-- Add a message for sending after installation
+ - Remove suid bit from binary
+ - Add a message for sending after installation
* Wed Feb 11 1998 - werner@suse.de
- New revision
* Tue Nov 04 1997 - werner@suse.de
++++++ xosview-1.8.3-appdef.dif ++++++
--- Xrm.cc
+++ Xrm.cc 2006-12-11 10:46:28.000000000 +0000
@@ -11,6 +11,7 @@
#include
#include // For snprintf().
#include
+#include // For stat().
#ifdef HAVE_IOSTREAM
#include <iostream>
#else
@@ -152,20 +153,26 @@ Listed from weakest to strongest:
// Merge in the system resource database.
char rfilename[2048];
+ struct stat st;
// Get the app-defaults
+ snprintf(rfilename, 2048, "/usr/share/X11/app-defaults/%s",
+ XrmQuarkToString(_class));
+ if (rfilename != NULL && stat(rfilename, &st) == 0)
+ XrmCombineFileDatabase (rfilename, &_db, 1);
+ // Old X11R6
snprintf(rfilename, 2048, "/usr/X11R6/lib/X11/app-defaults/%s",
XrmQuarkToString(_class));
- if (rfilename != NULL)
+ if (rfilename != NULL && stat(rfilename, &st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
// Try a few more, for SunOS/Solaris folks.
snprintf(rfilename, 2048, "/usr/openwin/lib/X11/app-defaults/%s",
XrmQuarkToString(_class));
- if (rfilename != NULL)
+ if (rfilename != NULL && stat(rfilename, &st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
snprintf(rfilename, 2048, "/usr/local/X11R6/lib/X11/app-defaults/%s",
XrmQuarkToString(_class));
- if (rfilename != NULL)
+ if (rfilename != NULL && stat(rfilename, &st) == 0)
XrmCombineFileDatabase (rfilename, &_db, 1);
// Now, check for an XOSView file in the XAPPLRESDIR directory...
++++++ xosview-1.8.3.dif ++++++
--- /var/tmp/diff_new_pack.UI3krb/_old 2006-12-11 20:42:41.000000000 +0100
+++ /var/tmp/diff_new_pack.UI3krb/_new 2006-12-11 20:42:41.000000000 +0100
@@ -1,6 +1,6 @@
--- .pkgextract
+++ .pkgextract 2006-07-26 18:08:30.000000000 +0200
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
+patch -p0 -s --suffix=".serial" < ../xosview-1.8.2-serial.patch
+patch -p0 -s --suffix=".procsys" < ../xosview-1.8.1-procsys.patch
+patch -p0 -s --suffix=".maxlimit" < ../xosview-1.8.2-maxlimit.patch
@@ -9,6 +9,7 @@
+patch -p0 -s --suffix=".ulong" < ../xosview-1.8.3-longint.patch
+patch -p0 -s --suffix=".float" < ../xosview-1.8.2-float-conv.patch
+patch -p0 -s --suffix=".conf" < ../xosview-1.8.2-configure.patch
++patch -p0 -s --suffix=".appdef" < ../xosview-1.8.3-appdef.dif
--- README.linux
+++ README.linux 2006-07-26 18:08:30.000000000 +0200
@@ -26,7 +26,7 @@ To install xosview:
@@ -16,7 +17,7 @@
run xosview suid root (this will just disable the serial meters) you
can change the permissions to whatever you like. The X defaults for
- xosview (Xdefaults) are copied to /usr/lib/X11/app-defaults/XOsview.
-+ xosview (Xdefaults) are copied to /usr/X11R6/lib/X11/app-defaults/XOsview.
++ xosview (Xdefaults) are copied to /usr/share/X11/app-defaults/XOsview.
To run xosview :
@@ -31,13 +32,13 @@
+ system. Unfortunately this requires root permissions. Therefore this
+ feature is *disabled* by default in
+
-+ /usr/X11R6/lib/X11/app-defaults/XOsview
++ /usr/share/X11/app-defaults/XOsview
+
+ and the program /usr/X11R6/bin/xosview does *not* run suid root due to
+ lack of security of xosview. It *is* exploitable at some parts of its code.
+
+ If you want to use the serial meters you have to change `xosview*serial<X>'
-+ in /usr/X11R6/lib/X11/app-defaults/XOsview *and* add a line
++ in /usr/share/X11/app-defaults/XOsview *and* add a line
+
+ /usr/X11R6/bin/xosview.bin root.root 4755
+
@@ -552,7 +553,7 @@
a default value assigned to it. These values can be found in the file
Xdefaults which can be obtained in the source distribution of xosview.
-They can be overridden in the usual places (/usr/lib/X11/app-defaults/XOsview,
-+They can be overridden in the usual places (/usr/X11R6/lib/X11/app-defaults/XOsview,
++They can be overridden in the usual places (/usr/share/X11/app-defaults/XOsview,
$HOME/.Xdefaults, etc.).
It should be noted that it is OK to have a resource defined for a port of
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org