Bug#862346: unblock: sbc/1.3-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
Please unblock package sbc 1.3-2 as it fixes a RC bug
(Closes: 856487).
This fixes the problem that libsbc crashes on armhf.
This is a problem with ARM's assembler. This fix avoids
the problem by not using the ARM assembler, and using C
implementation.
unblock sbc/1.3-2
diff -Nru sbc-1.3/debian/changelog sbc-1.3/debian/changelog
--- sbc-1.3/debian/changelog 2015-06-01 14:18:18.000000000 +0900
+++ sbc-1.3/debian/changelog 2017-05-08 09:59:43.000000000 +0900
@@ -1,3 +1,14 @@
+sbc (1.3-2) unstable; urgency=medium
+
+ * Disable the ARMv6 asm implementation. (Closes: #856487)
+ This gets miscompiled with recent gcc since gcc does not consider
+ r3 clobbered by the basic asm in a naked function (see #856487).
+ The imost simple short-term fix is to disable the ARMv6 asm
+ implementation on armhf and use the C implementation instead.
+ Thanks to Adrian Bunk <bunk@debian.org> and bug reporters.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Mon, 08 May 2017 09:59:43 +0900
+
sbc (1.3-1) unstable; urgency=medium
* Upload to unstable.
diff -Nru sbc-1.3/debian/patches/0001-Add-config.h-in-sbc-sbc_primitives.h.patch sbc-1.3/debian/patches/0001-Add-config.h-in-sbc-sbc_primitives.h.patch
--- sbc-1.3/debian/patches/0001-Add-config.h-in-sbc-sbc_primitives.h.patch 1970-01-01 09:00:00.000000000 +0900
+++ sbc-1.3/debian/patches/0001-Add-config.h-in-sbc-sbc_primitives.h.patch 2017-05-08 09:59:43.000000000 +0900
@@ -0,0 +1,33 @@
+From e460c51017a7d1e04511ea4d293296a3d422049a Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date: Mon, 3 Apr 2017 01:42:26 +0900
+Subject: [PATCH] Add config.h in sbc/sbc_primitives.h
+
+When we use "--enable-high-precision" option of configure, this does not work
+effectively. Because SBC_HIGH_PRECISION enabled by this option is not available
+in "sbc/sbc_primitives.h".
+This adds config.h to "sbc/sbc_primitives.h" to use SBC_HIGH_PRECISION.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+---
+ sbc/sbc_primitives.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sbc/sbc_primitives.h b/sbc/sbc_primitives.h
+index e01c957..b060484 100644
+--- a/sbc/sbc_primitives.h
++++ b/sbc/sbc_primitives.h
+@@ -27,6 +27,10 @@
+ #ifndef __SBC_PRIMITIVES_H
+ #define __SBC_PRIMITIVES_H
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #define SCALE_OUT_BITS 15
+ #define SBC_X_BUFFER_SIZE 328
+
+--
+2.11.0
+
diff -Nru sbc-1.3/debian/patches/series sbc-1.3/debian/patches/series
--- sbc-1.3/debian/patches/series 1970-01-01 09:00:00.000000000 +0900
+++ sbc-1.3/debian/patches/series 2017-05-08 09:59:43.000000000 +0900
@@ -0,0 +1 @@
+0001-Add-config.h-in-sbc-sbc_primitives.h.patch
diff -Nru sbc-1.3/debian/rules sbc-1.3/debian/rules
--- sbc-1.3/debian/rules 2015-02-23 08:03:25.000000000 +0900
+++ sbc-1.3/debian/rules 2017-05-08 09:59:43.000000000 +0900
@@ -2,11 +2,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CONFIGURE_OPTION = --disable-tester --disable-silent-rules
+# for i386 arch
+ifeq ($(DEB_HOST_ARCH),armhf)
+CONFIGURE_OPTION += --enable-high-precision
+endif
+
%:
dh $@ --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --disable-tester --disable-silent-rules
+ dh_auto_configure -- $(CONFIGURE_OPTION)
override_dh_strip:
dh_strip -a --dbg-package=sbc-db
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: armhf, armel, sh4, powerpc
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=ja_JP.utf8, LC_CTYPE=ja_JP.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: