On Sunday 21 October 2007 08:19:23 Nico Golde wrote: > Hi Ardour maintainers, > Did someone of you already look into: > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446597? > I ask because this is the only thing missing from fixing the > security flaw in ardour described on: > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=445889 I've been looking into this. The pkg-config issue is trivial, a pkg-config build-dep was missing. I'm having a problem with the abs issue, though: I can't understand why it is there, and it doesn't appear here on i386. I think the problem is there because (for some strange reason) abs(long long) is defined on i386 and other archs but not on mips. I (hopefully, I don't have a mips machine to test on) work around that by making it an abs(double) and then casting to nframes_t. This appears to work here. Attached is a patch that makes the necessary changes. -- Felipe Sateler
diff -Nru trunk/debian/control trunk.new/debian/control
--- trunk/debian/control 2007-10-22 19:27:07.000000000 -0300
+++ trunk.new/debian/control 2007-10-22 19:37:03.000000000 -0300
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
Uploaders: Guenter Geiger (Debian/GNU) <geiger@debian.org>, Robert Jordens <jordens@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev, libcairomm-1.0-dev (>= 1.2.4)
+Build-Depends: autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev, libcairomm-1.0-dev (>= 1.2.4), pkg-config
Standards-Version: 3.7.2
Package: ardour
diff -Nru trunk/gtk2_ardour/editor_mouse.cc trunk.new/gtk2_ardour/editor_mouse.cc
--- trunk/gtk2_ardour/editor_mouse.cc 2007-10-22 19:30:28.000000000 -0300
+++ trunk.new/gtk2_ardour/editor_mouse.cc 2007-10-22 19:38:39.000000000 -0300
@@ -1530,8 +1530,8 @@
*/
if (!drag_info.move_threshold_passed) {
- bool x_threshold_passed = (abs ((nframes64_t) (drag_info.current_pointer_x - drag_info.grab_x)) > 4LL);
- bool y_threshold_passed = (abs ((nframes64_t) (drag_info.current_pointer_y - drag_info.grab_y)) > 4LL);
+ bool x_threshold_passed = (((nframes64_t) abs (drag_info.current_pointer_x - drag_info.grab_x)) > 4LL);
+ bool y_threshold_passed = (((nframes64_t) abs (drag_info.current_pointer_y - drag_info.grab_y)) > 4LL);
drag_info.move_threshold_passed = (x_threshold_passed || y_threshold_passed);
Attachment:
signature.asc
Description: This is a digitally signed message part.