From 9270f6245419629619d9d10d8de84026f49c9d97 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Oct 31 2015 13:18:58 +0000
Subject: pulseaudio-7.1 (#1276811)


---

diff --git a/.gitignore b/.gitignore
index 14b5ae1..ea4b8ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /.*.log
 /*.src.rpm
 /pulseaudio-*.tar.xz
-/pulseaudio-*.tar.xz.md5sum
-/pulseaudio-*.tar.xz.sha1sum
+/pulseaudio-*.tar.xz.md5
+/pulseaudio-*.tar.xz.sha1
diff --git a/0022-pstream-Fix-use-after-free-in-srb_callback.patch b/0022-pstream-Fix-use-after-free-in-srb_callback.patch
deleted file mode 100644
index b4cb0ba..0000000
--- a/0022-pstream-Fix-use-after-free-in-srb_callback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f277f2c5094fb32c5d879923960eb807b3b1c535 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 16 Oct 2015 22:12:32 +0200
-Subject: [PATCH 22/27] pstream: Fix use-after-free in srb_callback
-
-We need to guard the pstream with an extra ref to ensure
-it is not destroyed at the time we check whether or not the
-srbchannel is destroyed.
-
-Reported-by: Takashi Iwai <tiwai@suse.de>
-BugLink: http://bugzilla.opensuse.org/show_bug.cgi?id=950487
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
----
- src/pulsecore/pstream.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
-index 8c14fbb..98a8382 100644
---- a/src/pulsecore/pstream.c
-+++ b/src/pulsecore/pstream.c
-@@ -216,14 +216,23 @@ fail:
- }
- 
- static bool srb_callback(pa_srbchannel *srb, void *userdata) {
-+    bool b;
-     pa_pstream *p = userdata;
- 
-     pa_assert(p);
-     pa_assert(PA_REFCNT_VALUE(p) > 0);
-     pa_assert(p->srb == srb);
- 
-+    pa_pstream_ref(p);
-+
-     do_pstream_read_write(p);
--    return p->srb != NULL;
-+
-+    /* If either pstream or the srb is going away, return false.
-+       We need to check this before p is destroyed. */
-+    b = (PA_REFCNT_VALUE(p) > 1) && (p->srb == srb);
-+    pa_pstream_unref(p);
-+
-+    return b;
- }
- 
- static void io_callback(pa_iochannel*io, void *userdata) {
--- 
-2.5.0
-
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 5b8c6c8..81e64ce 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,4 +1,4 @@
-%global pa_major   7.0
+%global pa_major   7.1
 #global pa_minor
 
 #global snap       20141103
@@ -19,7 +19,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -28,8 +28,8 @@ URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 Source0:        pulseaudio-%{version}-%{gitrel}-g%{shortcommit}.tar.xz
 %else
 Source0:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
-Source1:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.md5sum
-Source2:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.sha1sum
+Source1:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.md5
+Source2:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.sha1
 %endif
 
 Source5:        default.pa-for-gdm
@@ -40,7 +40,6 @@ Source5:        default.pa-for-gdm
 Patch1: pulseaudio-autostart.patch
 
 ## upstream patches
-Patch22: 0022-pstream-Fix-use-after-free-in-srb_callback.patch
 
 ## upstreamable patches
 # https://bugs.freedesktop.org/show_bug.cgi?id=92142
@@ -230,7 +229,6 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
 
 %patch1 -p1 -b .autostart
-%patch22 -p1 -b .0022
 %patch50 -p1 -b .localedir
 # avoid re-autoconf'ing from patch50
 touch configure.ac --reference=configure.ac.localedir
@@ -564,6 +562,9 @@ exit 0
 
 
 %changelog
+* Sat Oct 31 2015 Rex Dieter <rdieter@fedoraproject.org> - 7.1-1
+- pulseaudio-7.1 (#1276811)
+
 * Sat Oct 31 2015 Rex Dieter <rdieter@fedoraproject.org> - 7.0-4
 - apply srbchannel patch
 
diff --git a/sources b/sources
index b9fcf6d..160b8ff 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-09668b660ffb32f2639cfd6fdc9d3b37  pulseaudio-7.0.tar.xz
-abcbe8b8e681980ac53d8fff9000c476  pulseaudio-7.0.tar.xz.md5sum
-f09f9a0e2fa19e59c76ce9523dc7c087  pulseaudio-7.0.tar.xz.sha1sum
+9d0a9817b632cac8e3f3834d7eb1c99d  pulseaudio-7.1.tar.xz
+b553082c311808f844d8ccedf7b08ef4  pulseaudio-7.1.tar.xz.md5
+759198e3e0e55311ba1bcb85f859e97c  pulseaudio-7.1.tar.xz.sha1