Hello community, here is the log from the commit of package gle-graphics for openSUSE:12.2 checked in at 2012-07-09 18:34:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/gle-graphics (Old) and /work/SRC/openSUSE:12.2/.gle-graphics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gle-graphics", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/gle-graphics/gle-graphics.changes 2012-06-25 15:20:16.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.gle-graphics.new/gle-graphics.changes 2012-07-09 18:34:09.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 9 12:14:14 UTC 2012 - [email protected] + +- Avoid some overflows + +------------------------------------------------------------------- +Thu Jun 28 10:02:29 UTC 2012 - [email protected] + +- apply RPM_OPT_FLAGS + +------------------------------------------------------------------- New: ---- overflow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gle-graphics.spec ++++++ --- /var/tmp/diff_new_pack.RMpwJr/_old 2012-07-09 18:34:09.000000000 +0200 +++ /var/tmp/diff_new_pack.RMpwJr/_new 2012-07-09 18:34:09.000000000 +0200 @@ -36,6 +36,7 @@ Patch0: gle-graphics-gcc44.patch # PATCH-FIX-UPSTREAM gle-graphics-gcc47.patch [email protected] -- Fix build for gcc4.7 Patch1: gle-graphics-gcc47.patch +Patch2: overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: c++_compiler @@ -109,6 +110,7 @@ %patch0 -b .gcc44 %patch1 -b .gcc47 +%patch2 -b .overflow cp %{SOURCE3} . @@ -123,6 +125,18 @@ src/samples/sample_compare.eps \ src/samples/qgle_keyboard.gle +for mk in $(find -name 'Makefile*.in') ; do + if ! grep -q '^CXXFLAGS=@CXXFLAGS@' $mk ; then + sed -ri 's/^(CXX=@CXX@)/\1 %optflags/' $mk + fi +done +(cat >> src/gui/qgle.pro.in)<<-'EOF' + unix { + QMAKE_CXXFLAGS += %optflags + QMAKE_CFLAGS += %optflags + } + EOF + %build %{configure} \ --with-extrafonts ++++++ overflow.patch ++++++ --- src/gle/eval.cpp +++ src/gle/eval.cpp 2012-07-09 12:02:01.544009358 +0000 @@ -939,7 +939,7 @@ void eval(int *pcode, int *cp, double *o } if (pcode[(*cp)] == 8) { /* Single constant */ - union {double d; int l[1];} both; + union {double d; int l[2];} both; both.l[0] = *(pcode+ ++(*cp)); both.l[1] = 0; dbg gprint("Constant %ld \n",both.l[0]); --- src/manip/cmd.cpp +++ src/manip/cmd.cpp 2012-07-09 12:09:18.388009416 +0000 @@ -680,7 +680,10 @@ int strcpywidth(char *dest, char *src, i int i; i = wid-strlen(src); if (i<0) i = 0; - memset(buff,' ',i); + if (i > sizeof(buff)) + i = sizeof(buff); + if (i > 0) + memset(buff,' ',i); buff[i] = 0; strcpy(dest,buff); strcat(dest,src); --- src/manip/eval.cpp +++ src/manip/eval.cpp 2012-07-09 12:02:21.668009990 +0000 @@ -78,7 +78,7 @@ void eval(int32 *pcode,int *cp,double *o /* place to put result number */ /* place to put result string */ /* place to put result type, 1=num, 2=str */ - union {double d; int32 l[1];} both; + union {double d; int32 l[2];} both; int plen,i,c; time_t today; double xx; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
