Hello community, here is the log from the commit of package xmset checked in at Thu Sep 6 21:04:39 CEST 2007. -------- --- xmset/xmset.changes 2007-02-08 01:14:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/xmset/xmset.changes 2007-09-04 11:48:49.565545000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 4 11:37:18 CEST 2007 - ms@suse.de + +- fixed segfault (#307284) + +------------------------------------------------------------------- @@ -4 +9 @@ -- added defattr +- added defattr ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmset.spec ++++++ --- /var/tmp/diff_new_pack.j12091/_old 2007-09-06 21:04:10.000000000 +0200 +++ /var/tmp/diff_new_pack.j12091/_new 2007-09-06 21:04:10.000000000 +0200 @@ -14,9 +14,9 @@ Requires: hwinfo Summary: A Small Command Line Tool for Mouse Configuration Version: 1.2 -Release: 54 +Release: 119 Group: System/X11/Utilities -License: GNU General Public License (GPL) +License: GPL v2 or later Source: xmset-1.2.tar.gz Patch: xmset-1.2.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +49,9 @@ /usr/sbin/xupdate /usr/sbin/xmset -%changelog -n xmset +%changelog +* Tue Sep 04 2007 - ms@suse.de +- fixed segfault (#307284) * Thu Feb 08 2007 - ro@suse.de - added defattr * Tue Feb 07 2006 - ms@suse.de ++++++ xmset-1.2.dif ++++++ --- /var/tmp/diff_new_pack.j12091/_old 2007-09-06 21:04:10.000000000 +0200 +++ /var/tmp/diff_new_pack.j12091/_new 2007-09-06 21:04:10.000000000 +0200 @@ -1,5 +1,5 @@ --- Makefile -+++ Makefile 2006/02/05 10:27:34 ++++ Makefile 2006/09/08 14:20:02 @@ -3,6 +3,7 @@ man_prefix= ${buildroot}/usr/share/man @@ -38,7 +38,7 @@ install: install -d -m 755 ${bindir} --- hwdata.h -+++ hwdata.h 2006/02/05 10:40:59 ++++ hwdata.h 2006/09/08 14:20:02 @@ -83,6 +83,6 @@ //----------------------------------- char *vend_id2str(unsigned vend); @@ -48,7 +48,7 @@ #endif --- ifaddrs.c -+++ ifaddrs.c 2006/02/07 08:43:24 ++++ ifaddrs.c 2006/09/08 14:20:02 @@ -401,7 +401,6 @@ pid_t pid = getpid(); @@ -71,7 +71,7 @@ } ifl = NULL; --- monitor.c -+++ monitor.c 2006/02/05 10:40:46 ++++ monitor.c 2006/09/08 14:20:02 @@ -27,8 +27,8 @@ //=================================== // MonitorGetData... @@ -215,7 +215,7 @@ // ... // save only the first data block --- xmset.c -+++ xmset.c 2006/02/07 08:39:12 ++++ xmset.c 2007/09/04 09:36:05 @@ -374,11 +374,9 @@ char option [256] = ""; char left [256] = ""; @@ -228,7 +228,7 @@ // get commandline options... //----------------------------- -@@ -624,12 +622,12 @@ +@@ -624,12 +622,15 @@ // show monitor configuration... //---------------------------------------- void showMonitorConfig (void) { @@ -236,6 +236,9 @@ - if ( ((display.dpix > 0) && (display.dpix < 100)) && - ((display.dpiy > 0) && (display.dpiy < 100)) + MsgDetect* display = MonitorGetData(); ++ if (! display) { ++ exit (0); ++ } + if ( ((display->dpix > 0) && (display->dpix < 100)) && + ((display->dpiy > 0) && (display->dpiy < 100)) ) { @@ -246,7 +249,7 @@ printf ("DisplaySize %d %d",x,y); } exit (0); -@@ -645,9 +643,6 @@ +@@ -645,9 +646,6 @@ int count = 1; for (lp=mp; lp; lp=lp->next) { @@ -256,7 +259,7 @@ if ( (strstr(lp->name,"Tablet") != NULL) || (strstr(lp->name,"tablet") != NULL) || -@@ -657,6 +652,9 @@ +@@ -657,6 +655,9 @@ // Tablet detected shouldn't be handled as mouse continue; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org