1 |
commit: 7d32da171523679474240d62b5dc7be927a6b218 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 16 21:54:50 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 16 21:55:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d32da17 |
7 |
|
8 |
media-video/pipewire: add 0.3.36 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/791499 |
11 |
Bug: https://bugs.gentoo.org/813099 |
12 |
Fixes: bb2267c8c9f435c2623e924e3ae2ad4e444642b9 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
...pewire-0.3.36-fix-crash-uaf-media-session.patch | 36 ++++++++++++++++++++++ |
16 |
.../files/pipewire-0.3.36-fix-version.patch | 25 +++++++++++++++ |
17 |
...pipewire-9999.ebuild => pipewire-0.3.36.ebuild} | 4 ++- |
18 |
media-video/pipewire/pipewire-9999.ebuild | 2 +- |
19 |
4 files changed, 65 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..6080ff4fd7a |
24 |
--- /dev/null |
25 |
+++ b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch |
26 |
@@ -0,0 +1,36 @@ |
27 |
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629 |
28 |
+ |
29 |
+From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001 |
30 |
+From: Pauli Virtanen <pav@×××.fi> |
31 |
+Date: Thu, 16 Sep 2021 19:18:52 +0300 |
32 |
+Subject: [PATCH] media-session: don't use-after-free if linking node removed |
33 |
+ |
34 |
+Should fix an ASAN crash. |
35 |
+--- |
36 |
+ src/examples/media-session/policy-node.c | 3 ++- |
37 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
38 |
+ |
39 |
+diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c |
40 |
+index d83613d0b..e273434fa 100644 |
41 |
+--- a/src/examples/media-session/policy-node.c |
42 |
++++ b/src/examples/media-session/policy-node.c |
43 |
+@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer) |
44 |
+ struct pw_properties *props; |
45 |
+ struct node *output, *input; |
46 |
+ int res; |
47 |
++ uint32_t node_id = node->id; |
48 |
+ |
49 |
+ pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl, |
50 |
+ node->id, peer->id, !node->dont_remix); |
51 |
+@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer) |
52 |
+ |
53 |
+ if (impl->linking_node_removed) { |
54 |
+ impl->linking_node_removed = false; |
55 |
+- pw_log_info("linking node %d was removed", node->id); |
56 |
++ pw_log_info("linking node %d was removed", node_id); |
57 |
+ return -ENOENT; |
58 |
+ } |
59 |
+ node->linking = false; |
60 |
+-- |
61 |
+GitLab |
62 |
+ |
63 |
|
64 |
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch |
65 |
new file mode 100644 |
66 |
index 00000000000..ace05b9e4a1 |
67 |
--- /dev/null |
68 |
+++ b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch |
69 |
@@ -0,0 +1,25 @@ |
70 |
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 |
71 |
+ |
72 |
+From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001 |
73 |
+From: Wim Taymans <wtaymans@××××××.com> |
74 |
+Date: Thu, 16 Sep 2021 17:57:47 +0200 |
75 |
+Subject: [PATCH] update version number as well |
76 |
+ |
77 |
+--- |
78 |
+ meson.build | 2 +- |
79 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
80 |
+ |
81 |
+diff --git a/meson.build b/meson.build |
82 |
+index c9b98c8ba..ea35ac674 100644 |
83 |
+--- a/meson.build |
84 |
++++ b/meson.build |
85 |
+@@ -1,5 +1,5 @@ |
86 |
+ project('pipewire', ['c' ], |
87 |
+- version : '0.3.35', |
88 |
++ version : '0.3.36', |
89 |
+ license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ], |
90 |
+ meson_version : '>= 0.54.0', |
91 |
+ default_options : [ 'warning_level=3', |
92 |
+-- |
93 |
+GitLab |
94 |
+ |
95 |
|
96 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild |
97 |
similarity index 98% |
98 |
copy from media-video/pipewire/pipewire-9999.ebuild |
99 |
copy to media-video/pipewire/pipewire-0.3.36.ebuild |
100 |
index a19e1c690b3..727450ab578 100644 |
101 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
102 |
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild |
103 |
@@ -73,7 +73,7 @@ RDEPEND=" |
104 |
) |
105 |
pipewire-alsa? ( |
106 |
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] |
107 |
- !media-plugins/alsa-plugins[pulseaudio] |
108 |
+ !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] |
109 |
) |
110 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
111 |
systemd? ( sys-apps/systemd ) |
112 |
@@ -96,6 +96,8 @@ DOCS=( {README,INSTALL}.md NEWS ) |
113 |
|
114 |
PATCHES=( |
115 |
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch |
116 |
+ "${FILESDIR}"/${P}-fix-crash-uaf-media-session.patch |
117 |
+ "${FILESDIR}"/${P}-fix-version.patch |
118 |
) |
119 |
|
120 |
# limitsdfile related code taken from =sys-auth/realtime-base-0.1 |
121 |
|
122 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
123 |
index a19e1c690b3..0fa096afe77 100644 |
124 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
125 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
126 |
@@ -73,7 +73,7 @@ RDEPEND=" |
127 |
) |
128 |
pipewire-alsa? ( |
129 |
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] |
130 |
- !media-plugins/alsa-plugins[pulseaudio] |
131 |
+ !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] |
132 |
) |
133 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
134 |
systemd? ( sys-apps/systemd ) |