Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package libmikmod
The current package in testing suffers from a serious issue (not
reported though, only observed while preparing -5): in certain cases,
applications that rely on libmikmod will not see any driver but the
nosound one, effectively rendering them useless. As it turns out,
enabling the fortify hardening flags breaks libmikmod's module loading,
so -5 turns that off, as a temporary measure until I figure out what the
underlying problem really is.
It also rearranges the order of sound drivers, so nosound is preferred
over saving to music.raw, as to not pollute the filesystem with huge
music files. With this change in place, the pulseaudio-esound-compat |
oss-compat recommendation could be lowered to suggests.
All of these are fairly trivial changes, but nevertheless, would make
the libmikmod version in wheezy much more useful, so I'd like to request
an unblock for it.
A debdiff between -4.1 (currently in wheezy) and -5 (in unstable) has
been attached. Some parts of the diff have been omitted, as they're just
noise (timestamp changes under debian/patches, and other noops like
that).
Thanks in advance!
unblock libmikmod/3.1.12-5
--
|8]
diff -Nru libmikmod-3.1.12/debian/changelog libmikmod-3.1.12/debian/changelog
--- libmikmod-3.1.12/debian/changelog 2012-10-19 23:06:31.000000000 +0200
+++ libmikmod-3.1.12/debian/changelog 2012-12-21 16:41:16.000000000 +0100
@@ -1,13 +1,26 @@
+libmikmod (3.1.12-5) unstable; urgency=low
+
+ * Acknowledge the NMU, thanks Simon!
+ * Make the nosound driver have higher priority than the disk
+ writers. (Closes: #690943)
+ * Demote the pulseaudio-esound-compat | oss-compat recommendation to
+ Suggests, now that the fallback is not the disk writer.
+ (Closes: #696013)
+ * Build with hardening=-fortify, as enabling fortification breaks the
+ driver loading.
+
+ -- Gergely Nagy <alger...@madhouse-project.org> Fri, 21 Dec 2012 16:41:15 +0100
+
libmikmod (3.1.12-4.1) unstable; urgency=low
- * Non-maintainer upload (acknowledged by maintainer).
+ * Non-maintainer upload.
* Apply patches from Hans de Goede and Pantelis Koukousoulas to enable
the ESD driver, so we can interoperate with PulseAudio (Closes: #385844)
* Recommend pulseaudio-esound-compat | oss-compat because if we don't have
one of those, the fallback path is to write output to ./music.raw, which
is unlikely to be what you want!
- -- Simon McVittie <s...@debian.org> Fri, 19 Oct 2012 22:05:18 +0100
+ -- Simon McVittie <s...@debian.org> Fri, 19 Oct 2012 09:12:08 +0100
libmikmod (3.1.12-4) unstable; urgency=low
diff -Nru libmikmod-3.1.12/debian/control libmikmod-3.1.12/debian/control
--- libmikmod-3.1.12/debian/control 2012-10-19 23:04:43.000000000 +0200
+++ libmikmod-3.1.12/debian/control 2012-12-21 16:12:03.000000000 +0100
@@ -32,7 +32,7 @@
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: pulseaudio-esound-compat | oss-compat
+Suggests: pulseaudio-esound-compat | oss-compat
Description: Portable sound library
This library is capable of playing samples as well as module
files and was originally written by Jean-Paul Mikkers (MikMak) for DOS. It has
diff -Nru libmikmod-3.1.12/debian/libmikmod2.lintian-overrides libmikmod-3.1.12/debian/libmikmod2.lintian-overrides
--- libmikmod-3.1.12/debian/libmikmod2.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ libmikmod-3.1.12/debian/libmikmod2.lintian-overrides 2012-12-21 16:48:37.000000000 +0100
@@ -0,0 +1,3 @@
+# Fortification has been explicitly disabled, as it breaks module
+# loading for some reason.
+libmikmod2: hardening-no-fortify-functions usr/lib/*/libmikmod.so.2.0.4
diff -Nru libmikmod-3.1.12/debian/patches/0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch libmikmod-3.1.12/debian/patches/0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch
--- libmikmod-3.1.12/debian/patches/0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmikmod-3.1.12/debian/patches/0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch 2012-12-21 16:09:51.000000000 +0100
@@ -0,0 +1,37 @@
+From: Gergely Nagy <alger...@madhouse-project.org>
+Date: Fri, 21 Dec 2012 16:07:43 +0100
+Subject: playercode/mdreg: Register the NULL driver before the file writers
+
+Register the NULL driver sooner, as having no sound is preferable to
+writing to music.raw: file writing should be used only when explicitly
+selected.
+
+Reported-by: Simon McVittie <s...@debian.org>
+Closes: #690943
+Signed-off-by: Gergely Nagy <alger...@madhouse-project.org>
+---
+ playercode/mdreg.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/playercode/mdreg.c b/playercode/mdreg.c
+index 4018c7e..f158e18 100644
+--- a/playercode/mdreg.c
++++ b/playercode/mdreg.c
+@@ -82,6 +82,8 @@ void _mm_registeralldrivers(void)
+ _mm_registerdriver(&drv_mac);
+ #endif
+
++ _mm_registerdriver(&drv_nos);
++
+ /* Register disk writers */
+ _mm_registerdriver(&drv_raw);
+ _mm_registerdriver(&drv_wav);
+@@ -93,8 +95,6 @@ void _mm_registeralldrivers(void)
+ #ifndef macintosh
+ _mm_registerdriver(&drv_stdout);
+ #endif
+-
+- _mm_registerdriver(&drv_nos);
+ }
+
+ void MikMod_RegisterAllDrivers(void)
diff -Nru libmikmod-3.1.12/debian/patches/series libmikmod-3.1.12/debian/patches/series
--- libmikmod-3.1.12/debian/patches/series 2012-10-19 10:11:45.000000000 +0200
+++ libmikmod-3.1.12/debian/patches/series 2012-12-21 16:09:51.000000000 +0100
@@ -11,3 +11,4 @@
0011-Disable-ALSA-by-default.patch
0012-fix-ESD.patch
0013-fix-building-of-ESD.patch
+0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch
diff -Nru libmikmod-3.1.12/debian/rules libmikmod-3.1.12/debian/rules
--- libmikmod-3.1.12/debian/rules 2012-10-19 10:13:38.000000000 +0200
+++ libmikmod-3.1.12/debian/rules 2012-12-21 16:40:37.000000000 +0100
@@ -1,6 +1,7 @@
#! /usr/bin/make -f
-export DH_OPTIONS += -O-Bbuild
+export DH_OPTIONS += -O-Bbuild
+export DEB_BUILD_MAINT_OPTIONS = hardening=-fortify
override_dh_auto_configure:
dh_auto_configure -- \
