Bug#696679: unblock: libmikmod/3.1.12-5

2012-12-30 Thread Julien Cristau
On Tue, Dec 25, 2012 at 18:18:48 +0100, Gergely Nagy wrote:

 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).
 
It would've been nice if the noise had been avoided.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#696679: unblock: libmikmod/3.1.12-5

2012-12-30 Thread Julien Cristau
On Tue, Dec 25, 2012 at 18:18:48 +0100, Gergely Nagy wrote:

  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
  
Why is this entry modified?

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#696679: unblock: libmikmod/3.1.12-5

2012-12-30 Thread Gergely Nagy
On Sun, Dec 30, 2012 at 9:14 PM, Julien Cristau jcris...@debian.org wrote:
 On Tue, Dec 25, 2012 at 18:18:48 +0100, Gergely Nagy wrote:

  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

 Why is this entry modified?

Because I merged the patches from Simon's git, which did not have his
latest changes (which, by the way, are all accounted for, the change
that wasn't in his git is reverted by -5) that were uploaded, and I
only noticed that when preparing the debdiff. Sorry about that.

--
|8]


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#696679: unblock: libmikmod/3.1.12-5

2012-12-25 Thread Gergely Nagy
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.0 +0200
+++ libmikmod-3.1.12/debian/changelog	2012-12-21 16:41:16.0 +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.0 +0200
+++ libmikmod-3.1.12/debian/control	2012-12-21 16:12:03.0 +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.0 +0100
+++ libmikmod-3.1.12/debian/libmikmod2.lintian-overrides	2012-12-21 16:48:37.0 +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.0 +0100
+++ libmikmod-3.1.12/debian/patches/0014-playercode-mdreg-Register-the-NULL-driver-before-the.patch	2012-12-21 16:09:51.0 +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