diff --git a/xfig.3.2.5-zoom_fpe.dif b/xfig.3.2.5-zoom_fpe.dif new file mode 100644 index 0000000..870be5f --- /dev/null +++ b/xfig.3.2.5-zoom_fpe.dif @@ -0,0 +1,13 @@ +Index: xfig.3.2.5/w_rulers.c +=================================================================== +--- w_rulers.c ++++ w_rulers.c 2009-03-06 11:23:08.000000000 +0200 +@@ -1149,7 +1149,7 @@ get_skip_prec(void) + /* look for values for current zoom */ + if ((display_zoomscale/appres.userscale <= rs->max_zoom) || + (rs->max_zoom == 0.0)) { +- skip = rs->skipt/appres.userscale; ++ skip = rs->skipt>appres.userscale ? rs->skipt/appres.userscale : 1; + skipx = skip * rs->skipx; + sprintf(precstr, "%%.%df", rs->prec); + break; diff --git a/xfig.changes b/xfig.changes index b27ab4d..4252c1c 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 6 11:23:08 CEST 2009 - werner@suse.de + +- Add fix to avoid FPE aftger zoom in (bnc#492295) + ------------------------------------------------------------------- Wed May 14 19:13:00 CEST 2008 - werner@suse.de diff --git a/xfig.spec b/xfig.spec index 38cb127..d30bb68 100644 --- a/xfig.spec +++ b/xfig.spec @@ -1,10 +1,17 @@ # # spec file for package xfig (Version 3.2.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Provides: xfig.3.2.3d Requires: transfig netpbm ghostscript-fonts-std AutoReqProv: on Version: 3.2.5 -Release: 92 +Release: 134 Summary: Facility for Interactive Generation of Figures under the X Window System Url: http://www.xfig.org/ Source: xfig.%{version}.tar.bz2 @@ -37,6 +44,7 @@ Patch6: xfig.%{version}-locale.dif Patch7: xfig.%{version}-fixes.dif Patch8: xfig.%{version}-pspdftex.dif Patch9: xfig.%{version}-zoom.dif +Patch10: xfig.%{version}-zoom_fpe.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" @@ -84,10 +92,11 @@ find -type f | xargs -r chmod a-x,go-w %patch7 -p0 -b .fixes %patch8 -p0 -b .pspdftex %patch9 -p0 -b .zoom -cp $RPM_SOURCE_DIR/font-test.fig . -xmkmf -a -D_DATA='%{_data}' -DStandardDefines='' +%patch10 -p0 -b .fpe +cp %{S:1} . %build +xmkmf -a -D_DATA='%{_data}' -DStandardDefines='' CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w -D_GNU_SOURCE -std=gnu99" CCOPTIONS="$CCOPTIONS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" make CCOPTIONS="$CCOPTIONS" @@ -139,6 +148,8 @@ find %{buildroot}/%{_docdir}/%{name} -name '*.orig' | xargs -r rm -f %doc %{_mandir}/man1/xfig.1x.gz %changelog +* Mon Apr 06 2009 werner@suse.de +- Add fix to avoid FPE aftger zoom in (bnc#492295) * Wed May 14 2008 werner@suse.de - Fix buffer overflow in zoom handling (bnc#390283) * Fri Apr 25 2008 werner@suse.de