Bug#768139: unblock: mumble/1.2.8-1
On Thu, Nov 06, 2014 at 02:24:20PM +0000, Adam D. Barratt wrote:
> On 2014-11-06 2:52, Chris Knadle wrote:
> >On 05.11.14, Adam D. Barratt wrote:
> >>Control: tags -1 + moreinfo
> >>
> >>On Wed, 2014-11-05 at 05:43 -0500, Chris Knadle wrote:
> >>> mumble_1.2.8-1 contains a bugfix of priority "important" for
> >>> allowing installation with pre-allocated user/group and the
> >>> package has been in Unstable for 6 days without new bugs reported.
> >>> Additionally 1.2.8-1 is marked as a "stable" upstream version,
> >>> where the current 1.2.8~7~g76f6870-2 in Jessie is a "snapshot".
> >>> The differences in code between the versions are small -- I believe
> >>> it's literrally only two patches incorporated.
> >>
> >>There's also
> >>
> >> debian/mumble-server.init | 143 +++++++++++++++++++
> >>
> >>which doesn't appear to be mentioned afaics.
> >
> >*sigh* Thanks for catching this: it wasn't mentioned because I
> >didn't make this change (AFAIK) and was unaware of it concerning this
> >upload;
> [...]
> >At one time I had accidentily included a debian/mumble-server.init
> >(in a prior version) because it's something upstream includes in
> >their PPA package for Ubuntu so I was testing using the file but had
> >not committed it to git.
> [...]
> >Other than that, do you have a suggestion as to how I should proceed
> >from here?
>
> If it can happen really soon, I'd be happy with an upload that matches
> what you intended.
Okay, a new mumble 1.2.8-2 has been uploaded into Unstable, and I believe
it matches what we would all want.
I was asked to revert the Standards-Version back to 3.9.5 so this upload
is just slightly different from the last debdiff I sent; as such I've
attaching a new debdiff and an interdiff against the first debdiff
(mumble_1.2.8~7_to_1.2.8-1.diff) that I had started the bug with. The
interdiff is just slightly larger than expected because the time zone
changed back an hour (-0400 to -0500) since the last upload.
Thanks much.
-- Chris
--
Chris Knadle
Chris.Knadle@coredump.us
diffstat for mumble-1.2.8~7~g76f6870 mumble-1.2.8
CHANGES | 42 ++++++++++++
debian/changelog | 29 ++++++++
debian/control | 1
debian/mumble-server.postinst | 4 -
debian/patches/23-fix-pulseaudio-segfault-pt1.diff | 66 -------------------
debian/patches/24-fix-pulseaudio-segfault-pt2.diff | 48 -------------
debian/patches/25-make-logfiles-readable-by-adm.diff | 15 ++++
debian/patches/series | 3
src/Version.h | 2
src/mumble/PulseAudio.cpp | 26 ++++++-
10 files changed, 112 insertions(+), 124 deletions(-)
diff -Nru mumble-1.2.8~7~g76f6870/CHANGES mumble-1.2.8/CHANGES
--- mumble-1.2.8~7~g76f6870/CHANGES 2014-07-04 06:15:44.000000000 -0400
+++ mumble-1.2.8/CHANGES 2014-08-08 11:51:59.000000000 -0400
@@ -1,3 +1,36 @@
+2014-08-08
+ Mikkel Krautz <mikkel@krautz.dk>
+ 82c483e scripts: modify git2cl.pl to work on the currently checked-out
+ branch rather than origin/master.
+
+2014-07-23
+ Mikkel Krautz <mikkel@krautz.dk>
+ 0bf4aa3 PulseAudio: don't call pa_stream_drop() for empty
+ pa_stream_peek().
+
+2014-07-20
+ Mikkel Krautz <mikkel@krautz.dk>
+ 633f905 PulseAudio: stricter pa_stream_peek() validation.
+
+2014-07-02
+ Mikkel Krautz <mikkel@krautz.dk>
+ 76f6870 PulseAudio: fix access to protected enums in AudioInput and
+ AudioOutput.
+ 9529651 installer: add the ability to use a custom bzip2 directory in
+ the Win32 installer.
+ 8609912 installer: fix ability to use a custom OpenSslDir when
+ building the Win32 installer.
+
+2014-06-29
+ Mikkel Krautz <mikkel@krautz.dk>
+ 196a6f7 Allow building 1.2.x on Windows with
+ mumble-releng/buildenv/1.2.x/win32
+
+2014-06-14
+ Mikkel Krautz <mikkel@krautz.dk>
+ 414494d Bump version to 1.2.8
+ 173ec2b Update changelog
+
2014-06-13
Mikkel Krautz <mikkel@krautz.dk>
aef3509 Add CA certificate filter to MumbleSSL::addSystemCA() to work
@@ -31,6 +64,15 @@
8323bd4 mumble: allow Log_macx.mm to build against the OS X 10.4 SDK
(for universal builds).
+2013-08-02
+ Mikkel Krautz <mikkel@krautz.dk>
+ 228f844 mumble: fix VoiceRecorderDialog build on Apple clang-500.1.70.
+
+2013-06-08
+ Mikkel Krautz <mikkel@krautz.dk>
+ 9c06ecf bonjour: use Qt::AutoConnection for BonjourServiceResolver's
+ QSocketNotifier slot.
+
2013-06-01
Stefan Hacker <dd0t@users.sourceforge.net>
5ff038e Update changelog
diff -Nru mumble-1.2.8~7~g76f6870/debian/changelog mumble-1.2.8/debian/changelog
--- mumble-1.2.8~7~g76f6870/debian/changelog 2014-07-23 22:32:00.000000000 -0400
+++ mumble-1.2.8/debian/changelog 2014-11-09 11:10:08.000000000 -0500
@@ -1,3 +1,32 @@
+mumble (1.2.8-2) unstable; urgency=medium
+
+ * debian/mumble-server.init
+ - Remove file as it was included accidentily
+
+ -- Christopher Knadle <Chris.Knadle@coredump.us> Sun, 09 Nov 2014 09:54:55 -0500
+
+mumble (1.2.8-1) unstable; urgency=medium
+
+ * New upstream stable release from 2014-08-09
+ * debian/control:
+ - Remove uploader Thorvald Natvig <thorvald@debian.org> due to
+ inactivity; thanks very much for your prior contributions.
+ * debian/patches:
+ - Remove 23-fix-pulseaudio-segfault-pt1.diff
+ 24-fix-pulseaudio-segfault-pt2.diff
+ Both patches incorporated upstream in 1.2.8
+ - Add 25-make-logfiles-readable-by-adm.diff to make mumble-server log
+ files readable by group adm. Closes: #759287
+ Thanks to Jan Braun <janbraun@gmx.net> for reporting the bug and
+ submitting a patch.
+ * debian/mumble-server.postinst:
+ - Add check for existance of mumble-server group entry before creation
+ of group and user. Closes: #758833
+ Thanks to William Martin <william.martin@power-lan.com> for reporting
+ the bug and discussing a fix.
+
+ -- Christopher Knadle <Chris.Knadle@coredump.us> Thu, 28 Aug 2014 16:23:17 -0400
+
mumble (1.2.8~7~g76f6870-2) unstable; urgency=medium
* debian/patches:
diff -Nru mumble-1.2.8~7~g76f6870/debian/control mumble-1.2.8/debian/control
--- mumble-1.2.8~7~g76f6870/debian/control 2014-07-13 07:20:16.000000000 -0400
+++ mumble-1.2.8/debian/control 2014-11-09 09:54:29.000000000 -0500
@@ -2,7 +2,6 @@
Section: sound
Priority: optional
Maintainer: Christopher Knadle <Chris.Knadle@coredump.us>
-Uploaders: Thorvald Natvig <thorvald@debian.org>
Build-Depends: debhelper (>= 7.0.8),
po-debconf,
libboost-dev (>= 1.42),
diff -Nru mumble-1.2.8~7~g76f6870/debian/mumble-server.postinst mumble-1.2.8/debian/mumble-server.postinst
--- mumble-1.2.8~7~g76f6870/debian/mumble-server.postinst 2014-07-13 07:19:45.000000000 -0400
+++ mumble-1.2.8/debian/mumble-server.postinst 2014-11-07 06:08:46.000000000 -0500
@@ -20,7 +20,9 @@
case "$1" in
configure)
# Add user and permanent directories
- adduser --system --quiet --home /var/lib/mumble-server --group mumble-server
+ if [ ! $(getent group mumble-server) ]; then
+ adduser --system --quiet --home /var/lib/mumble-server --group mumble-server
+ fi
[ -d /var/lib/mumble-server ] || mkdir /var/lib/mumble-server
chmod 0750 /var/log/mumble-server
chmod 0750 /var/lib/mumble-server
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/23-fix-pulseaudio-segfault-pt1.diff mumble-1.2.8/debian/patches/23-fix-pulseaudio-segfault-pt1.diff
--- mumble-1.2.8~7~g76f6870/debian/patches/23-fix-pulseaudio-segfault-pt1.diff 2014-07-23 22:32:00.000000000 -0400
+++ mumble-1.2.8/debian/patches/23-fix-pulseaudio-segfault-pt1.diff 1969-12-31 19:00:00.000000000 -0500
@@ -1,66 +0,0 @@
-Description: patch 1/2 to fix uncommon Mumble segfault with PulseAudio
-From e740ea5e7ffb823eea3edd31e3519de36d602354 Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <mikkel@krautz.dk>
-Date: Sun, 20 Jul 2014 11:24:09 +0200
-Last-Updated: 2014-07-23
-Subject: [PATCH 1/5] PulseAudio: stricter pa_stream_peek() validation.
-
-An uncommon condition in the pa_stream_peek function
-('no data at current read index') wasn't handled properly
-and could lead to a segfault.
-
-The commit also adds checks for other pa_stream_peek
-error scenarios.
-
-Fixes #1316
----
- src/mumble/PulseAudio.cpp | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
-index 582ba45..48d76f9 100644
---- a/src/mumble/PulseAudio.cpp
-+++ b/src/mumble/PulseAudio.cpp
-@@ -455,8 +455,16 @@ void PulseAudioSystem::read_callback(pa_stream *s, size_t bytes, void *userdata)
- PulseAudioSystem *pas = reinterpret_cast<PulseAudioSystem *>(userdata);
-
- size_t length = bytes;
-- const void *data;
-+ const void *data = NULL;
- pa_stream_peek(s, &data, &length);
-+ if (data == NULL && length > 0) {
-+ qWarning("PulseAudio: pa_stream_peek reports no data at current read index.");
-+ } else if (data == NULL && length == 0) {
-+ qWarning("PulseAudio: pa_stream_peek reports empty memblockq.");
-+ } else if (data == NULL || length == 0) {
-+ qWarning("PulseAudio: invalid pa_stream_peek state encountered.");
-+ return;
-+ }
-
- AudioInputPtr ai = g.ai;
- PulseAudioInput *pai = dynamic_cast<PulseAudioInput *>(ai.get());
-@@ -479,7 +487,9 @@ void PulseAudioSystem::read_callback(pa_stream *s, size_t bytes, void *userdata)
- pai->eMicFormat = PulseAudioInput::SampleShort;
- pai->initializeMixer();
- }
-- pai->addMic(data, length / pai->iMicSampleSize);
-+ if (data != NULL) {
-+ pai->addMic(data, length / pai->iMicSampleSize);
-+ }
- } else if (s == pas->pasSpeaker) {
- if (!pa_sample_spec_equal(pss, &pai->pssEcho)) {
- pai->pssEcho = *pss;
-@@ -491,7 +501,9 @@ void PulseAudioSystem::read_callback(pa_stream *s, size_t bytes, void *userdata)
- pai->eEchoFormat = PulseAudioInput::SampleShort;
- pai->initializeMixer();
- }
-- pai->addEcho(data, length / pai->iEchoSampleSize);
-+ if (data != NULL) {
-+ pai->addEcho(data, length / pai->iEchoSampleSize);
-+ }
- }
-
- pa_stream_drop(s);
---
-2.0.1
-
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/24-fix-pulseaudio-segfault-pt2.diff mumble-1.2.8/debian/patches/24-fix-pulseaudio-segfault-pt2.diff
--- mumble-1.2.8~7~g76f6870/debian/patches/24-fix-pulseaudio-segfault-pt2.diff 2014-07-23 22:32:00.000000000 -0400
+++ mumble-1.2.8/debian/patches/24-fix-pulseaudio-segfault-pt2.diff 1969-12-31 19:00:00.000000000 -0500
@@ -1,48 +0,0 @@
-Description: patch 2/2 to fix uncommon Mumble segfault with PulseAudio
-From 63f35d6a097dcf33ad0a27d8ed90572a64cae925 Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <mikkel@krautz.dk>
-Date: Wed, 23 Jul 2014 20:30:30 +0200
-Last-Updated: 2014-07-23
-Subject: [PATCH 5/5] PulseAudio: don't call pa_stream_drop() for empty
- pa_stream_peek().
-
-It is now explicitly spelled out in the PulseAudio docs that one
-must not call pa_stream_drop() when the buffer peeked via
-pa_stream_peek() is empty.
-
-This change fixes our calls to pa_stream_drop() to comply with the
-new wording.
-
-Fixes #1317
----
- src/mumble/PulseAudio.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
-index 48d76f9..ce96774 100644
---- a/src/mumble/PulseAudio.cpp
-+++ b/src/mumble/PulseAudio.cpp
-@@ -469,7 +469,9 @@ void PulseAudioSystem::read_callback(pa_stream *s, size_t bytes, void *userdata)
- AudioInputPtr ai = g.ai;
- PulseAudioInput *pai = dynamic_cast<PulseAudioInput *>(ai.get());
- if (! pai) {
-- pa_stream_drop(s);
-+ if (length > 0) {
-+ pa_stream_drop(s);
-+ }
- pas->wakeup();
- return;
- }
-@@ -506,7 +508,9 @@ void PulseAudioSystem::read_callback(pa_stream *s, size_t bytes, void *userdata)
- }
- }
-
-- pa_stream_drop(s);
-+ if (length > 0) {
-+ pa_stream_drop(s);
-+ }
- }
-
- void PulseAudioSystem::write_callback(pa_stream *s, size_t bytes, void *userdata) {
---
-2.0.1
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/25-make-logfiles-readable-by-adm.diff mumble-1.2.8/debian/patches/25-make-logfiles-readable-by-adm.diff
--- mumble-1.2.8~7~g76f6870/debian/patches/25-make-logfiles-readable-by-adm.diff 1969-12-31 19:00:00.000000000 -0500
+++ mumble-1.2.8/debian/patches/25-make-logfiles-readable-by-adm.diff 2014-11-07 06:08:46.000000000 -0500
@@ -0,0 +1,15 @@
+Description: create logfiles owned by group adm in logrotate snippet
+Author: Jan Braun <janbraun@gmx.net>
+Bug-Debian: http://bugs.debian.org/759287
+Last-Updated: 2014-08-09
+
+--- mumble-1.2.8~7~g76f6870.orig/scripts/murmur.logrotate
++++ mumble-1.2.8~7~g76f6870/scripts/murmur.logrotate
+@@ -4,6 +4,7 @@
+ compress
+ delaycompress
+ missingok
++ create 640 mumble-server adm
+ postrotate
+ start-stop-daemon --quiet --oknodo --stop --signal 1 --exec /usr/sbin/murmurd --user mumble-server --pidfile /var/run/mumble-server/mumble-server.pid
+ endscript
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/series mumble-1.2.8/debian/patches/series
--- mumble-1.2.8~7~g76f6870/debian/patches/series 2014-07-23 22:32:00.000000000 -0400
+++ mumble-1.2.8/debian/patches/series 2014-11-07 06:08:46.000000000 -0500
@@ -7,5 +7,4 @@
17-change-pulseaudio-role.diff
19-move-xlib-initializtion-earlier.diff
21-fix-compile-with-gcc-4.9.diff
-23-fix-pulseaudio-segfault-pt1.diff
-24-fix-pulseaudio-segfault-pt2.diff
+25-make-logfiles-readable-by-adm.diff
diff -Nru mumble-1.2.8~7~g76f6870/src/mumble/PulseAudio.cpp mumble-1.2.8/src/mumble/PulseAudio.cpp
--- mumble-1.2.8~7~g76f6870/src/mumble/PulseAudio.cpp 2014-07-04 06:15:59.000000000 -0400
+++ mumble-1.2.8/src/mumble/PulseAudio.cpp 2014-08-08 11:51:59.000000000 -0400
@@ -455,13 +455,23 @@
PulseAudioSystem *pas = reinterpret_cast<PulseAudioSystem *>(userdata);
size_t length = bytes;
- const void *data;
+ const void *data = NULL;
pa_stream_peek(s, &data, &length);
+ if (data == NULL && length > 0) {
+ qWarning("PulseAudio: pa_stream_peek reports no data at current read index.");
+ } else if (data == NULL && length == 0) {
+ qWarning("PulseAudio: pa_stream_peek reports empty memblockq.");
+ } else if (data == NULL || length == 0) {
+ qWarning("PulseAudio: invalid pa_stream_peek state encountered.");
+ return;
+ }
AudioInputPtr ai = g.ai;
PulseAudioInput *pai = dynamic_cast<PulseAudioInput *>(ai.get());
if (! pai) {
- pa_stream_drop(s);
+ if (length > 0) {
+ pa_stream_drop(s);
+ }
pas->wakeup();
return;
}
@@ -479,7 +489,9 @@
pai->eMicFormat = PulseAudioInput::SampleShort;
pai->initializeMixer();
}
- pai->addMic(data, length / pai->iMicSampleSize);
+ if (data != NULL) {
+ pai->addMic(data, length / pai->iMicSampleSize);
+ }
} else if (s == pas->pasSpeaker) {
if (!pa_sample_spec_equal(pss, &pai->pssEcho)) {
pai->pssEcho = *pss;
@@ -491,10 +503,14 @@
pai->eEchoFormat = PulseAudioInput::SampleShort;
pai->initializeMixer();
}
- pai->addEcho(data, length / pai->iEchoSampleSize);
+ if (data != NULL) {
+ pai->addEcho(data, length / pai->iEchoSampleSize);
+ }
}
- pa_stream_drop(s);
+ if (length > 0) {
+ pa_stream_drop(s);
+ }
}
void PulseAudioSystem::write_callback(pa_stream *s, size_t bytes, void *userdata) {
diff -Nru mumble-1.2.8~7~g76f6870/src/Version.h mumble-1.2.8/src/Version.h
--- mumble-1.2.8~7~g76f6870/src/Version.h 2014-07-04 06:15:56.000000000 -0400
+++ mumble-1.2.8/src/Version.h 2014-08-08 11:51:59.000000000 -0400
@@ -36,7 +36,7 @@
#define MUMTEXT(X) MUMXTEXT(X)
#ifndef MUMBLE_VERSION
-#define MUMBLE_VERSION 1.2.8~7~g76f6870~snapshot
+#define MUMBLE_VERSION 1.2.8
#endif
#ifndef MUMBLE_VERSION
#define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__
--- mumble_1.2.8~7_to_1.2.8-1.diff 2014-11-10 03:39:23.774798766 -0500
+++ mumble_1.2.8~7~g76f6870-2_to_1.2.8-2_2nd.diff 2014-11-10 03:37:01.866684610 -0500
@@ -1,7 +1,7 @@
diffstat for mumble-1.2.8~7~g76f6870 mumble-1.2.8
CHANGES | 42 ++++++++++++
- debian/changelog | 22 ++++++
+ debian/changelog | 29 ++++++++
debian/control | 1
debian/mumble-server.postinst | 4 -
debian/patches/23-fix-pulseaudio-segfault-pt1.diff | 66 -------------------
@@ -10,7 +10,7 @@
debian/patches/series | 3
src/Version.h | 2
src/mumble/PulseAudio.cpp | 26 ++++++-
- 10 files changed, 105 insertions(+), 124 deletions(-)
+ 10 files changed, 112 insertions(+), 124 deletions(-)
diff -Nru mumble-1.2.8~7~g76f6870/CHANGES mumble-1.2.8/CHANGES
--- mumble-1.2.8~7~g76f6870/CHANGES 2014-07-04 06:15:44.000000000 -0400
@@ -70,8 +70,15 @@
5ff038e Update changelog
diff -Nru mumble-1.2.8~7~g76f6870/debian/changelog mumble-1.2.8/debian/changelog
--- mumble-1.2.8~7~g76f6870/debian/changelog 2014-07-23 22:32:00.000000000 -0400
-+++ mumble-1.2.8/debian/changelog 2014-10-28 15:54:13.000000000 -0400
-@@ -1,3 +1,25 @@
++++ mumble-1.2.8/debian/changelog 2014-11-09 11:10:08.000000000 -0500
+@@ -1,3 +1,32 @@
++mumble (1.2.8-2) unstable; urgency=medium
++
++ * debian/mumble-server.init
++ - Remove file as it was included accidentily
++
++ -- Christopher Knadle <Chris.Knadle@coredump.us> Sun, 09 Nov 2014 09:54:55 -0500
++
+mumble (1.2.8-1) unstable; urgency=medium
+
+ * New upstream stable release from 2014-08-09
@@ -99,7 +106,7 @@
* debian/patches:
diff -Nru mumble-1.2.8~7~g76f6870/debian/control mumble-1.2.8/debian/control
--- mumble-1.2.8~7~g76f6870/debian/control 2014-07-13 07:20:16.000000000 -0400
-+++ mumble-1.2.8/debian/control 2014-10-28 15:54:13.000000000 -0400
++++ mumble-1.2.8/debian/control 2014-11-09 09:54:29.000000000 -0500
@@ -2,7 +2,6 @@
Section: sound
Priority: optional
@@ -110,7 +117,7 @@
libboost-dev (>= 1.42),
diff -Nru mumble-1.2.8~7~g76f6870/debian/mumble-server.postinst mumble-1.2.8/debian/mumble-server.postinst
--- mumble-1.2.8~7~g76f6870/debian/mumble-server.postinst 2014-07-13 07:19:45.000000000 -0400
-+++ mumble-1.2.8/debian/mumble-server.postinst 2014-10-28 15:54:13.000000000 -0400
++++ mumble-1.2.8/debian/mumble-server.postinst 2014-11-07 06:08:46.000000000 -0500
@@ -20,7 +20,9 @@
case "$1" in
configure)
@@ -246,7 +253,7 @@
-2.0.1
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/25-make-logfiles-readable-by-adm.diff mumble-1.2.8/debian/patches/25-make-logfiles-readable-by-adm.diff
--- mumble-1.2.8~7~g76f6870/debian/patches/25-make-logfiles-readable-by-adm.diff 1969-12-31 19:00:00.000000000 -0500
-+++ mumble-1.2.8/debian/patches/25-make-logfiles-readable-by-adm.diff 2014-10-28 15:54:13.000000000 -0400
++++ mumble-1.2.8/debian/patches/25-make-logfiles-readable-by-adm.diff 2014-11-07 06:08:46.000000000 -0500
@@ -0,0 +1,15 @@
+Description: create logfiles owned by group adm in logrotate snippet
+Author: Jan Braun <janbraun@gmx.net>
@@ -265,7 +272,7 @@
+ endscript
diff -Nru mumble-1.2.8~7~g76f6870/debian/patches/series mumble-1.2.8/debian/patches/series
--- mumble-1.2.8~7~g76f6870/debian/patches/series 2014-07-23 22:32:00.000000000 -0400
-+++ mumble-1.2.8/debian/patches/series 2014-10-28 15:54:13.000000000 -0400
++++ mumble-1.2.8/debian/patches/series 2014-11-07 06:08:46.000000000 -0500
@@ -7,5 +7,4 @@
17-change-pulseaudio-role.diff
19-move-xlib-initializtion-earlier.diff
Reply to: