From 65136e88e3887ac83e0c7be50203ae37df0fe5b70f05a127de393f95cf22599c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 22 Oct 2008 16:51:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/swig?expand=0&rev=12 --- swig-1.3.36-perl-long-long.patch | 24 ++++++++++++++++++++++++ swig.changes | 6 ++++++ swig.spec | 15 ++++++--------- 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 swig-1.3.36-perl-long-long.patch diff --git a/swig-1.3.36-perl-long-long.patch b/swig-1.3.36-perl-long-long.patch new file mode 100644 index 0000000..38cbd5a --- /dev/null +++ b/swig-1.3.36-perl-long-long.patch @@ -0,0 +1,24 @@ +--- + Lib/perl5/perlprimtypes.swg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- Lib/perl5/perlprimtypes.swg.orig ++++ Lib/perl5/perlprimtypes.swg +@@ -111,7 +111,7 @@ SWIG_AsVal_dec(unsigned long)(SV *obj, u + if (val) *val = SvUV(obj); + return SWIG_OK; + } else if (SvIOK(obj)) { +- long v = SvIV(obj); ++ long long v = SvIV(obj); + if (v >= 0) { + if (val) *val = v; + return SWIG_OK; +@@ -246,7 +246,7 @@ SWIG_AsVal_dec(unsigned long long)(SV *o + if (val) *val = SvUV(obj); + return SWIG_OK; + } else if (SvIOK(obj)) { +- long v = SvIV(obj); ++ long long v = SvIV(obj); + if (v >= 0) { + if (val) *val = v; + return SWIG_OK; diff --git a/swig.changes b/swig.changes index fc2f6ef..04fa017 100644 --- a/swig.changes +++ b/swig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 21 10:01:26 CEST 2008 - mmarek@suse.cz + +- fixed two integer overflows in perlprimtypes.swg. These were + actually why the two tests on ppc failed. *sigh* (bnc#431945) + ------------------------------------------------------------------- Fri Sep 26 11:21:13 CEST 2008 - mmarek@suse.cz diff --git a/swig.spec b/swig.spec index 9cad529..f05a4e2 100644 --- a/swig.spec +++ b/swig.spec @@ -26,8 +26,9 @@ Group: Development/Languages/C and C++ AutoReqProv: on Summary: Simplified Wrapper and Interface Generator Version: 1.3.36 -Release: 1 +Release: 2 Source: swig-%{version}.tar.bz2 +Patch1: swig-1.3.36-perl-long-long.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,6 +99,7 @@ Authors: %prep %setup -q +%patch1 %build v1=$(awk '/^# Generated by GNU Autoconf / { print $6; exit; }' configure) @@ -113,14 +115,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS" --prefix=/usr \ --libdir=%{_libdir} make %{?jobs:-j%jobs} -# vvv begin 1.3.36 workaround vvv -%ifarch ppc -# these test-cases fail on ppc on some corner-cases -mv Examples/test-suite/perl5/li_typemaps_runme.pl{,.DISABLED} -mv Examples/test-suite/perl5/reference_global_vars_runme.pl{,.DISABLED} -%endif -test %version = 1.3.36 -# ^^^ end 1.3.36 workaround ^^^ make check %install @@ -161,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/swig %changelog +* Tue Oct 21 2008 mmarek@suse.cz +- fixed two integer overflows in perlprimtypes.swg. These were + actually why the two tests on ppc failed. *sigh* (bnc#431945) * Fri Sep 26 2008 mmarek@suse.cz - disable two perl tests on ppc * Wed Sep 24 2008 mmarek@suse.cz