Architecture specific change in rpms/pulseaudio.git
by githook-noreply＠fedoraproject.org
The package rpms/pulseaudio.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pulseaudio.git/commit/?id=386368a....
Change:
-%ifnarch s390 s390x
Thanks.
Full change:
============
commit c0ff16421e1ad1fbe8977b5f3f8b90f6f84d2ac8
Merge: 241f3b2 56ae9a3
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 11 14:47:35 2017 -0500
Merge branch 'master' into f26
commit 241f3b243ccc4dc699b4d6f7c9389153c06d36e7
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 11 14:47:29 2017 -0500
Revert "Use autosetup to simplify patch application"
This reverts commit 4d0ac3fcfb62060e5547bf6d6f38ee4659891af0.
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 90b772d..013457b 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -127,7 +127,6 @@ BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2
%if 0%{?tests}
BuildRequires: pkgconfig(check)
%endif
-BuildRequires: git
# retired along with -libs-zeroconf, add Obsoletes here for lack of anything better
Obsoletes: padevchooser < 1.0
@@ -256,7 +255,30 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%prep
-%autosetup -S git -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
+%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
+
+%patch1 -p1 -b .autostart
+%patch2 -p1 -b .disable_flat_volumes
+%patch3 -p1 -b .affinity
+
+%patch101 -p1 -b .101
+%patch102 -p1 -b .102
+%patch103 -p1 -b .103
+%patch104 -p1 -b .104
+%patch105 -p1 -b .105
+%patch106 -p1 -b .106
+%patch107 -p1 -b .107
+%patch108 -p1 -b .108
+%patch109 -p1 -b .109
+%patch110 -p1 -b .110
+%patch111 -p1 -b .111
+%patch112 -p1 -b .112
+%patch113 -p1 -b .113
+%patch114 -p1 -b .114
+%patch115 -p1 -b .115
+%patch116 -p1 -b .116
+%patch117 -p1 -b .117
+%patch118 -p1 -b .118
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
commit a01a39ca3657afb1a67531c0a5d3c4f8274a5e01
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 11 14:47:22 2017 -0500
Revert "+ Add support for Intel HDMI LPE (stops crash loops on boot)"
This reverts commit d8d5b17a3a1c1cefcb0b6f9ef333e8b996b27c85.
diff --git a/Fix-jack-detection-for-Intel-HDMI-LPE.patch b/Fix-jack-detection-for-Intel-HDMI-LPE.patch
deleted file mode 100644
index 92a74c8..0000000
--- a/Fix-jack-detection-for-Intel-HDMI-LPE.patch
+++ /dev/null
@@ -1,998 +0,0 @@
-From patchwork Mon Jun 12 15:45:14 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [pulseaudio-discuss,
- 1/3] alsa-mixer: add query_hw_device option to mappings
-From: Tanu Kaskinen <tanuk(a)iki.fi>
-X-Patchwork-Id: 161214
-Message-Id: <20170612154516.12941-2-tanuk(a)iki.fi>
-To: pulseaudio-discuss(a)lists.freedesktop.org
-Cc: Takashi Iwai <tiwai(a)suse.de>, Hans de Goede <hdegoede(a)redhat.com>
-Date: Mon, 12 Jun 2017 18:45:14 +0300
-
-We have so far assumed that HDMI always uses device indexes 3, 7, 8, 9,
-10, 11, 12 and 13. These values are hardcoded in the path configuration.
-The Intel HDMI LPE driver, however, uses a different device numbering
-scheme.
-
-This patch adds a new configuration option for mappings. The option
-tells PulseAudio to query the hw device index using snd_pcm_info(). It's
-disabled by default, because querying the hw device doesn't always work
-(but it's expected work for all hdmi devices).
-
-This patch doesn't yet use the queried device index, that's left for
-the subsequent patches.
-
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
----
- src/modules/alsa/alsa-mixer.c | 83 +++++++++++++++++++++---
- src/modules/alsa/alsa-mixer.h | 12 ++++
- src/modules/alsa/mixer/profile-sets/default.conf | 37 +++++++++++
- 3 files changed, 124 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
-index f59cad394..8bd90a728 100644
---- a/src/modules/alsa/alsa-mixer.c
-+++ b/src/modules/alsa/alsa-mixer.c
-@@ -3504,6 +3504,7 @@ pa_alsa_mapping *pa_alsa_mapping_get(pa_alsa_profile_set *ps, const char *name)
- pa_sample_spec_init(&m->sample_spec);
- pa_channel_map_init(&m->channel_map);
- m->proplist = pa_proplist_new();
-+ m->hw_device_index = -1;
-
- pa_hashmap_put(ps->mappings, m->name, m);
-
-@@ -3641,6 +3642,31 @@ static int mapping_parse_exact_channels(pa_config_parser_state *state) {
- return 0;
- }
-
-+static int mapping_parse_query_hw_device(pa_config_parser_state *state) {
-+ pa_alsa_profile_set *ps;
-+ pa_alsa_mapping *m;
-+ int b;
-+
-+ pa_assert(state);
-+
-+ ps = state->userdata;
-+
-+ if (!(m = pa_alsa_mapping_get(ps, state->section))) {
-+ pa_log("[%s:%u] Option '%s' not expected in section '%s'",
-+ state->filename, state->lineno, state->lvalue, state->section);
-+ return -1;
-+ }
-+
-+ if ((b = pa_parse_boolean(state->rvalue)) < 0) {
-+ pa_log("[%s:%u] %s has invalid value '%s'", state->filename, state->lineno, state->lvalue, state->section);
-+ return -1;
-+ }
-+
-+ m->query_hw_device = b;
-+
-+ return 0;
-+}
-+
- static int mapping_parse_element(pa_config_parser_state *state) {
- pa_alsa_profile_set *ps;
- pa_alsa_mapping *m;
-@@ -4357,6 +4383,7 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
- { "element-output", mapping_parse_element, NULL, NULL },
- { "direction", mapping_parse_direction, NULL, NULL },
- { "exact-channels", mapping_parse_exact_channels, NULL, NULL },
-+ { "query-hw-device", mapping_parse_query_hw_device,NULL, NULL },
-
- /* Shared by [Mapping ...] and [Profile ...] */
- { "description", mapping_parse_description, NULL, NULL },
-@@ -4531,6 +4558,24 @@ static int add_profiles_to_probe(
- return i;
- }
-
-+static int mapping_query_hw_device(pa_alsa_mapping *mapping, snd_pcm_t *pcm) {
-+ int r;
-+ snd_pcm_info_t* pcm_info;
-+ snd_pcm_info_alloca(&pcm_info);
-+
-+ pa_assert(mapping->query_hw_device);
-+
-+ r = snd_pcm_info(pcm, pcm_info);
-+ if (r < 0) {
-+ pa_log("Mapping %s has query_hw_device enabled, but snd_pcm_info() failed %s: ", mapping->name, pa_alsa_strerror(r));
-+ return -1;
-+ }
-+
-+ mapping->hw_device_index = snd_pcm_info_get_device(pcm_info);
-+
-+ return 0;
-+}
-+
- void pa_alsa_profile_set_probe(
- pa_alsa_profile_set *ps,
- const char *dev_id,
-@@ -4574,6 +4619,7 @@ void pa_alsa_profile_set_probe(
-
- /* Skip if this is already marked that it is supported (i.e. from the config file) */
- if (!p->supported) {
-+ bool only_one_mapping;
-
- profile_finalize_probing(last, p);
- p->supported = true;
-@@ -4601,6 +4647,15 @@ void pa_alsa_profile_set_probe(
- if (p->supported)
- pa_log_debug("Looking at profile %s", p->name);
-
-+ if (p->output_mappings && pa_idxset_size(p->output_mappings) == 1 &&
-+ ((!p->input_mappings) || pa_idxset_size(p->input_mappings) == 0))
-+ only_one_mapping = true;
-+ else if (p->input_mappings && pa_idxset_size(p->input_mappings) == 1 &&
-+ ((!p->output_mappings) || pa_idxset_size(p->output_mappings) == 0))
-+ only_one_mapping = true;
-+ else
-+ only_one_mapping = false;
-+
- /* Check if we can open all new ones */
- if (p->output_mappings && p->supported)
- PA_IDXSET_FOREACH(m, p->output_mappings, idx) {
-@@ -4612,11 +4667,17 @@ void pa_alsa_profile_set_probe(
- if (!(m->output_pcm = mapping_open_pcm(m, ss, dev_id, m->exact_channels,
- SND_PCM_STREAM_PLAYBACK,
- default_n_fragments,
-- default_fragment_size_msec))) {
-+ default_fragment_size_msec)))
- p->supported = false;
-- if (pa_idxset_size(p->output_mappings) == 1 &&
-- ((!p->input_mappings) || pa_idxset_size(p->input_mappings) == 0)) {
-- pa_log_debug("Caching failure to open output:%s", m->name);
-+
-+ if (m->output_pcm && m->query_hw_device && m->hw_device_index < 0) {
-+ if (mapping_query_hw_device(m, m->output_pcm) < 0)
-+ p->supported = false;
-+ }
-+
-+ if (!p->supported) {
-+ if (only_one_mapping) {
-+ pa_log_debug("Caching failure to use output:%s", m->name);
- pa_hashmap_put(broken_outputs, m, m);
- }
- break;
-@@ -4633,11 +4694,17 @@ void pa_alsa_profile_set_probe(
- if (!(m->input_pcm = mapping_open_pcm(m, ss, dev_id, m->exact_channels,
- SND_PCM_STREAM_CAPTURE,
- default_n_fragments,
-- default_fragment_size_msec))) {
-+ default_fragment_size_msec)))
- p->supported = false;
-- if (pa_idxset_size(p->input_mappings) == 1 &&
-- ((!p->output_mappings) || pa_idxset_size(p->output_mappings) == 0)) {
-- pa_log_debug("Caching failure to open input:%s", m->name);
-+
-+ if (m->input_pcm && m->query_hw_device && m->hw_device_index < 0) {
-+ if (mapping_query_hw_device(m, m->input_pcm) < 0)
-+ p->supported = false;
-+ }
-+
-+ if (!p->supported) {
-+ if (only_one_mapping) {
-+ pa_log_debug("Caching failure to use input:%s", m->name);
- pa_hashmap_put(broken_inputs, m, m);
- }
- break;
-diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
-index 4ebf1922b..96678aea4 100644
---- a/src/modules/alsa/alsa-mixer.h
-+++ b/src/modules/alsa/alsa-mixer.h
-@@ -275,6 +275,18 @@ struct pa_alsa_mapping {
- bool exact_channels:1;
- bool fallback:1;
-
-+ /* Should we try to figure out which hw device this mapping is using? HDMI
-+ * jack detection and ELD handling requires us to know the underlying hw
-+ * device. This defaults to false, because we only need this for HDMI, and
-+ * it's not always possible to figure out the hw device (for example, a
-+ * surround device might consist of several stereo hw devices). */
-+ bool query_hw_device;
-+
-+ /* The "y" in "hw:x,y". This is set to -1 before the device index has been
-+ * queried, or if the query failed. If query_hw_device is false, this is
-+ * always -1. */
-+ int hw_device_index;
-+
- /* Temporarily used during probing */
- snd_pcm_t *input_pcm;
- snd_pcm_t *output_pcm;
-diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
-index f412058ff..01203b3c3 100644
---- a/src/modules/alsa/mixer/profile-sets/default.conf
-+++ b/src/modules/alsa/mixer/profile-sets/default.conf
-@@ -57,6 +57,10 @@
- ; exact-channels = yes | no # If no, and the exact number of channels is not supported,
- ; # allow device to be opened with another channel count
- ; fallback = no | yes # This mapping will only be considered if all non-fallback mappings fail
-+; query-hw-device = no | yes # Defaults to "no", needs to be set to "yes" for HDMI mappings. HDMI
-+; # jack detection and ELD handling requires us to know which hw:x,y
-+; # device the hdmi:x,z device corresponds to. This defaults to "no",
-+; # because querying the hw device doesn't work for all devices.
- ; [Profile id]
- ; input-mappings = ... # Lists mappings for sources on this profile, those mapping must be
- ; # defined in this file too
-@@ -164,6 +168,7 @@ channel-map = left,right
- paths-input = iec958-stereo-input
- paths-output = iec958-stereo-output
- priority = 5
-+query-hw-device = yes
-
- [Mapping iec958-ac3-surround-40]
- device-strings = a52:%f
-@@ -193,6 +198,7 @@ paths-output = hdmi-output-0
- channel-map = left,right
- priority = 4
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround]
- description = Digital Surround 5.1 (HDMI)
-@@ -201,6 +207,7 @@ paths-output = hdmi-output-0
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 3
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71]
- description = Digital Surround 7.1 (HDMI)
-@@ -209,6 +216,7 @@ paths-output = hdmi-output-0
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 3
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround]
- description = Digital Surround 5.1 (HDMI/DTS)
-@@ -217,6 +225,7 @@ paths-output = hdmi-output-0
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra1]
- description = Digital Stereo (HDMI 2)
-@@ -225,6 +234,7 @@ paths-output = hdmi-output-1
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra1]
- description = Digital Surround 5.1 (HDMI 2)
-@@ -233,6 +243,7 @@ paths-output = hdmi-output-1
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra1]
- description = Digital Surround 7.1 (HDMI 2)
-@@ -241,6 +252,7 @@ paths-output = hdmi-output-1
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra1]
- description = Digital Surround 5.1 (HDMI 2/DTS)
-@@ -249,6 +261,7 @@ paths-output = hdmi-output-1
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra2]
- description = Digital Stereo (HDMI 3)
-@@ -257,6 +270,7 @@ paths-output = hdmi-output-2
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra2]
- description = Digital Surround 5.1 (HDMI 3)
-@@ -265,6 +279,7 @@ paths-output = hdmi-output-2
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra2]
- description = Digital Surround 7.1 (HDMI 3)
-@@ -273,6 +288,7 @@ paths-output = hdmi-output-2
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra2]
- description = Digital Surround 5.1 (HDMI 3/DTS)
-@@ -281,6 +297,7 @@ paths-output = hdmi-output-2
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra3]
- description = Digital Stereo (HDMI 4)
-@@ -289,6 +306,7 @@ paths-output = hdmi-output-3
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra3]
- description = Digital Surround 5.1 (HDMI 4)
-@@ -297,6 +315,7 @@ paths-output = hdmi-output-3
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra3]
- description = Digital Surround 7.1 (HDMI 4)
-@@ -305,6 +324,7 @@ paths-output = hdmi-output-3
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra3]
- description = Digital Surround 5.1 (HDMI 4/DTS)
-@@ -313,6 +333,7 @@ paths-output = hdmi-output-3
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra4]
- description = Digital Stereo (HDMI 5)
-@@ -321,6 +342,7 @@ paths-output = hdmi-output-4
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra4]
- description = Digital Surround 5.1 (HDMI 5)
-@@ -329,6 +351,7 @@ paths-output = hdmi-output-4
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra4]
- description = Digital Surround 7.1 (HDMI 5)
-@@ -337,6 +360,7 @@ paths-output = hdmi-output-4
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra4]
- description = Digital Surround 5.1 (HDMI 5/DTS)
-@@ -345,6 +369,7 @@ paths-output = hdmi-output-4
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra5]
- description = Digital Stereo (HDMI 6)
-@@ -353,6 +378,7 @@ paths-output = hdmi-output-5
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra5]
- description = Digital Surround 5.1 (HDMI 6)
-@@ -361,6 +387,7 @@ paths-output = hdmi-output-5
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra5]
- description = Digital Surround 7.1 (HDMI 6)
-@@ -369,6 +396,7 @@ paths-output = hdmi-output-5
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra5]
- description = Digital Surround 5.1 (HDMI 6/DTS)
-@@ -377,6 +405,7 @@ paths-output = hdmi-output-5
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra6]
- description = Digital Stereo (HDMI 7)
-@@ -385,6 +414,7 @@ paths-output = hdmi-output-6
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra6]
- description = Digital Surround 5.1 (HDMI 7)
-@@ -393,6 +423,7 @@ paths-output = hdmi-output-6
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra6]
- description = Digital Surround 7.1 (HDMI 7)
-@@ -401,6 +432,7 @@ paths-output = hdmi-output-6
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra6]
- description = Digital Surround 5.1 (HDMI 7/DTS)
-@@ -409,6 +441,7 @@ paths-output = hdmi-output-6
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-stereo-extra7]
- description = Digital Stereo (HDMI 8)
-@@ -417,6 +450,7 @@ paths-output = hdmi-output-7
- channel-map = left,right
- priority = 2
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround-extra7]
- description = Digital Surround 5.1 (HDMI 8)
-@@ -425,6 +459,7 @@ paths-output = hdmi-output-7
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-surround71-extra7]
- description = Digital Surround 7.1 (HDMI 8)
-@@ -433,6 +468,7 @@ paths-output = hdmi-output-7
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping hdmi-dts-surround-extra7]
- description = Digital Surround 5.1 (HDMI 8/DTS)
-@@ -441,6 +477,7 @@ paths-output = hdmi-output-7
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
- priority = 1
- direction = output
-+query-hw-device = yes
-
- [Mapping multichannel-output]
- device-strings = hw:%f
-
-From patchwork Mon Jun 12 15:45:15 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [pulseaudio-discuss,
- 2/3] alsa-mixer: implement ELD device autodetection
-From: Tanu Kaskinen <tanuk(a)iki.fi>
-X-Patchwork-Id: 161216
-Message-Id: <20170612154516.12941-3-tanuk(a)iki.fi>
-To: pulseaudio-discuss(a)lists.freedesktop.org
-Cc: Takashi Iwai <tiwai(a)suse.de>, Hans de Goede <hdegoede(a)redhat.com>
-Date: Mon, 12 Jun 2017 18:45:15 +0300
-
-This removes the need to hardcode the ELD device index in the path
-configuration. The hardcoded values don't work with the Intel HDMI LPE
-driver.
-
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
----
- src/modules/alsa/alsa-mixer.c | 31 +++++++++++++++++++---
- src/modules/alsa/alsa-mixer.h | 1 +
- .../alsa/mixer/paths/analog-output.conf.common | 6 +++--
- src/modules/alsa/mixer/paths/hdmi-output-0.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-1.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-2.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-3.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-4.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-5.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-6.conf | 2 +-
- src/modules/alsa/mixer/paths/hdmi-output-7.conf | 2 +-
- 11 files changed, 40 insertions(+), 14 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
-index 8bd90a728..71b393e49 100644
---- a/src/modules/alsa/alsa-mixer.c
-+++ b/src/modules/alsa/alsa-mixer.c
-@@ -2032,6 +2032,28 @@ static int element_parse_enumeration(pa_config_parser_state *state) {
- return 0;
- }
-
-+static int parse_eld_device(pa_config_parser_state *state) {
-+ pa_alsa_path *path;
-+ uint32_t eld_device;
-+
-+ path = state->userdata;
-+
-+ if (pa_atou(state->rvalue, &eld_device) >= 0) {
-+ path->autodetect_eld_device = false;
-+ path->eld_device = eld_device;
-+ return 0;
-+ }
-+
-+ if (pa_streq(state->rvalue, "auto")) {
-+ path->autodetect_eld_device = true;
-+ path->eld_device = -1;
-+ return 0;
-+ }
-+
-+ pa_log("[%s:%u] Invalid value for option 'eld-device': %s", state->filename, state->lineno, state->rvalue);
-+ return -1;
-+}
-+
- static int option_parse_priority(pa_config_parser_state *state) {
- pa_alsa_path *p;
- pa_alsa_option *o;
-@@ -2524,7 +2546,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
- { "description-key", pa_config_parse_string, NULL, "General" },
- { "description", pa_config_parse_string, NULL, "General" },
- { "mute-during-activation", pa_config_parse_bool, NULL, "General" },
-- { "eld-device", pa_config_parse_int, NULL, "General" },
-+ { "eld-device", parse_eld_device, NULL, "General" },
-
- /* [Option ...] */
- { "priority", option_parse_priority, NULL, NULL },
-@@ -2563,7 +2585,6 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
- items[1].data = &p->description_key;
- items[2].data = &p->description;
- items[3].data = &mute_during_activation;
-- items[4].data = &p->eld_device;
-
- if (!paths_dir)
- paths_dir = get_default_paths_dir();
-@@ -3992,9 +4013,11 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
- }
-
- PA_HASHMAP_FOREACH(p, ps->paths, state) {
-- if (pa_alsa_path_probe(p, mixer_handle, m->profile_set->ignore_dB) < 0) {
-+ if (p->autodetect_eld_device)
-+ p->eld_device = m->hw_device_index;
-+
-+ if (pa_alsa_path_probe(p, m, mixer_handle, m->profile_set->ignore_dB) < 0)
- pa_hashmap_remove(ps->paths, p);
-- }
- }
-
- path_set_condense(ps, mixer_handle);
-diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
-index 96678aea4..d85cc38d3 100644
---- a/src/modules/alsa/alsa-mixer.h
-+++ b/src/modules/alsa/alsa-mixer.h
-@@ -191,6 +191,7 @@ struct pa_alsa_path {
- char *description_key;
- char *description;
- unsigned priority;
-+ bool autodetect_eld_device;
- int eld_device;
- pa_proplist *proplist;
-
-diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
-index 17b45278a..a113a2e3a 100644
---- a/src/modules/alsa/mixer/paths/analog-output.conf.common
-+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
-@@ -64,8 +64,10 @@
- ; mute-during-activation = yes | no # If this path supports hardware mute, should the hw mute be used while activating this
- ; # path? In some cases this can reduce extra noises during port switching, while in other
- ; # cases this can increase such noises. Default: no.
--; eld-device = ... # If this is an HDMI port, here's where to specify the device number for the ELD mixer
--; # control. The default is to not make use of ELD information.
-+; eld-device = ... # If this is an HDMI port, here's where to specify the device index for the ELD mixer
-+; # control. The default is to not make use of ELD information. If the value is "auto",
-+; # the device index is autodetected (requires setting "query-hw-device = yes" in the
-+; # mapping that contains this path).
- ;
- ; [Properties] # Property list for this path. The list is merged into the port property list.
- ; <key> = <value> # Each property is defined on its own line.
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-index 331014709..ce96a4989 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort
- priority = 59
--eld-device = 3
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-index d81ee789c..d35f6cb93 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 2
- priority = 58
--eld-device = 7
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-index 349812fc2..b54da82f4 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 3
- priority = 57
--eld-device = 8
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-index 81463c946..27f786fc7 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 4
- priority = 56
--eld-device = 9
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-4.conf b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-index d61ec7547..8e7f82f40 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 5
- priority = 55
--eld-device = 10
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-5.conf b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-index 02c15e893..708e83876 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 6
- priority = 54
--eld-device = 11
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-6.conf b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-index 188a1adb3..340d5e495 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 7
- priority = 53
--eld-device = 12
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-7.conf b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-index 80f4e3722..9946eda2c 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-@@ -1,7 +1,7 @@
- [General]
- description = HDMI / DisplayPort 8
- priority = 52
--eld-device = 13
-+eld-device = auto
-
- [Properties]
- device.icon_name = video-display
-
-From patchwork Mon Jun 12 15:45:16 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [pulseaudio-discuss,
- 3/3] alsa-mixer: autodetect the HDMI jack PCM device
-From: Tanu Kaskinen <tanuk(a)iki.fi>
-X-Patchwork-Id: 161215
-Message-Id: <20170612154516.12941-4-tanuk(a)iki.fi>
-To: pulseaudio-discuss(a)lists.freedesktop.org
-Cc: Takashi Iwai <tiwai(a)suse.de>, Hans de Goede <hdegoede(a)redhat.com>
-Date: Mon, 12 Jun 2017 18:45:16 +0300
-
-This removes the need to hardcode the PCM device index in the HDMI jack
-names. The hardcoded values don't work with the Intel HDMI LPE driver.
-
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
----
- src/modules/alsa/alsa-mixer.c | 50 ++++++++++++++++++++--
- src/modules/alsa/alsa-mixer.h | 4 +-
- src/modules/alsa/alsa-sink.c | 2 +-
- src/modules/alsa/alsa-source.c | 2 +-
- .../alsa/mixer/paths/analog-output.conf.common | 5 +++
- src/modules/alsa/mixer/paths/hdmi-output-0.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-1.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-2.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-3.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-4.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-5.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-6.conf | 3 +-
- src/modules/alsa/mixer/paths/hdmi-output-7.conf | 3 +-
- 13 files changed, 73 insertions(+), 14 deletions(-)
-
-diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
-index 71b393e49..49ce39e6b 100644
---- a/src/modules/alsa/alsa-mixer.c
-+++ b/src/modules/alsa/alsa-mixer.c
-@@ -1812,12 +1812,31 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
- return 0;
- }
-
--static int jack_probe(pa_alsa_jack *j, snd_mixer_t *m) {
-+static int jack_probe(pa_alsa_jack *j, pa_alsa_mapping *mapping, snd_mixer_t *m) {
- bool has_control;
-
- pa_assert(j);
- pa_assert(j->path);
-
-+ if (j->append_pcm_to_name) {
-+ char *new_name;
-+
-+ if (!mapping) {
-+ /* This could also be an assertion, because this should never
-+ * happen. At the time of writing, mapping can only be NULL when
-+ * module-alsa-sink/source synthesizes a path, and those
-+ * synthesized paths never have any jacks, so jack_probe() should
-+ * never be called with a NULL mapping. */
-+ pa_log("Jack %s: append_pcm_to_name is set, but mapping is NULL. Can't use this jack.", j->name);
-+ return -1;
-+ }
-+
-+ new_name = pa_sprintf_malloc("%s,pcm=%i Jack", j->name, mapping->hw_device_index);
-+ pa_xfree(j->alsa_name);
-+ j->alsa_name = new_name;
-+ j->append_pcm_to_name = false;
-+ }
-+
- has_control = pa_alsa_mixer_find(m, j->alsa_name, 0) != NULL;
- pa_alsa_jack_set_has_control(j, has_control);
-
-@@ -2348,6 +2367,30 @@ static int jack_parse_state(pa_config_parser_state *state) {
- return 0;
- }
-
-+static int jack_parse_append_pcm_to_name(pa_config_parser_state *state) {
-+ pa_alsa_path *path;
-+ pa_alsa_jack *jack;
-+ int b;
-+
-+ pa_assert(state);
-+
-+ path = state->userdata;
-+ if (!(jack = jack_get(path, state->section))) {
-+ pa_log("[%s:%u] Option 'append_pcm_to_name' not expected in section '%s'",
-+ state->filename, state->lineno, state->section);
-+ return -1;
-+ }
-+
-+ b = pa_parse_boolean(state->rvalue);
-+ if (b < 0) {
-+ pa_log("[%s:%u] Invalid value for 'append_pcm_to_name': %s", state->filename, state->lineno, state->rvalue);
-+ return -1;
-+ }
-+
-+ jack->append_pcm_to_name = b;
-+ return 0;
-+}
-+
- static int element_set_option(pa_alsa_element *e, snd_mixer_t *m, int alsa_idx) {
- snd_mixer_selem_id_t *sid;
- snd_mixer_elem_t *me;
-@@ -2555,6 +2598,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
- /* [Jack ...] */
- { "state.plugged", jack_parse_state, NULL, NULL },
- { "state.unplugged", jack_parse_state, NULL, NULL },
-+ { "append-pcm-to-name", jack_parse_append_pcm_to_name, NULL, NULL },
-
- /* [Element ...] */
- { "switch", element_parse_switch, NULL, NULL },
-@@ -2766,7 +2810,7 @@ static void path_create_settings(pa_alsa_path *p) {
- element_create_settings(p->elements, NULL);
- }
-
--int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, bool ignore_dB) {
-+int pa_alsa_path_probe(pa_alsa_path *p, pa_alsa_mapping *mapping, snd_mixer_t *m, bool ignore_dB) {
- pa_alsa_element *e;
- pa_alsa_jack *j;
- double min_dB[PA_CHANNEL_POSITION_MAX], max_dB[PA_CHANNEL_POSITION_MAX];
-@@ -2786,7 +2830,7 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, bool ignore_dB) {
- pa_log_debug("Probing path '%s'", p->name);
-
- PA_LLIST_FOREACH(j, p->jacks) {
-- if (jack_probe(j, m) < 0) {
-+ if (jack_probe(j, mapping, m) < 0) {
- p->supported = false;
- pa_log_debug("Probe of jack '%s' failed.", j->alsa_name);
- return -1;
-diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
-index d85cc38d3..7400064fa 100644
---- a/src/modules/alsa/alsa-mixer.h
-+++ b/src/modules/alsa/alsa-mixer.h
-@@ -171,6 +171,8 @@ struct pa_alsa_jack {
-
- pa_dynarray *ucm_devices; /* pa_alsa_ucm_device */
- pa_dynarray *ucm_hw_mute_devices; /* pa_alsa_ucm_device */
-+
-+ bool append_pcm_to_name;
- };
-
- pa_alsa_jack *pa_alsa_jack_new(pa_alsa_path *path, const char *name);
-@@ -235,7 +237,7 @@ void pa_alsa_element_dump(pa_alsa_element *e);
-
- pa_alsa_path *pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction);
- pa_alsa_path *pa_alsa_path_synthesize(const char *element, pa_alsa_direction_t direction);
--int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, bool ignore_dB);
-+int pa_alsa_path_probe(pa_alsa_path *p, pa_alsa_mapping *mapping, snd_mixer_t *m, bool ignore_dB);
- void pa_alsa_path_dump(pa_alsa_path *p);
- int pa_alsa_path_get_volume(pa_alsa_path *p, snd_mixer_t *m, const pa_channel_map *cm, pa_cvolume *v);
- int pa_alsa_path_get_mute(pa_alsa_path *path, snd_mixer_t *m, bool *muted);
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 827a65081..99ca5061b 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -1912,7 +1912,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char
- if (!(u->mixer_path = pa_alsa_path_synthesize(element, PA_ALSA_DIRECTION_OUTPUT)))
- goto fail;
-
-- if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, ignore_dB) < 0)
-+ if (pa_alsa_path_probe(u->mixer_path, NULL, u->mixer_handle, ignore_dB) < 0)
- goto fail;
-
- pa_log_debug("Probed mixer path %s:", u->mixer_path->name);
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index 6bec188ea..84abbf1d9 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -1615,7 +1615,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char
- if (!(u->mixer_path = pa_alsa_path_synthesize(element, PA_ALSA_DIRECTION_INPUT)))
- goto fail;
-
-- if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, ignore_dB) < 0)
-+ if (pa_alsa_path_probe(u->mixer_path, NULL, u->mixer_handle, ignore_dB) < 0)
- goto fail;
-
- pa_log_debug("Probed mixer path %s:", u->mixer_path->name);
-diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
-index a113a2e3a..13d4f7c3b 100644
---- a/src/modules/alsa/mixer/paths/analog-output.conf.common
-+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
-@@ -124,6 +124,11 @@
- ; # the required-any are present.
- ; state.plugged = yes | no | unknown # Normally a plugged jack would mean the port becomes available, and an unplugged means it's
- ; state.unplugged = yes | no | unknown # unavailable, but the port status can be overridden by specifying state.plugged and/or state.unplugged.
-+; append-pcm-to-name = no | yes # Add ",pcm=N" to the jack name? N is the hw PCM device index. HDMI jacks have
-+; # the PCM device index in their name, but different drivers use different
-+; # numbering schemes, so we can't hardcode the full jack name in our configuration
-+; # files. If this is set to "yes", then also "query-hw-device" in the mapping
-+; # configuration needs to be set to "yes".
-
- [Element PCM]
- switch = mute
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-index ce96a4989..95b1342e9 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=3]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-index d35f6cb93..37b945204 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=7]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-index b54da82f4..19c38f2e8 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=8]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-index 27f786fc7..8551570ac 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=9]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-4.conf b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-index 8e7f82f40..e36128921 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=10]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-5.conf b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-index 708e83876..82dc3be79 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=11]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-6.conf b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-index 340d5e495..92e8fd1e2 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=12]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
-diff --git a/src/modules/alsa/mixer/paths/hdmi-output-7.conf b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-index 9946eda2c..abe2b60e6 100644
---- a/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-+++ b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
-@@ -6,5 +6,6 @@ eld-device = auto
- [Properties]
- device.icon_name = video-display
-
--[Jack HDMI/DP,pcm=13]
-+[Jack HDMI/DP]
-+append-pcm-to-name = yes
- required = ignore
diff --git a/pulseaudio-discuss-alsa-don-t-assume-that-hw-x-is-an-analog-output.patch b/pulseaudio-discuss-alsa-don-t-assume-that-hw-x-is-an-analog-output.patch
deleted file mode 100644
index a9737a8..0000000
--- a/pulseaudio-discuss-alsa-don-t-assume-that-hw-x-is-an-analog-output.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
-index 3dbf6b1d0..f59cad394 100644
---- a/src/modules/alsa/alsa-mixer.c
-+++ b/src/modules/alsa/alsa-mixer.c
-@@ -4015,7 +4015,8 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
- { "iec958-ac3-surround-51", N_("Digital Surround 5.1 (IEC958/AC3)") },
- { "iec958-dts-surround-51", N_("Digital Surround 5.1 (IEC958/DTS)") },
- { "hdmi-stereo", N_("Digital Stereo (HDMI)") },
-- { "hdmi-surround-51", N_("Digital Surround 5.1 (HDMI)") }
-+ { "hdmi-surround-51", N_("Digital Surround 5.1 (HDMI)") },
-+ { "unknown-stereo", N_("Stereo") },
- };
-
- pa_assert(m);
-@@ -4152,6 +4153,7 @@ static int profile_verify(pa_alsa_profile *p) {
- { "output:analog-stereo+input:analog-stereo", N_("Analog Stereo Duplex") },
- { "output:iec958-stereo+input:iec958-stereo", N_("Digital Stereo Duplex (IEC958)") },
- { "output:multichannel-output+input:multichannel-input", N_("Multichannel Duplex") },
-+ { "output:unknown-stereo+input:unknown-stereo", N_("Stereo Duplex") },
- { "off", N_("Off") }
- };
-
-diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
-index 470eb994c..f412058ff 100644
---- a/src/modules/alsa/mixer/profile-sets/default.conf
-+++ b/src/modules/alsa/mixer/profile-sets/default.conf
-@@ -109,7 +109,7 @@ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal
- priority = 2
-
- [Mapping analog-stereo]
--device-strings = front:%f hw:%f
-+device-strings = front:%f
- channel-map = left,right
- paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
- paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
-@@ -460,6 +460,12 @@ priority = 1
- direction = input
- paths-input = multichannel-input
-
-+[Mapping unknown-stereo]
-+device-strings = hw:%f
-+channel-map = front-left,front-right
-+fallback = yes
-+priority = 1
-+
- ; An example for defining multiple-sink profiles
- #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
- #description = Foobar
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 18de87e..90b772d 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -75,10 +75,6 @@ Patch116: 0016-Make-flatpak-module-load.patch
Patch117: 0017-Make-sure-to-set-the-pid-in-auth_cb.patch
Patch118: 0018-Use-permissive-policy-by-default.patch
-# HDMI LPE support: https://bugs.freedesktop.org/show_bug.cgi?id=100488
-Patch119: pulseaudio-discuss-alsa-don-t-assume-that-hw-x-is-an-analog-output.patch
-Patch120: Fix-jack-detection-for-Intel-HDMI-LPE.patch
-
BuildRequires: automake libtool
BuildRequires: pkgconfig(bash-completion)
%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
@@ -604,9 +600,6 @@ exit 0
%changelog
-* Tue Jul 25 2017 Bastien Nocera <bnocera(a)redhat.com> - 10.0-5
-+ Add support for Intel HDMI LPE (stops crash loops on boot)
-
* Mon Feb 13 2017 Wim Taymans <wtaymans(a)redhat.com> - 10.0-4
- Add flatpak access control
commit 56ae9a31530c625ac1736d414b691a1ee7f36678
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Oct 9 11:44:02 2017 -0500
fix build
autoconf + tests
diff --git a/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch b/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch
new file mode 100644
index 0000000..3238bd5
--- /dev/null
+++ b/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch
@@ -0,0 +1,25 @@
+From 4e6d9e321400cbb660b4373db6b50bea71707641 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Fri, 4 Aug 2017 16:43:02 +0300
+Subject: [PATCH 10/48] build-sys: add iec958-stereo-input.conf to
+ dist_alsapaths_DATA
+
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3ff1139f..1d974037 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1343,6 +1343,7 @@ dist_alsapaths_DATA = \
+ modules/alsa/mixer/paths/analog-output-headphones-2.conf \
+ modules/alsa/mixer/paths/analog-output-lineout.conf \
+ modules/alsa/mixer/paths/analog-output-mono.conf \
++ modules/alsa/mixer/paths/iec958-stereo-input.conf \
+ modules/alsa/mixer/paths/iec958-stereo-output.conf \
+ modules/alsa/mixer/paths/hdmi-output-0.conf \
+ modules/alsa/mixer/paths/hdmi-output-1.conf \
+--
+2.13.6
+
diff --git a/0018-build-sys-add-the-Arctis-configuration.patch b/0018-build-sys-add-the-Arctis-configuration.patch
new file mode 100644
index 0000000..948aa38
--- /dev/null
+++ b/0018-build-sys-add-the-Arctis-configuration.patch
@@ -0,0 +1,38 @@
+From c7fe78c9f73ded2c3428666722ec9c1af4b82812 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Sat, 2 Sep 2017 18:23:12 +0300
+Subject: [PATCH 18/48] build-sys: add the Arctis configuration
+
+---
+ src/Makefile.am | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1d974037..ba2ea97e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1310,7 +1310,8 @@ dist_alsaprofilesets_DATA = \
+ modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \
+ modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
+ modules/alsa/mixer/profile-sets/kinect-audio.conf \
+- modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
++ modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \
++ modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
+
+ if HAVE_UDEV
+ dist_udevrules_DATA = \
+@@ -1352,7 +1353,10 @@ dist_alsapaths_DATA = \
+ modules/alsa/mixer/paths/hdmi-output-4.conf \
+ modules/alsa/mixer/paths/hdmi-output-5.conf \
+ modules/alsa/mixer/paths/hdmi-output-6.conf \
+- modules/alsa/mixer/paths/hdmi-output-7.conf
++ modules/alsa/mixer/paths/hdmi-output-7.conf \
++ modules/alsa/mixer/paths/steelseries-arctis-input.conf \
++ modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf \
++ modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
+
+ endif
+
+--
+2.13.6
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index db54c66..aaf7eb4 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -56,8 +56,10 @@ Patch3: pulseaudio-8.99.2-getaffinity.patch
## upstream patches
Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
Patch9: 0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
+Patch10: 0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch
Patch15: 0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch
Patch16: 0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch
+Patch18: 0018-build-sys-add-the-Arctis-configuration.patch
Patch35: 0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch
## upstreamable patches
@@ -240,11 +242,13 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
## upstream patches
-%patch4 -p1 -b .0004
-%patch9 -p1 -b .0009
-%patch15 -p1 -b .0015
-%patch16 -p1 -b .0016
-%patch35 -p1 -b .0035
+%patch4 -p1
+%patch9 -p1
+%patch10 -p1
+%patch15 -p1
+%patch16 -p1
+%patch18 -p1
+%patch35 -p1
%patch1 -p1 -b .autostart
%patch2 -p1 -b .disable_flat_volumes
@@ -259,9 +263,12 @@ sed -i.no_consolekit -e \
sed -i.PACKAGE_VERSION -e "s|^PACKAGE_VERSION=.*|PACKAGE_VERSION=\'%{version}\'|" configure
%else
## kill rpaths
-%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
-%endif
+# needed for (at least) patch18
+NOCONFIGURE=1 ./bootstrap.sh
+
+#if "%{_libdir}" != "/usr/lib"
+#sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+#endif
%endif
commit 6362d3293a91d32a2fd806199b36bde9916500d7
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Oct 9 10:54:37 2017 -0500
backport some alsa-mixer related fixes (#1492344)
diff --git a/0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch b/0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
new file mode 100644
index 0000000..1d83034
--- /dev/null
+++ b/0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
@@ -0,0 +1,96 @@
+From 60c0edd5286dbb731c671ad3e6886c1e3e1eb067 Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang(a)canonical.com>
+Date: Fri, 26 May 2017 15:42:40 +0800
+Subject: [PATCH 04/48] alsa-mixer: Add support for usb audio in the Dell dock
+ TB16
+
+There are one headset jack on the front panel of TB16, through this
+jack, we have one stereo headphone output (hw:%f,0,0) and one mono
+headset-mic input (hw:%f,0,0); and there is one speaker output jack
+(hw:%f,1,0) on the rear panel of TB16.
+
+The detail information of the Dell dock TB16:
+http://www.dell.com/support/article/sg/en/sgbsdt1/SLN301105
+
+Signed-off-by: Hui Wang <hui.wang(a)canonical.com>
+---
+ .../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 +
+ .../profile-sets/dell-dock-tb16-usb-audio.conf | 55 ++++++++++++++++++++++
+ 2 files changed, 56 insertions(+)
+ create mode 100644 src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
+
+diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+index 70e34e6f..805a05b2 100644
+--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
++++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+@@ -98,5 +98,6 @@ ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1021", ENV{PULSE_PROFILE_SET}="nativ
+ ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
+ ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
+ ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
++ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
+
+ LABEL="pulseaudio_end"
+diff --git a/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
+new file mode 100644
+index 00000000..11865524
+--- /dev/null
++++ b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
+@@ -0,0 +1,55 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++; Dell Dock TB16 USB audio
++;
++; This card has two stereo pairs of output, One Mono input.
++;
++; See default.conf for an explanation on the directives used here.
++
++[General]
++auto-profiles = no
++
++[Mapping analog-stereo-headphone]
++description = Headphone
++device-strings = hw:%f,0,0
++channel-map = left,right
++direction = output
++
++[Mapping analog-stereo-speaker]
++description = Speaker
++device-strings = hw:%f,1,0
++channel-map = left,right
++direction = output
++
++[Mapping analog-stereo-mic]
++description = Headset-Mic
++device-strings = hw:%f,0,0
++channel-map = left,right
++direction = input
++
++
++[Profile output:analog-stereo-speaker]
++description = Speaker
++output-mappings = analog-stereo-speaker
++priority = 60
++skip-probe = yes
++
++[Profile output:analog-stereo-headphone+input:analog-stereo-mic]
++description = Headset
++output-mappings = analog-stereo-headphone
++input-mappings = analog-stereo-mic
++priority = 80
++skip-probe = yes
+--
+2.13.6
+
diff --git a/0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch b/0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
new file mode 100644
index 0000000..4689456
--- /dev/null
+++ b/0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
@@ -0,0 +1,48 @@
+From ec325304cdca5e2a46f5a84f93c8b614a204d87f Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Fri, 4 Aug 2017 11:14:43 +0300
+Subject: [PATCH 09/48] alsa-mixer: set PCM Capture Source for iec958 input
+
+It was reported that on a certain USB card, identified as
+"0d8c:0102 C-Media Electronics, Inc. CM106 Like Sound Device",
+the "PCM Capture Source" element had to be set to "IEC958 In" before
+the iec958 input would work.
+
+The iec958-stereo-input.conf file didn't exist before, although the path
+was referenced in the default.conf profile configuration file.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=101973
+---
+ .../alsa/mixer/paths/iec958-stereo-input.conf | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+ create mode 100644 src/modules/alsa/mixer/paths/iec958-stereo-input.conf
+
+diff --git a/src/modules/alsa/mixer/paths/iec958-stereo-input.conf b/src/modules/alsa/mixer/paths/iec958-stereo-input.conf
+new file mode 100644
+index 00000000..babc8398
+--- /dev/null
++++ b/src/modules/alsa/mixer/paths/iec958-stereo-input.conf
+@@ -0,0 +1,20 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++[Element PCM Capture Source]
++enumeration = select
++
++[Option PCM Capture Source:IEC958 In]
++name = iec958-input
+--
+2.13.6
+
diff --git a/0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch b/0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch
new file mode 100644
index 0000000..45fff8c
--- /dev/null
+++ b/0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch
@@ -0,0 +1,45 @@
+From 739a4b3d2318f05eb7101c2baa861e5c636125a5 Mon Sep 17 00:00:00 2001
+From: Ian Ray <ian.ray(a)ge.com>
+Date: Wed, 30 Aug 2017 11:09:48 +0300
+Subject: [PATCH 15/48] alsa-mixer: round, not truncate, in to_alsa_dB
+
+to_alsa_dB() returns a result rounded to two decimal places (instead of
+using integer truncation) to avoid small errors when converting between
+dB and volume.
+
+Consider playback at -22 dB (which is supported by ALSA) but results in
+the higher level of -21 dB plus software attenuation.
+
+ pa_sw_volume_from_dB(-22) = 28172
+ pa_sw_volume_to_dB(28172) = -21.9997351
+ to_alsa_dB(-21.9997351) = -2199
+
+ ALSA value 106 = -2200
+ ALSA value 107 = -2100
+ ...
+
+ rounding = +1 /* "accurate or first above" */
+ snd_mixer_selem_ask_playback_dB_vol(me, -2199, rounding, &alsa_val)
+ alsa_val = -2100
+
+Signed-off-by: Ian Ray <ian.ray(a)ge.com>
+---
+ src/modules/alsa/alsa-mixer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
+index f59cad39..aeaf12c4 100644
+--- a/src/modules/alsa/alsa-mixer.c
++++ b/src/modules/alsa/alsa-mixer.c
+@@ -700,7 +700,7 @@ void pa_alsa_path_set_free(pa_alsa_path_set *ps) {
+ }
+
+ static long to_alsa_dB(pa_volume_t v) {
+- return (long) (pa_sw_volume_to_dB(v) * 100.0);
++ return lround(pa_sw_volume_to_dB(v) * 100.0);
+ }
+
+ static pa_volume_t from_alsa_dB(long v) {
+--
+2.13.6
+
diff --git a/0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch b/0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch
new file mode 100644
index 0000000..55e65b8
--- /dev/null
+++ b/0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch
@@ -0,0 +1,193 @@
+From 15386a710c1500f70085a6312fb4d84be4d254c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johan=20Heikkil=C3=A4?= <johan.heikkila(a)gmail.com>
+Date: Sun, 27 Aug 2017 16:29:37 +0300
+Subject: [PATCH 16/48] alsa-mixer: add support for Steelseries Arctis 7
+ headset
+
+---
+ src/modules/alsa/alsa-mixer.c | 1 +
+ .../alsa/mixer/paths/steelseries-arctis-input.conf | 25 +++++++++++++
+ .../paths/steelseries-arctis-output-mono.conf | 29 +++++++++++++++
+ .../paths/steelseries-arctis-output-stereo.conf | 27 ++++++++++++++
+ .../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 +
+ .../profile-sets/steelseries-arctis-usb-audio.conf | 43 ++++++++++++++++++++++
+ 6 files changed, 126 insertions(+)
+ create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
+ create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
+ create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
+ create mode 100644 src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
+
+diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
+index aeaf12c4..08ea45d3 100644
+--- a/src/modules/alsa/alsa-mixer.c
++++ b/src/modules/alsa/alsa-mixer.c
+@@ -2469,6 +2469,7 @@ static int path_verify(pa_alsa_path *p) {
+ { "analog-input-video", N_("Video") },
+ { "analog-output", N_("Analog Output") },
+ { "analog-output-headphones", N_("Headphones") },
++ { "analog-output-headphones-mono", N_("Headphones Mono Output") },
+ { "analog-output-lfe-on-mono", N_("LFE on Separate Mono Output") },
+ { "analog-output-lineout", N_("Line Out") },
+ { "analog-output-mono", N_("Analog Mono Output") },
+diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
+new file mode 100644
+index 00000000..f3115ba6
+--- /dev/null
++++ b/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
+@@ -0,0 +1,25 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++; Steelseries Arctis 7 USB headset microphone path.
++
++[General]
++description-key = analog-input-microphone-headset
++
++[Element Headset]
++volume = merge
++switch = mute
++override-map.1 = all
++override-map.2 = all-left,all-right
+diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
+new file mode 100644
+index 00000000..67950618
+--- /dev/null
++++ b/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
+@@ -0,0 +1,29 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++; Steelseries Arctis 7 USB headset mono output path. The headset has two
++; output devices. The first one is mono, meant for voice audio, and the
++; second one is stereo, meant for everything else. The purpose of this
++; unusual design is to provide separate volume controls for voice and
++; other audio, which can be useful in gaming.
++
++[General]
++description-key = analog-output-headphones-mono
++
++[Element PCM]
++volume = merge
++switch = mute
++override-map.1 = all
++override-map.2 = all-left,all-right
+diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
+new file mode 100644
+index 00000000..4e10c800
+--- /dev/null
++++ b/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
+@@ -0,0 +1,27 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++; Steelseries Arctis 7 USB headset stereo output path. The headset has two
++; output devices. The first one is mono, meant for voice audio, and the
++; second one is stereo, meant for everything else. The purpose of this
++; unusual design is to provide separate volume controls for voice and
++; other audio, which can be useful in gaming.
++;
++; This path doesn't provide hardware volume control, because the stereo
++; output is controlled by the PCM element with index 1, and currently
++; PulseAudio only supports elements with index 0.
++
++[General]
++description-key = analog-output-headphones
+diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+index 805a05b2..2392ca50 100644
+--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
++++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+@@ -99,5 +99,6 @@ ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudi
+ ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
+ ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
+ ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
++ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1260", ENV{PULSE_PROFILE_SET}="steelseries-arctis-usb-audio.conf"
+
+ LABEL="pulseaudio_end"
+diff --git a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
+new file mode 100644
+index 00000000..d3563a16
+--- /dev/null
++++ b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
+@@ -0,0 +1,43 @@
++# This file is part of PulseAudio.
++#
++# PulseAudio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# PulseAudio is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
++
++; Steelseries Arctis 7 USB headset. The headset has a microphone and two output
++; devices. The first output device is mono, meant for voice audio, and the
++; second one is stereo, meant for everything else. The purpose of this unusual
++; design is to provide separate volume controls for voice and other audio,
++; which can be useful in gaming.
++;
++; See default.conf for an explanation on the directives used here.
++
++[General]
++auto-profiles = yes
++
++[Mapping analog-mono]
++device-strings = hw:%f,0,0
++channel-map = mono
++paths-output = steelseries-arctis-output-mono
++paths-input = steelseries-arctis-input
++
++[Mapping analog-stereo]
++device-strings = hw:%f,1,0
++channel-map = left,right
++paths-output = steelseries-arctis-output-stereo
++direction = output
++
++[Profile output:analog-mono+output:analog-stereo+input:analog-mono]
++output-mappings = analog-mono analog-stereo
++input-mappings = analog-mono
++priority = 5100
++skip-probe = yes
+--
+2.13.6
+
diff --git a/0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch b/0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch
new file mode 100644
index 0000000..b2e54ba
--- /dev/null
+++ b/0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch
@@ -0,0 +1,380 @@
+From 184c28795bb98ad14bdfcef01a475d5ba11e40d5 Mon Sep 17 00:00:00 2001
+From: Kristian Klausen <klausenbusk(a)hotmail.com>
+Date: Fri, 22 Sep 2017 17:54:14 +0000
+Subject: [PATCH 35/48] alsa-mixer: Prioritize hdmi-* mappings over iec958-*
+ mappings
+
+Pulseaudio tries to pick the best profile (on startup or
+hotplugged), the best profile is the profile with the highest
+priority which isn't unavailable.
+Due to the facts that iec958 ports available status always (?)
+is unknown, and that it is generally more likely that a user use
+hdmi than iec958, lets prioritze hdmi over iec958.
+
+This patch shift the analog-* mappings +5 and hdmi-* mappings +5.
+---
+ src/modules/alsa/mixer/profile-sets/default.conf | 80 ++++++++++++------------
+ 1 file changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
+index c360e772..f5093830 100644
+--- a/src/modules/alsa/mixer/profile-sets/default.conf
++++ b/src/modules/alsa/mixer/profile-sets/default.conf
+@@ -106,14 +106,14 @@ device-strings = hw:%f
+ channel-map = mono
+ paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
+-priority = 2
++priority = 7
+
+ [Mapping analog-stereo]
+ device-strings = front:%f
+ channel-map = left,right
+ paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
+-priority = 10
++priority = 15
+
+ # If everything else fails, try to use hw:0 as a stereo device.
+ [Mapping stereo-fallback]
+@@ -128,35 +128,35 @@ priority = 1
+ device-strings = surround21:%f
+ channel-map = front-left,front-right,lfe
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 8
++priority = 13
+ direction = output
+
+ [Mapping analog-surround-40]
+ device-strings = surround40:%f
+ channel-map = front-left,front-right,rear-left,rear-right
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 7
++priority = 12
+ direction = output
+
+ [Mapping analog-surround-41]
+ device-strings = surround41:%f
+ channel-map = front-left,front-right,rear-left,rear-right,lfe
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 8
++priority = 13
+ direction = output
+
+ [Mapping analog-surround-50]
+ device-strings = surround50:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 7
++priority = 12
+ direction = output
+
+ [Mapping analog-surround-51]
+ device-strings = surround51:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 8
++priority = 13
+ direction = output
+
+ [Mapping analog-surround-71]
+@@ -164,7 +164,7 @@ device-strings = surround71:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+ description = Analog Surround 7.1
+ paths-output = analog-output analog-output-lineout analog-output-speaker
+-priority = 7
++priority = 12
+ direction = output
+
+ [Mapping iec958-stereo]
+@@ -200,7 +200,7 @@ description = Digital Stereo (HDMI)
+ device-strings = hdmi:%f
+ paths-output = hdmi-output-0
+ channel-map = left,right
+-priority = 4
++priority = 9
+ direction = output
+
+ [Mapping hdmi-surround]
+@@ -208,7 +208,7 @@ description = Digital Surround 5.1 (HDMI)
+ device-strings = hdmi:%f
+ paths-output = hdmi-output-0
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 3
++priority = 8
+ direction = output
+
+ [Mapping hdmi-surround71]
+@@ -216,7 +216,7 @@ description = Digital Surround 7.1 (HDMI)
+ device-strings = hdmi:%f
+ paths-output = hdmi-output-0
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 3
++priority = 8
+ direction = output
+
+ [Mapping hdmi-dts-surround]
+@@ -224,7 +224,7 @@ description = Digital Surround 5.1 (HDMI/DTS)
+ device-strings = dcahdmi:%f
+ paths-output = hdmi-output-0
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra1]
+@@ -232,7 +232,7 @@ description = Digital Stereo (HDMI 2)
+ device-strings = hdmi:%f,1
+ paths-output = hdmi-output-1
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra1]
+@@ -240,7 +240,7 @@ description = Digital Surround 5.1 (HDMI 2)
+ device-strings = hdmi:%f,1
+ paths-output = hdmi-output-1
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra1]
+@@ -248,7 +248,7 @@ description = Digital Surround 7.1 (HDMI 2)
+ device-strings = hdmi:%f,1
+ paths-output = hdmi-output-1
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra1]
+@@ -256,7 +256,7 @@ description = Digital Surround 5.1 (HDMI 2/DTS)
+ device-strings = dcahdmi:%f,1
+ paths-output = hdmi-output-1
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra2]
+@@ -264,7 +264,7 @@ description = Digital Stereo (HDMI 3)
+ device-strings = hdmi:%f,2
+ paths-output = hdmi-output-2
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra2]
+@@ -272,7 +272,7 @@ description = Digital Surround 5.1 (HDMI 3)
+ device-strings = hdmi:%f,2
+ paths-output = hdmi-output-2
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra2]
+@@ -280,7 +280,7 @@ description = Digital Surround 7.1 (HDMI 3)
+ device-strings = hdmi:%f,2
+ paths-output = hdmi-output-2
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra2]
+@@ -288,7 +288,7 @@ description = Digital Surround 5.1 (HDMI 3/DTS)
+ device-strings = dcahdmi:%f,2
+ paths-output = hdmi-output-2
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra3]
+@@ -296,7 +296,7 @@ description = Digital Stereo (HDMI 4)
+ device-strings = hdmi:%f,3
+ paths-output = hdmi-output-3
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra3]
+@@ -304,7 +304,7 @@ description = Digital Surround 5.1 (HDMI 4)
+ device-strings = hdmi:%f,3
+ paths-output = hdmi-output-3
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra3]
+@@ -312,7 +312,7 @@ description = Digital Surround 7.1 (HDMI 4)
+ device-strings = hdmi:%f,3
+ paths-output = hdmi-output-3
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra3]
+@@ -320,7 +320,7 @@ description = Digital Surround 5.1 (HDMI 4/DTS)
+ device-strings = dcahdmi:%f,3
+ paths-output = hdmi-output-3
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra4]
+@@ -328,7 +328,7 @@ description = Digital Stereo (HDMI 5)
+ device-strings = hdmi:%f,4
+ paths-output = hdmi-output-4
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra4]
+@@ -336,7 +336,7 @@ description = Digital Surround 5.1 (HDMI 5)
+ device-strings = hdmi:%f,4
+ paths-output = hdmi-output-4
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra4]
+@@ -344,7 +344,7 @@ description = Digital Surround 7.1 (HDMI 5)
+ device-strings = hdmi:%f,4
+ paths-output = hdmi-output-4
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra4]
+@@ -352,7 +352,7 @@ description = Digital Surround 5.1 (HDMI 5/DTS)
+ device-strings = dcahdmi:%f,4
+ paths-output = hdmi-output-4
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra5]
+@@ -360,7 +360,7 @@ description = Digital Stereo (HDMI 6)
+ device-strings = hdmi:%f,5
+ paths-output = hdmi-output-5
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra5]
+@@ -368,7 +368,7 @@ description = Digital Surround 5.1 (HDMI 6)
+ device-strings = hdmi:%f,5
+ paths-output = hdmi-output-5
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra5]
+@@ -376,7 +376,7 @@ description = Digital Surround 7.1 (HDMI 6)
+ device-strings = hdmi:%f,5
+ paths-output = hdmi-output-5
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra5]
+@@ -384,7 +384,7 @@ description = Digital Surround 5.1 (HDMI 6/DTS)
+ device-strings = dcahdmi:%f,5
+ paths-output = hdmi-output-5
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra6]
+@@ -392,7 +392,7 @@ description = Digital Stereo (HDMI 7)
+ device-strings = hdmi:%f,6
+ paths-output = hdmi-output-6
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra6]
+@@ -400,7 +400,7 @@ description = Digital Surround 5.1 (HDMI 7)
+ device-strings = hdmi:%f,6
+ paths-output = hdmi-output-6
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra6]
+@@ -408,7 +408,7 @@ description = Digital Surround 7.1 (HDMI 7)
+ device-strings = hdmi:%f,6
+ paths-output = hdmi-output-6
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra6]
+@@ -416,7 +416,7 @@ description = Digital Surround 5.1 (HDMI 7/DTS)
+ device-strings = dcahdmi:%f,6
+ paths-output = hdmi-output-6
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-stereo-extra7]
+@@ -424,7 +424,7 @@ description = Digital Stereo (HDMI 8)
+ device-strings = hdmi:%f,7
+ paths-output = hdmi-output-7
+ channel-map = left,right
+-priority = 2
++priority = 7
+ direction = output
+
+ [Mapping hdmi-surround-extra7]
+@@ -432,7 +432,7 @@ description = Digital Surround 5.1 (HDMI 8)
+ device-strings = hdmi:%f,7
+ paths-output = hdmi-output-7
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-surround71-extra7]
+@@ -440,7 +440,7 @@ description = Digital Surround 7.1 (HDMI 8)
+ device-strings = hdmi:%f,7
+ paths-output = hdmi-output-7
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping hdmi-dts-surround-extra7]
+@@ -448,7 +448,7 @@ description = Digital Surround 5.1 (HDMI 8/DTS)
+ device-strings = dcahdmi:%f,7
+ paths-output = hdmi-output-7
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-priority = 1
++priority = 6
+ direction = output
+
+ [Mapping multichannel-output]
+--
+2.13.6
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 405f0d1..db54c66 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -54,6 +54,11 @@ Patch2: pulseaudio-9.0-disable_flat_volumes.patch
Patch3: pulseaudio-8.99.2-getaffinity.patch
## upstream patches
+Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
+Patch9: 0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
+Patch15: 0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch
+Patch16: 0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch
+Patch35: 0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch
## upstreamable patches
@@ -234,6 +239,13 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%prep
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
+## upstream patches
+%patch4 -p1 -b .0004
+%patch9 -p1 -b .0009
+%patch15 -p1 -b .0015
+%patch16 -p1 -b .0016
+%patch35 -p1 -b .0035
+
%patch1 -p1 -b .autostart
%patch2 -p1 -b .disable_flat_volumes
%patch3 -p1 -b .affinity
@@ -573,6 +585,9 @@ exit 0
%changelog
+* Mon Oct 09 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-2
+- backport some alsa-mixer related fixes (#1492344)
+
* Wed Sep 20 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-1
- pulseaudio-11.1
commit 576ac07ea5c74d41c456b14a482c6d025073d4f6
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 20 22:19:27 2017 -0500
pulseaudio-11.1
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 750e1a8..405f0d1 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,4 +1,4 @@
-%global pa_major 11.0
+%global pa_major 11.1
#global pa_minor 0
#global snap 20141103
@@ -573,6 +573,9 @@ exit 0
%changelog
+* Wed Sep 20 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-1
+- pulseaudio-11.1
+
* Tue Sep 05 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.0-1
- pulseaudio-11.0
diff --git a/sources b/sources
index 642be02..6e49e20 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (pulseaudio-11.0.tar.xz) = 37d0afe343c136cef1906342f17c3473f791fe17b7e6dd463ce120d45285bc12e3680b8b4b6779d79b8ce2e755fe2a0cc4d4c960209b1dae9f924731484ecded
-SHA512 (pulseaudio-11.0.tar.xz.md5) = ecc20739a172503cc6cd770c2234db32d75455d6800019fc50fa50a498d422611dd8a6bf7cdb51973a46fe80c1db0bd7f95f2a9223982b8f6b1be78780a90dc8
-SHA512 (pulseaudio-11.0.tar.xz.sha1) = 0b79d8ed3c7ad8accdaa99bcdc65b97f87ef9576dd90640532c9ef1e3a9ca188068c573a074ac1c7dead6cddeea12131555cd7d3b922c6f27a4fb68914f8810f
+SHA512 (pulseaudio-11.1.tar.xz) = 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
+SHA512 (pulseaudio-11.1.tar.xz.md5) = d4fcd1476eb0b0856feb311584cf9623fcb87a1495c335696cf9371871d23e1076d33c138413e2a76f34711fd57fe6d277ed7e6a5d069baa9c6afc5e991d2675
+SHA512 (pulseaudio-11.1.tar.xz.sha1) = c8d5c3923ff67e795d4c0f56f561b1637244eca1b91540f49052a9bc6c2c617eb0f05a7ceb1055852f1dfbbe41706ef1baf81f68c7556c0241373168f7030d56
commit dede185109dce279d2f394452bcc714fdaf62f4c
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 5 08:10:48 2017 -0500
pulseaudio-11.0
diff --git a/pulseaudio.spec b/pulseaudio.spec
index a2b6632..750e1a8 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,5 +1,5 @@
-%global pa_major 10.99
-%global pa_minor 1
+%global pa_major 11.0
+#global pa_minor 0
#global snap 20141103
#global gitrel 327
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 6%{?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}
@@ -573,6 +573,9 @@ exit 0
%changelog
+* Tue Sep 05 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.0-1
+- pulseaudio-11.0
+
* Mon Aug 28 2017 Pete Walter <pwalter(a)fedoraproject.org> - 10.99.1-6
- Enable pulseaudio-module-bluetooth on s390x
diff --git a/sources b/sources
index 4c3db15..642be02 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (pulseaudio-10.99.1.tar.xz) = 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006
-SHA512 (pulseaudio-10.99.1.tar.xz.md5) = ef645038fd76874b6f5841ef3d7559cf09f4b1d12834ac7520e09112e6c629a4955da321fd73dd3097c438915e191cf047bb2b141e61a886e1c9e7ca1393166b
-SHA512 (pulseaudio-10.99.1.tar.xz.sha1) = 9cfec7fd0a3ae13d2f1d61ae80485e48e4bf4d7d06169abc062063c289e155b2646fa0e14766e0d1145a58933b4310436e09959689ddf4a01d0739759282c52d
+SHA512 (pulseaudio-11.0.tar.xz) = 37d0afe343c136cef1906342f17c3473f791fe17b7e6dd463ce120d45285bc12e3680b8b4b6779d79b8ce2e755fe2a0cc4d4c960209b1dae9f924731484ecded
+SHA512 (pulseaudio-11.0.tar.xz.md5) = ecc20739a172503cc6cd770c2234db32d75455d6800019fc50fa50a498d422611dd8a6bf7cdb51973a46fe80c1db0bd7f95f2a9223982b8f6b1be78780a90dc8
+SHA512 (pulseaudio-11.0.tar.xz.sha1) = 0b79d8ed3c7ad8accdaa99bcdc65b97f87ef9576dd90640532c9ef1e3a9ca188068c573a074ac1c7dead6cddeea12131555cd7d3b922c6f27a4fb68914f8810f
commit 386368a149fef6c34f23127df8697c588e14b947
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Mon Aug 28 07:18:12 2017 +0100
Enable pulseaudio-module-bluetooth on s390x
bluez is now available on s390x as well.
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 333f486..a2b6632 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 6%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -78,11 +78,8 @@ BuildRequires: avahi-devel
%global enable_jack 1
%endif
BuildRequires: libatomic_ops-static, libatomic_ops-devel
-%ifnarch s390 s390x
-%global bluez5 1
BuildRequires: pkgconfig(bluez) >= 5.0
BuildRequires: sbc-devel
-%endif
BuildRequires: libXt-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: libXtst-devel
@@ -162,15 +159,13 @@ Requires: %{name}-utils
%description module-zeroconf
Zeroconf publishing module for the PulseAudio sound server.
-%if 0%{?bluez4} || 0%{?bluez5}
%package module-bluetooth
Summary: Bluetooth support for the PulseAudio sound server
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: bluez%{?bluez5: >= 5.0}
+Requires: bluez >= 5.0
%description module-bluetooth
Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
-%endif
%if 0%{?enable_jack}
%package module-jack
@@ -269,8 +264,8 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
--disable-oss-output \
%{?enable_jack:--enable-jack}%{!?enable_jack:--disable-jack} \
%{?enable_lirc:--enable-lirc}%{!?enable_lirc:--disable-lirc} \
- %{?bluez4:--enable-bluez4}%{!?bluez4:--disable-bluez4} \
- %{?bluez5:--enable-bluez5}%{!?bluez5:--disable-bluez5} \
+ --disable-bluez4 \
+ --enable-bluez5 \
%ifarch %{arm}
--disable-neon-opt \
%endif
@@ -496,14 +491,12 @@ exit 0
%{_libdir}/pulse-%{pa_major}/modules/module-jack-source.so
%endif
-%if 0%{?bluez4} || 0%{?bluez5}
%files module-bluetooth
%{_libdir}/pulse-%{pa_major}/modules/libbluez*-util.so
%{_libdir}/pulse-%{pa_major}/modules/module-bluez*-device.so
%{_libdir}/pulse-%{pa_major}/modules/module-bluez*-discover.so
%{_libdir}/pulse-%{pa_major}/modules/module-bluetooth-discover.so
%{_libdir}/pulse-%{pa_major}/modules/module-bluetooth-policy.so
-%endif
%files module-gconf
%{_libdir}/pulse-%{pa_major}/modules/module-gconf.so
@@ -580,6 +573,9 @@ exit 0
%changelog
+* Mon Aug 28 2017 Pete Walter <pwalter(a)fedoraproject.org> - 10.99.1-6
+- Enable pulseaudio-module-bluetooth on s390x
+
* Fri Aug 18 2017 Wim Taymans <wtaymans(a)redhat.com> - 10.99.1-5
- Remove /var/run/pulse and /var/lib/pulse, they are directories in tmpfs
commit d76a72a315e800470d6609e91603299146579dc2
Author: Wim Taymans <wtaymans(a)redhat.com>
Date: Fri Aug 18 08:47:08 2017 +0200
Remove /var/run/pulse and /var/lib/pulse, they are directories in tmpfs
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 9eb8e35..333f486 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -307,9 +307,6 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
mv -fv $RPM_BUILD_ROOT/lib/udev/rules.d/90-pulseaudio.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
-# /var/lib/pulse seems unused, can consider dropping it? -- rex
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pulse
install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
## unpackaged files
@@ -457,8 +454,6 @@ exit 0
%{_mandir}/man5/pulse-daemon.conf.5*
%{_prefix}/lib/udev/rules.d/90-pulseaudio.rules
%dir %{_libexecdir}/pulse
-%attr(0700, pulse, pulse) %dir %{_localstatedir}/lib/pulse
-%attr(0700, pulse, pulse) %dir %{_localstatedir}/run/pulse
%dir %{_datadir}/zsh/
%dir %{_datadir}/zsh/site-functions/
%{_datadir}/zsh/site-functions/_pulseaudio
@@ -585,6 +580,9 @@ exit 0
%changelog
+* Fri Aug 18 2017 Wim Taymans <wtaymans(a)redhat.com> - 10.99.1-5
+- Remove /var/run/pulse and /var/lib/pulse, they are directories in tmpfs
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.99.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 4bf7f77adfdca80fdf3733b7dadfc25c83e03500
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 06:27:08 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/pulseaudio.spec b/pulseaudio.spec
index bf7064c..9eb8e35 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 3%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -585,6 +585,9 @@ exit 0
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.99.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Sun Jul 30 2017 Florian Weimer <fweimer(a)redhat.com> - 10.99.1-3
- Rebuild with binutils fix for ppc64le (#1475636)
commit e6d762e4733ca589a62f40695030383f226dce6a
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Sun Jul 30 14:28:51 2017 +0200
Rebuild with binutils fix for ppc64le (#1475636)
diff --git a/pulseaudio.spec b/pulseaudio.spec
index c80c2f9..bf7064c 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 3%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -585,6 +585,9 @@ exit 0
%changelog
+* Sun Jul 30 2017 Florian Weimer <fweimer(a)redhat.com> - 10.99.1-3
+- Rebuild with binutils fix for ppc64le (#1475636)
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.99.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 5c92543ac79133d8b8ab01e0dbcd93babc0295af
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 09:10:17 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 7d2f6b5..c80c2f9 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -25,7 +25,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -585,6 +585,9 @@ exit 0
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Tue Jul 25 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 10.99.1-1
- pulseaudio-10.99.1 (#1474559)
commit d71f2b33b2f01d762314cb4e4171ee730f8ef7c9
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jul 25 09:30:47 2017 -0500
update %%files
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 14dd871..7d2f6b5 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -377,7 +377,7 @@ exit 0
%if 0%{?with_webrtc}
%{_libdir}/pulse-%{pa_major}/modules/libwebrtc-util.so
%endif
-%{_libdir}/pulse-%{pa_major}/modules/module-access.so
+#{_libdir}/pulse-%{pa_major}/modules/module-access.so
%{_libdir}/pulse-%{pa_major}/modules/module-allow-passthrough.so
%{_libdir}/pulse-%{pa_major}/modules/module-alsa-sink.so
%{_libdir}/pulse-%{pa_major}/modules/module-alsa-source.so
@@ -390,7 +390,7 @@ exit 0
%{_libdir}/pulse-%{pa_major}/modules/module-dbus-protocol.so
%{_libdir}/pulse-%{pa_major}/modules/module-filter-apply.so
%{_libdir}/pulse-%{pa_major}/modules/module-filter-heuristics.so
-%{_libdir}/pulse-%{pa_major}/modules/module-flatpak.so
+#{_libdir}/pulse-%{pa_major}/modules/module-flatpak.so
%{_libdir}/pulse-%{pa_major}/modules/module-device-manager.so
%{_libdir}/pulse-%{pa_major}/modules/module-loopback.so
%{_libdir}/pulse-%{pa_major}/modules/module-esound-compat-spawnfd.so
commit db7177be890de2677a4abf18678ca8ffd3cd4252
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jul 25 03:49:19 2017 -0500
pulseaudio-10.99.1 (#1474559)
diff --git a/0001-tagstruct-add-copy-method.patch b/0001-tagstruct-add-copy-method.patch
deleted file mode 100644
index 3b3da0b..0000000
--- a/0001-tagstruct-add-copy-method.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 12a76717da7950497ea94bad0ec449c43325ef0a Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Tue, 7 Apr 2015 16:42:31 +0200
-Subject: [PATCH 01/18] tagstruct: add copy method
-
-Add a method to copy a tagstruct. This will also reset the read pointer
-back to the beginning.
----
- src/pulsecore/tagstruct.c | 13 +++++++++++++
- src/pulsecore/tagstruct.h | 2 ++
- 2 files changed, 15 insertions(+)
-
-diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c
-index 8a29957..c29e49b 100644
---- a/src/pulsecore/tagstruct.c
-+++ b/src/pulsecore/tagstruct.c
-@@ -97,6 +97,19 @@ void pa_tagstruct_free(pa_tagstruct*t) {
- pa_xfree(t);
- }
-
-+pa_tagstruct *pa_tagstruct_copy(pa_tagstruct*t) {
-+ pa_tagstruct*tc;
-+
-+ if (!(tc = pa_flist_pop(PA_STATIC_FLIST_GET(tagstructs))))
-+ tc = pa_xnew(pa_tagstruct, 1);
-+ tc->data = pa_xmemdup(t->data, t->length);
-+ tc->allocated = t->length;
-+ tc->rindex = 0;
-+ tc->type = PA_TAGSTRUCT_DYNAMIC;
-+
-+ return tc;
-+}
-+
- static inline void extend(pa_tagstruct*t, size_t l) {
- pa_assert(t);
- pa_assert(t->type != PA_TAGSTRUCT_FIXED);
-diff --git a/src/pulsecore/tagstruct.h b/src/pulsecore/tagstruct.h
-index 348c65d..e648d75 100644
---- a/src/pulsecore/tagstruct.h
-+++ b/src/pulsecore/tagstruct.h
-@@ -64,6 +64,8 @@ pa_tagstruct *pa_tagstruct_new(void);
- pa_tagstruct *pa_tagstruct_new_fixed(const uint8_t* data, size_t length);
- void pa_tagstruct_free(pa_tagstruct*t);
-
-+pa_tagstruct *pa_tagstruct_copy(pa_tagstruct*t);
-+
- int pa_tagstruct_eof(pa_tagstruct*t);
- const uint8_t* pa_tagstruct_data(pa_tagstruct*t, size_t *l);
-
---
-2.9.3
-
diff --git a/0002-tagstruct-don-t-forget-to-copy-the-length.patch b/0002-tagstruct-don-t-forget-to-copy-the-length.patch
deleted file mode 100644
index 95d76d3..0000000
--- a/0002-tagstruct-don-t-forget-to-copy-the-length.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8f43f8ceae382fafcdf59533a5f3776b41c174cd Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Thu, 14 Jul 2016 17:35:54 +0200
-Subject: [PATCH 02/18] tagstruct: don't forget to copy the length
-
----
- src/pulsecore/tagstruct.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c
-index c29e49b..66ff8df 100644
---- a/src/pulsecore/tagstruct.c
-+++ b/src/pulsecore/tagstruct.c
-@@ -104,6 +104,7 @@ pa_tagstruct *pa_tagstruct_copy(pa_tagstruct*t) {
- tc = pa_xnew(pa_tagstruct, 1);
- tc->data = pa_xmemdup(t->data, t->length);
- tc->allocated = t->length;
-+ tc->length = t->length;
- tc->rindex = 0;
- tc->type = PA_TAGSTRUCT_DYNAMIC;
-
---
-2.9.3
-
diff --git a/0003-subscribe-fix-typo.patch b/0003-subscribe-fix-typo.patch
deleted file mode 100644
index 0f4d441..0000000
--- a/0003-subscribe-fix-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4701b6b12e0c950bf96f2cc1db97688894e5fe15 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Tue, 7 Apr 2015 16:44:45 +0200
-Subject: [PATCH 03/18] subscribe: fix typo
-
----
- src/pulsecore/core-subscribe.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
-index 61c779b..5a88b7e 100644
---- a/src/pulsecore/core-subscribe.c
-+++ b/src/pulsecore/core-subscribe.c
-@@ -206,7 +206,7 @@ void pa_subscription_post(pa_core *c, pa_subscription_event_type_t t, uint32_t i
- pa_subscription_event *e;
- pa_assert(c);
-
-- /* No need for queuing subscriptions of no one is listening */
-+ /* No need for queuing subscriptions if no one is listening */
- if (!c->subscriptions)
- return;
-
---
-2.9.3
-
diff --git a/0004-creds-add-pid-to-pa_creds-and-use-store-it-in-pa_cli.patch b/0004-creds-add-pid-to-pa_creds-and-use-store-it-in-pa_cli.patch
deleted file mode 100644
index f740444..0000000
--- a/0004-creds-add-pid-to-pa_creds-and-use-store-it-in-pa_cli.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From ea28c5586af179bdc968a420a3d5e7ba42d00029 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Fri, 15 Jul 2016 12:34:31 +0200
-Subject: [PATCH 04/18] creds: add pid to pa_creds and use store it in
- pa_client
-
-Add the pid to the credentials ancillary data and store it in the
-pa_client object when valid.
-Add a new hook to be notified when a pa_client it authenticated
----
- src/modules/module-tunnel.c | 1 +
- src/pulse/context.c | 1 +
- src/pulsecore/client.h | 4 ++++
- src/pulsecore/core.h | 1 +
- src/pulsecore/creds.h | 1 +
- src/pulsecore/iochannel.c | 4 +++-
- src/pulsecore/protocol-native.c | 25 +++++++++++++++----------
- 7 files changed, 26 insertions(+), 11 deletions(-)
-
-diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
-index e08816b..d7114ee 100644
---- a/src/modules/module-tunnel.c
-+++ b/src/modules/module-tunnel.c
-@@ -1857,6 +1857,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
-
- ucred.uid = getuid();
- ucred.gid = getgid();
-+ ucred.pid = getpid();
-
- pa_pstream_send_tagstruct_with_creds(u->pstream, t, &ucred);
- }
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index c39cbe7..445973e 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -642,6 +642,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
-
- ucred.uid = getuid();
- ucred.gid = getgid();
-+ ucred.pid = getpid();
-
- pa_pstream_send_tagstruct_with_creds(c->pstream, t, &ucred);
- }
-diff --git a/src/pulsecore/client.h b/src/pulsecore/client.h
-index eb8173d..e34fb1e 100644
---- a/src/pulsecore/client.h
-+++ b/src/pulsecore/client.h
-@@ -26,6 +26,7 @@
- #include <pulse/proplist.h>
- #include <pulsecore/core.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/creds.h>
-
- /* Every connection to the server should have a pa_client
- * attached. That way the user may generate a listing of all connected
-@@ -39,6 +40,9 @@ struct pa_client {
- pa_module *module;
- char *driver;
-
-+ pa_creds creds;
-+ bool creds_valid;
-+
- pa_idxset *sink_inputs;
- pa_idxset *source_outputs;
-
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 802111b..8418289 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -114,6 +114,7 @@ typedef enum pa_core_hook {
- PA_CORE_HOOK_SOURCE_OUTPUT_SEND_EVENT,
- PA_CORE_HOOK_CLIENT_NEW,
- PA_CORE_HOOK_CLIENT_PUT,
-+ PA_CORE_HOOK_CLIENT_AUTH,
- PA_CORE_HOOK_CLIENT_UNLINK,
- PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED,
- PA_CORE_HOOK_CLIENT_SEND_EVENT,
-diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
-index 9fdbb4f..f489b0d 100644
---- a/src/pulsecore/creds.h
-+++ b/src/pulsecore/creds.h
-@@ -41,6 +41,7 @@ typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data;
- struct pa_creds {
- gid_t gid;
- uid_t uid;
-+ uid_t pid;
- };
-
- /* Struct for handling ancillary data, i e, extra data that can be sent together with a message
-diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
-index 8ace297..32fe0f2 100644
---- a/src/pulsecore/iochannel.c
-+++ b/src/pulsecore/iochannel.c
-@@ -323,13 +323,14 @@ ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l
-
- u = (struct ucred*) CMSG_DATA(&cmsg.hdr);
-
-- u->pid = getpid();
- if (ucred) {
- u->uid = ucred->uid;
- u->gid = ucred->gid;
-+ u->pid = ucred->pid;
- } else {
- u->uid = getuid();
- u->gid = getgid();
-+ u->pid = getpid();
- }
-
- pa_zero(mh);
-@@ -439,6 +440,7 @@ ssize_t pa_iochannel_read_with_ancil_data(pa_iochannel*io, void*data, size_t l,
-
- ancil_data->creds.gid = u.gid;
- ancil_data->creds.uid = u.uid;
-+ ancil_data->creds.pid = u.pid;
- ancil_data->creds_valid = true;
- }
- else if (cmh->cmsg_type == SCM_RIGHTS) {
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index 13f4f62..8f07b2d 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -2541,6 +2541,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- pa_tagstruct *reply;
- pa_mem_type_t shm_type;
- bool shm_on_remote = false, do_shm;
-+ const pa_creds *creds = NULL;
-
- pa_native_connection_assert_ref(c);
- pa_assert(t);
-@@ -2578,13 +2579,19 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
-
- pa_proplist_setf(c->client->proplist, "native-protocol.version", "%u", c->version);
-
-+#ifdef HAVE_CREDS
-+ creds = pa_pdispatch_creds(pd);
-+#endif
-+
-+ if (creds) {
-+ c->client->creds = *creds;
-+ c->client->creds_valid = true;
-+ }
-+
- if (!c->authorized) {
- bool success = false;
-
--#ifdef HAVE_CREDS
-- const pa_creds *creds;
--
-- if ((creds = pa_pdispatch_creds(pd))) {
-+ if (creds) {
- if (creds->uid == getuid())
- success = true;
- else if (c->options->auth_group) {
-@@ -2609,7 +2616,6 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- (unsigned long) creds->gid,
- (int) success);
- }
--#endif
-
- if (!success && c->options->auth_cookie) {
- const uint8_t *ac;
-@@ -2643,17 +2649,13 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- if (c->version < 10 || (c->version >= 13 && !shm_on_remote))
- do_shm = false;
-
--#ifdef HAVE_CREDS
- if (do_shm) {
- /* Only enable SHM if both sides are owned by the same
- * user. This is a security measure because otherwise data
- * private to the user might leak. */
--
-- const pa_creds *creds;
-- if (!(creds = pa_pdispatch_creds(pd)) || getuid() != creds->uid)
-+ if (!creds || getuid() != creds->uid)
- do_shm = false;
- }
--#endif
-
- pa_log_debug("Negotiated SHM: %s", pa_yes_no(do_shm));
- pa_pstream_enable_shm(c->pstream, do_shm);
-@@ -2691,6 +2693,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
-
- ucred.uid = getuid();
- ucred.gid = getgid();
-+ ucred.pid = getpid();
-
- pa_pstream_send_tagstruct_with_creds(c->pstream, reply, &ucred);
- }
-@@ -2711,6 +2714,8 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- }
-
- setup_srbchannel(c, shm_type);
-+
-+ pa_hook_fire(&c->protocol->core->hooks[PA_CORE_HOOK_CLIENT_AUTH], c->client);
- }
-
- static void command_register_memfd_shmid(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
---
-2.9.3
-
diff --git a/0005-access-Add-access-control-hooks.patch b/0005-access-Add-access-control-hooks.patch
deleted file mode 100644
index 436f653..0000000
--- a/0005-access-Add-access-control-hooks.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From e158102a2e40e702af97e451c6445b6d851f88f3 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Tue, 7 Apr 2015 16:50:26 +0200
-Subject: [PATCH 05/18] access: Add access control hooks
-
-Add hooks to core to check if certain operations are allowed.
----
- src/Makefile.am | 1 +
- src/pulsecore/access.h | 105 +++++++++++++++++++++++++++++++++++++++++++++++++
- src/pulsecore/core.c | 5 +++
- src/pulsecore/core.h | 3 ++
- 4 files changed, 114 insertions(+)
- create mode 100644 src/pulsecore/access.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 498a386..13682c5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -948,6 +948,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
- pulsecore/filter/lfe-filter.c pulsecore/filter/lfe-filter.h \
- pulsecore/filter/biquad.c pulsecore/filter/biquad.h \
- pulsecore/filter/crossover.c pulsecore/filter/crossover.h \
-+ pulsecore/access.h \
- pulsecore/asyncmsgq.c pulsecore/asyncmsgq.h \
- pulsecore/asyncq.c pulsecore/asyncq.h \
- pulsecore/auth-cookie.c pulsecore/auth-cookie.h \
-diff --git a/src/pulsecore/access.h b/src/pulsecore/access.h
-new file mode 100644
-index 0000000..534f66c
---- /dev/null
-+++ b/src/pulsecore/access.h
-@@ -0,0 +1,105 @@
-+#ifndef fooaccesshfoo
-+#define fooaccesshfoo
-+
-+/***
-+ This file is part of PulseAudio.
-+
-+ Copyright 2004-2006 Lennart Poettering
-+ 2015 Wim Taymans <wtaymans(a)redhat.com>
-+
-+ PulseAudio is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as
-+ published by the Free Software Foundation; either version 2.1 of the
-+ License, or (at your option) any later version.
-+
-+ PulseAudio is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#include <sys/types.h>
-+
-+#include <pulsecore/client.h>
-+
-+typedef enum pa_access_hook {
-+ PA_ACCESS_HOOK_NONE = 0,
-+ /* context */
-+ PA_ACCESS_HOOK_VIEW_SERVER,
-+ PA_ACCESS_HOOK_EXIT_DAEMON,
-+ PA_ACCESS_HOOK_SET_DEFAULT_SINK,
-+ PA_ACCESS_HOOK_SET_DEFAULT_SOURCE,
-+ PA_ACCESS_HOOK_STAT,
-+
-+ /* introspection */
-+ PA_ACCESS_HOOK_VIEW_SINK,
-+ PA_ACCESS_HOOK_SET_SINK_VOLUME,
-+ PA_ACCESS_HOOK_SUSPEND_SINK,
-+ PA_ACCESS_HOOK_SET_SINK_PORT,
-+ PA_ACCESS_HOOK_SET_SINK_PORT_LATENCY_OFFSET,
-+ PA_ACCESS_HOOK_ENTER_PASSTHROUGH_SINK,
-+ PA_ACCESS_HOOK_LEAVE_PASSTHROUGH_SINK,
-+
-+ PA_ACCESS_HOOK_VIEW_SOURCE,
-+ PA_ACCESS_HOOK_SET_SOURCE_VOLUME,
-+ PA_ACCESS_HOOK_SUSPEND_SOURCE,
-+ PA_ACCESS_HOOK_SET_SOURCE_PORT,
-+ PA_ACCESS_HOOK_SET_SOURCE_PORT_LATENCY_OFFSET,
-+ PA_ACCESS_HOOK_ENTER_PASSTHROUGH_SOURCE,
-+ PA_ACCESS_HOOK_LEAVE_PASSTHROUGH_SOURCE,
-+
-+ PA_ACCESS_HOOK_VIEW_MODULE,
-+ PA_ACCESS_HOOK_LOAD_MODULE,
-+ PA_ACCESS_HOOK_UNLOAD_MODULE,
-+
-+ PA_ACCESS_HOOK_VIEW_CLIENT,
-+ PA_ACCESS_HOOK_KILL_CLIENT,
-+
-+ PA_ACCESS_HOOK_VIEW_CARD,
-+ PA_ACCESS_HOOK_SET_CARD_PROFILE,
-+ PA_ACCESS_HOOK_SUSPEND_CARD,
-+
-+ PA_ACCESS_HOOK_VIEW_SINK_INPUT,
-+ PA_ACCESS_HOOK_CREATE_SINK_INPUT,
-+ PA_ACCESS_HOOK_MOVE_SINK_INPUT,
-+ PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME,
-+ PA_ACCESS_HOOK_KILL_SINK_INPUT,
-+
-+ PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT,
-+ PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT,
-+ PA_ACCESS_HOOK_MOVE_SOURCE_OUTPUT,
-+ PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME,
-+ PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT,
-+
-+ /* sample cache */
-+ PA_ACCESS_HOOK_VIEW_SAMPLE,
-+ PA_ACCESS_HOOK_ADD_SAMPLE,
-+ PA_ACCESS_HOOK_REMOVE_SAMPLE,
-+ PA_ACCESS_HOOK_PLAY_SAMPLE,
-+ PA_ACCESS_HOOK_PLAY_FILE,
-+
-+ /* async */
-+ PA_ACCESS_HOOK_CONNECT_UPLOAD,
-+ PA_ACCESS_HOOK_CONNECT_PLAYBACK,
-+ PA_ACCESS_HOOK_CONNECT_RECORD,
-+
-+ PA_ACCESS_HOOK_FILTER_SUBSCRIBE_EVENT,
-+
-+ PA_ACCESS_HOOK_MAX
-+} pa_access_hook_t;
-+
-+typedef struct pa_access_data pa_access_data;
-+
-+struct pa_access_data {
-+ pa_access_hook_t hook;
-+ uint32_t client_index;
-+ uint32_t object_index;
-+ pa_subscription_event_type_t event;
-+ const char *name;
-+ void (*complete_cb) (pa_access_data *data, bool res);
-+};
-+
-+#endif
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index 2a96dfa..e5d6879 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -150,6 +150,9 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, bool enable_memfd, size_t
- for (j = 0; j < PA_CORE_HOOK_MAX; j++)
- pa_hook_init(&c->hooks[j], c);
-
-+ for (j = 0; j < PA_ACCESS_HOOK_MAX; j++)
-+ pa_hook_init(&c->access[j], c);
-+
- pa_random(&c->cookie, sizeof(c->cookie));
-
- #ifdef SIGPIPE
-@@ -219,6 +222,8 @@ static void core_free(pa_object *o) {
-
- for (j = 0; j < PA_CORE_HOOK_MAX; j++)
- pa_hook_done(&c->hooks[j]);
-+ for (j = 0; j < PA_ACCESS_HOOK_MAX; j++)
-+ pa_hook_done(&c->access[j]);
-
- pa_xfree(c);
- }
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 8418289..152a53f 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -49,6 +49,7 @@ typedef enum pa_suspend_cause {
- #include <pulsecore/source.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/msgobject.h>
-+#include <pulsecore/access.h>
-
- typedef enum pa_server_type {
- PA_SERVER_TYPE_UNSET,
-@@ -212,6 +213,8 @@ struct pa_core {
-
- /* hooks */
- pa_hook hooks[PA_CORE_HOOK_MAX];
-+ /* access hooks */
-+ pa_hook access[PA_ACCESS_HOOK_MAX];
- };
-
- PA_DECLARE_PUBLIC_CLASS(pa_core);
---
-2.9.3
-
diff --git a/0006-module-access-add-example-access-module.patch b/0006-module-access-add-example-access-module.patch
deleted file mode 100644
index 6e83cfb..0000000
--- a/0006-module-access-add-example-access-module.patch
+++ /dev/null
@@ -1,539 +0,0 @@
-From 1eec5a0d01a657536cf8afb14d295d0f050ddd1d Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Tue, 7 Apr 2015 17:01:58 +0200
-Subject: [PATCH 06/18] module-access: add example access module
-
-Add an example access module that only allows access to the objects
-created by the owner client.
-
-The code is structured in such a way that multiple profiles can be
-made and that a profile can be activated based on the properties of
-a client.
-
-Events need special handling, we don't want to send events to clients
-about objects they are not allowed to see. We need to be careful because
-we can't inspect the owner of an object anymore in a _REMOVE event for
-that object. We fix this by keeping a list of all the objects for which
-we were allowed to notify a CHANGE or NEW event. We then only send
-REMOVE events to objects from this list.
----
- src/Makefile.am | 7 +
- src/modules/module-access.c | 474 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 481 insertions(+)
- create mode 100644 src/modules/module-access.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 13682c5..7c66064 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1178,6 +1178,7 @@ modlibexec_LTLIBRARIES += \
- endif
-
- modlibexec_LTLIBRARIES += \
-+ module-access.la \
- module-cli.la \
- module-cli-protocol-tcp.la \
- module-simple-protocol-tcp.la \
-@@ -1470,6 +1471,7 @@ endif
-
- # These are generated by an M4 script
- SYMDEF_FILES = \
-+ module-access-symdef.h \
- module-cli-symdef.h \
- module-cli-protocol-tcp-symdef.h \
- module-cli-protocol-unix-symdef.h \
-@@ -1592,6 +1594,11 @@ module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE
- module_simple_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
- module_simple_protocol_unix_la_LIBADD = $(MODULE_LIBADD) libprotocol-simple.la
-
-+# Access control
-+module_access_la_SOURCES = modules/module-access.c
-+module_access_la_LDFLAGS = $(MODULE_LDFLAGS)
-+module_access_la_LIBADD = $(MODULE_LIBADD)
-+
- # CLI protocol
-
- module_cli_la_SOURCES = modules/module-cli.c
-diff --git a/src/modules/module-access.c b/src/modules/module-access.c
-new file mode 100644
-index 0000000..12deccb
---- /dev/null
-+++ b/src/modules/module-access.c
-@@ -0,0 +1,474 @@
-+/***
-+ This file is part of PulseAudio.
-+
-+ Copyright 2004-2006 Lennart Poettering
-+ 2015 Wim Taymans <wtaymans(a)redhat.com>
-+
-+ PulseAudio is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as published
-+ by the Free Software Foundation; either version 2.1 of the License,
-+ or (at your option) any later version.
-+
-+ PulseAudio is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <pulse/xmalloc.h>
-+
-+#include <pulsecore/core-error.h>
-+#include <pulsecore/module.h>
-+#include <pulsecore/core-util.h>
-+#include <pulsecore/modargs.h>
-+#include <pulsecore/log.h>
-+#include <pulsecore/sink-input.h>
-+#include <pulsecore/core-util.h>
-+
-+#include "module-access-symdef.h"
-+
-+PA_MODULE_AUTHOR("Wim Taymans");
-+PA_MODULE_DESCRIPTION("Controls access to server resources");
-+PA_MODULE_VERSION(PACKAGE_VERSION);
-+PA_MODULE_LOAD_ONCE(true);
-+PA_MODULE_USAGE("");
-+
-+static const char* const valid_modargs[] = {
-+ NULL,
-+};
-+
-+typedef struct access_policy access_policy;
-+typedef struct event_item event_item;
-+typedef struct client_data client_data;
-+typedef struct userdata userdata;
-+
-+typedef pa_hook_result_t (*access_rule_t)(pa_core *c, pa_access_data *d, struct userdata *u);
-+
-+struct access_policy {
-+ uint32_t index;
-+ struct userdata *userdata;
-+
-+ access_rule_t rule[PA_ACCESS_HOOK_MAX];
-+};
-+
-+struct event_item {
-+ PA_LLIST_FIELDS(event_item);
-+
-+ int facility;
-+ uint32_t object_index;
-+};
-+struct client_data {
-+ uint32_t index;
-+ uint32_t policy;
-+
-+ PA_LLIST_HEAD(event_item, events);
-+};
-+
-+struct userdata {
-+ pa_core *core;
-+
-+ pa_hook_slot *hook[PA_ACCESS_HOOK_MAX];
-+
-+ pa_idxset *policies;
-+ uint32_t default_policy;
-+
-+ pa_hashmap *clients;
-+ pa_hook_slot *client_put_slot;
-+ pa_hook_slot *client_proplist_changed_slot;
-+ pa_hook_slot *client_unlink_slot;
-+};
-+
-+static void add_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i;
-+
-+ i = pa_xnew0(event_item, 1);
-+ PA_LLIST_INIT(event_item, i);
-+ i->facility = facility;
-+ i->object_index = oidx;
-+
-+ PA_LLIST_PREPEND(event_item, cd->events, i);
-+}
-+
-+static event_item *find_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i;
-+
-+ PA_LLIST_FOREACH(i, cd->events) {
-+ if (i->facility == facility && i->object_index == oidx)
-+ return i;
-+ }
-+ return NULL;
-+}
-+
-+static bool remove_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i = find_event(cd, facility, oidx);
-+ if (i) {
-+ PA_LLIST_REMOVE(event_item, cd->events, i);
-+ pa_xfree(i);
-+ return true;
-+ }
-+ return false;
-+}
-+
-+static client_data * client_data_new(struct userdata *u, uint32_t index, uint32_t policy) {
-+ client_data *cd;
-+
-+ cd = pa_xnew0(client_data, 1);
-+ cd->index = index;
-+ cd->policy = policy;
-+ pa_hashmap_put(u->clients, PA_UINT32_TO_PTR(index), cd);
-+ pa_log("new client %d with policy %d", index, policy);
-+
-+ return cd;
-+}
-+
-+static void client_data_free(client_data *cd) {
-+ event_item *e;
-+
-+ while ((e = cd->events)) {
-+ PA_LLIST_REMOVE(event_item, cd->events, e);
-+ pa_xfree(e);
-+ }
-+ pa_log("removed client %d", cd->index);
-+ pa_xfree(cd);
-+}
-+
-+static client_data * client_data_get(struct userdata *u, uint32_t index) {
-+ return pa_hashmap_get(u->clients, PA_UINT32_TO_PTR(index));
-+}
-+
-+static void client_data_remove(struct userdata *u, uint32_t index) {
-+ pa_hashmap_remove_and_free(u->clients, PA_UINT32_TO_PTR(index));
-+}
-+
-+/* rule checks if the operation on the object is performed by the owner of the object */
-+static pa_hook_result_t rule_check_owner (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_hook_result_t result = PA_HOOK_STOP;
-+ uint32_t idx = PA_INVALID_INDEX;
-+
-+ switch (d->hook) {
-+ case PA_ACCESS_HOOK_VIEW_CLIENT:
-+ case PA_ACCESS_HOOK_KILL_CLIENT: {
-+ idx = d->object_index;
-+ break;
-+ }
-+
-+ case PA_ACCESS_HOOK_VIEW_SINK_INPUT:
-+ case PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME:
-+ case PA_ACCESS_HOOK_KILL_SINK_INPUT: {
-+ const pa_sink_input *si = pa_idxset_get_by_index(c->sink_inputs, d->object_index);
-+ idx = (si && si->client) ? si->client->index : PA_INVALID_INDEX;
-+ break;
-+ }
-+
-+ case PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT:
-+ case PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME:
-+ case PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT: {
-+ const pa_source_output *so = pa_idxset_get_by_index(c->source_outputs, d->object_index);
-+ idx = (so && so->client) ? so->client->index : PA_INVALID_INDEX;
-+ break;
-+ }
-+ default:
-+ break;
-+ }
-+ if (idx == d->client_index) {
-+ pa_log("allow operation %d/%d of same client %d", d->hook, d->object_index, idx);
-+ result = PA_HOOK_OK;
-+ }
-+ else
-+ pa_log("blocked operation %d/%d of client %d to client %d", d->hook, d->object_index, idx, d->client_index);
-+
-+ return result;
-+}
-+
-+/* rule allows the operation */
-+static pa_hook_result_t rule_allow (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_log("allow operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+}
-+
-+/* rule blocks the operation */
-+static pa_hook_result_t rule_block (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_log("blocked operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ return PA_HOOK_STOP;
-+}
-+
-+static access_policy *access_policy_new(struct userdata *u, bool allow_all) {
-+ access_policy *ap;
-+ int i;
-+
-+ ap = pa_xnew0(access_policy, 1);
-+ ap->userdata = u;
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++)
-+ ap->rule[i] = allow_all ? rule_allow : rule_block;
-+
-+ pa_idxset_put(u->policies, ap, &ap->index);
-+
-+ return ap;
-+}
-+
-+static void access_policy_free(access_policy *ap) {
-+ pa_idxset_remove_by_index(ap->userdata->policies, ap->index);
-+ pa_xfree(ap);
-+}
-+
-+static pa_hook_result_t check_access (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ access_policy *ap;
-+ access_rule_t rule;
-+ client_data *cd = client_data_get(u, d->client_index);
-+
-+ /* unknown client */
-+ if (cd == NULL)
-+ return PA_HOOK_STOP;
-+
-+ ap = pa_idxset_get_by_index(u->policies, cd->policy);
-+
-+ rule = ap->rule[d->hook];
-+ if (rule)
-+ return rule(c, d, u);
-+
-+ return PA_HOOK_STOP;
-+}
-+
-+static const pa_access_hook_t event_hook[PA_SUBSCRIPTION_EVENT_FACILITY_MASK+1] = {
-+ [PA_SUBSCRIPTION_EVENT_SINK] = PA_ACCESS_HOOK_VIEW_SINK,
-+ [PA_SUBSCRIPTION_EVENT_SOURCE] = PA_ACCESS_HOOK_VIEW_SOURCE,
-+ [PA_SUBSCRIPTION_EVENT_SINK_INPUT] = PA_ACCESS_HOOK_VIEW_SINK_INPUT,
-+ [PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT] = PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT,
-+ [PA_SUBSCRIPTION_EVENT_MODULE] = PA_ACCESS_HOOK_VIEW_MODULE,
-+ [PA_SUBSCRIPTION_EVENT_CLIENT] = PA_ACCESS_HOOK_VIEW_CLIENT,
-+ [PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE] = PA_ACCESS_HOOK_VIEW_SAMPLE,
-+ [PA_SUBSCRIPTION_EVENT_SERVER] = PA_ACCESS_HOOK_VIEW_SERVER,
-+ [PA_SUBSCRIPTION_EVENT_CARD] = PA_ACCESS_HOOK_VIEW_CARD
-+};
-+
-+
-+
-+static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ int facility;
-+ client_data *cd;
-+
-+ facility = d->event & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
-+
-+ cd = client_data_get (u, d->client_index);
-+ /* unknown client destination, block event */
-+ if (cd == NULL)
-+ goto block;
-+
-+ switch (d->event & PA_SUBSCRIPTION_EVENT_TYPE_MASK) {
-+ case PA_SUBSCRIPTION_EVENT_REMOVE:
-+ /* if the client saw this object before, let the event go through */
-+ if (remove_event(cd, facility, d->object_index)) {
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+ break;
-+
-+ case PA_SUBSCRIPTION_EVENT_CHANGE:
-+ /* if the client saw this object before, let it go through */
-+ if (find_event(cd, facility, d->object_index)) {
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+
-+ /* fallthrough to do hook check and register event */
-+ case PA_SUBSCRIPTION_EVENT_NEW: {
-+ pa_access_data data = *d;
-+
-+ /* new object, check if the client is allowed to inspect it */
-+ data.hook = event_hook[facility];
-+ if (data.hook && pa_hook_fire(&c->access[data.hook], &data) == PA_HOOK_OK) {
-+ /* client can inspect the object, remember for later */
-+ add_event(cd, facility, d->object_index);
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+ break;
-+ }
-+ default:
-+ break;
-+ }
-+
-+block:
-+ pa_log("blocked event %02x/%d for client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_STOP;
-+}
-+
-+static uint32_t find_policy_for_client (struct userdata *u, pa_client *cl) {
-+ char *s;
-+
-+ s = pa_proplist_to_string(cl->proplist);
-+ pa_log ("client proplist %s", s);
-+ pa_xfree(s);
-+
-+ return u->default_policy;
-+}
-+
-+static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ uint32_t policy;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ policy = find_policy_for_client(u, cl);
-+
-+ client_data_new(u, cl->index, policy);
-+
-+ return PA_HOOK_OK;
-+}
-+
-+static pa_hook_result_t client_proplist_changed_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ client_data *cd;
-+ uint32_t policy;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ cd = client_data_get (u, cl->index);
-+ if (cd == NULL)
-+ return PA_HOOK_OK;
-+
-+ policy = find_policy_for_client(u, cl);
-+ cd->policy = policy;
-+
-+ return PA_HOOK_OK;
-+}
-+
-+static pa_hook_result_t client_unlink_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ client_data_remove(u, cl->index);
-+
-+ return PA_HOOK_OK;
-+}
-+
-+
-+int pa__init(pa_module*m) {
-+ pa_modargs *ma = NULL;
-+ struct userdata *u;
-+ int i;
-+ access_policy *ap;
-+
-+ pa_assert(m);
-+
-+ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-+ pa_log("Failed to parse module arguments");
-+ goto fail;
-+ }
-+
-+ u = pa_xnew0(struct userdata, 1);
-+ u->core = m->core;
-+ m->userdata = u;
-+
-+ u->policies = pa_idxset_new (NULL, NULL);
-+ u->clients = pa_hashmap_new_full(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func, NULL,
-+ (pa_free_cb_t) client_data_free);
-+
-+ u->client_put_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PUT], PA_HOOK_EARLY, (pa_hook_cb_t) client_put_cb, u);
-+ u->client_proplist_changed_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) client_proplist_changed_cb, u);
-+ u->client_unlink_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) client_unlink_cb, u);
-+
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++) {
-+ pa_hook_cb_t cb;
-+
-+ if (i == PA_ACCESS_HOOK_FILTER_SUBSCRIBE_EVENT)
-+ cb = (pa_hook_cb_t) filter_event;
-+ else
-+ cb = (pa_hook_cb_t) check_access;
-+
-+ u->hook[i] = pa_hook_connect(&u->core->access[i], PA_HOOK_EARLY - 1, cb, u);
-+ }
-+
-+ ap = access_policy_new(u, false);
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SERVER] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_MODULE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CARD] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_STAT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SAMPLE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_PLAY_SAMPLE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_PLAYBACK] = rule_allow;
-+
-+ ap->rule[PA_ACCESS_HOOK_KILL_CLIENT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SINK_INPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SINK_INPUT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT] = rule_check_owner;
-+
-+ u->default_policy = ap->index;
-+
-+ pa_modargs_free(ma);
-+ return 0;
-+
-+fail:
-+ pa__done(m);
-+
-+ if (ma)
-+ pa_modargs_free(ma);
-+ return -1;
-+}
-+
-+void pa__done(pa_module*m) {
-+ struct userdata* u;
-+ int i;
-+
-+ pa_assert(m);
-+
-+ if (!(u = m->userdata))
-+ return;
-+
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++) {
-+ if (u->hook[i])
-+ pa_hook_slot_free(u->hook[i]);
-+ }
-+
-+ if (u->policies)
-+ pa_idxset_free(u->policies, (pa_free_cb_t) access_policy_free);
-+
-+ if (u->client_put_slot)
-+ pa_hook_slot_free(u->client_put_slot);
-+ if (u->client_proplist_changed_slot)
-+ pa_hook_slot_free(u->client_proplist_changed_slot);
-+ if (u->client_unlink_slot)
-+ pa_hook_slot_free(u->client_unlink_slot);
-+
-+ if (u->clients)
-+ pa_hashmap_free(u->clients);
-+
-+ pa_xfree(u);
-+}
---
-2.9.3
-
diff --git a/0007-module-access-add-async-handler-for-record.patch b/0007-module-access-add-async-handler-for-record.patch
deleted file mode 100644
index a729d74..0000000
--- a/0007-module-access-add-async-handler-for-record.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 8f43958cf8e0aa7ba45cddbae3952e831fc9a08f Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Thu, 14 Jul 2016 17:38:01 +0200
-Subject: [PATCH 07/18] module-access: add async handler for record
-
-Use an async handler to check for record access. This also shows how
-we need to remember the result for when the access check is issued
-again after the async reply.
----
- src/modules/module-access.c | 65 ++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 61 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/module-access.c b/src/modules/module-access.c
-index 12deccb..290d052 100644
---- a/src/modules/module-access.c
-+++ b/src/modules/module-access.c
-@@ -30,6 +30,8 @@
- #include <stdlib.h>
-
- #include <pulse/xmalloc.h>
-+#include <pulse/rtclock.h>
-+#include <pulse/timeval.h>
-
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
-@@ -71,11 +73,10 @@ struct event_item {
- int facility;
- uint32_t object_index;
- };
--struct client_data {
-- uint32_t index;
-- uint32_t policy;
-
-- PA_LLIST_HEAD(event_item, events);
-+struct async_cache {
-+ bool checked;
-+ bool granted;
- };
-
- struct userdata {
-@@ -92,6 +93,20 @@ struct userdata {
- pa_hook_slot *client_unlink_slot;
- };
-
-+struct client_data {
-+ struct userdata *u;
-+
-+ uint32_t index;
-+ uint32_t policy;
-+
-+ struct async_cache cached[PA_ACCESS_HOOK_MAX];
-+ pa_time_event *time_event;
-+ pa_access_data *access_data;
-+
-+ PA_LLIST_HEAD(event_item, events);
-+};
-+
-+
- static void add_event(struct client_data *cd, int facility, uint32_t oidx) {
- event_item *i;
-
-@@ -123,12 +138,29 @@ static bool remove_event(struct client_data *cd, int facility, uint32_t oidx) {
- return false;
- }
-
-+static void timeout_cb(pa_mainloop_api*a, pa_time_event* e, const struct timeval *t, void *data) {
-+ client_data *cd = data;
-+ struct userdata *u = cd->u;
-+ pa_access_data *d = cd->access_data;
-+
-+ pa_log("async check finished of operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ u->core->mainloop->time_restart(cd->time_event, NULL);
-+
-+ cd->cached[d->hook].checked = true;
-+ /* this should be granted or denied */
-+ cd->cached[d->hook].granted = true;
-+
-+ d->complete_cb (d, cd->cached[d->hook].granted);
-+}
-+
- static client_data * client_data_new(struct userdata *u, uint32_t index, uint32_t policy) {
- client_data *cd;
-
- cd = pa_xnew0(client_data, 1);
-+ cd->u = u;
- cd->index = index;
- cd->policy = policy;
-+ cd->time_event = pa_core_rttime_new(u->core, PA_USEC_INVALID, timeout_cb, cd);
- pa_hashmap_put(u->clients, PA_UINT32_TO_PTR(index), cd);
- pa_log("new client %d with policy %d", index, policy);
-
-@@ -143,6 +175,7 @@ static void client_data_free(client_data *cd) {
- pa_xfree(e);
- }
- pa_log("removed client %d", cd->index);
-+ cd->u->core->mainloop->time_free(cd->time_event);
- pa_xfree(cd);
- }
-
-@@ -206,6 +239,27 @@ static pa_hook_result_t rule_block (pa_core *c, pa_access_data *d, struct userda
- return PA_HOOK_STOP;
- }
-
-+
-+/* rule asynchronously checks the operation */
-+static pa_hook_result_t rule_check_async (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_usec_t now;
-+ client_data *cd = client_data_get(u, d->client_index);
-+
-+ pa_log("async check of operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+
-+ if (cd->cached[d->hook].checked)
-+ return cd->cached[d->hook].granted ? PA_HOOK_OK : PA_HOOK_STOP;
-+
-+ /* save access_data */
-+ cd->access_data = d;
-+
-+ now = pa_rtclock_now();
-+ pa_core_rttime_restart (u->core, cd->time_event, now + 2 * PA_USEC_PER_SEC);
-+
-+ return PA_HOOK_CANCEL;
-+}
-+
-+
- static access_policy *access_policy_new(struct userdata *u, bool allow_all) {
- access_policy *ap;
- int i;
-@@ -418,6 +472,9 @@ int pa__init(pa_module*m) {
- ap->rule[PA_ACCESS_HOOK_PLAY_SAMPLE] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_CONNECT_PLAYBACK] = rule_allow;
-
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_RECORD] = rule_check_async;
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CLIENT] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_KILL_CLIENT] = rule_check_owner;
-
- ap->rule[PA_ACCESS_HOOK_CREATE_SINK_INPUT] = rule_allow;
---
-2.9.3
-
diff --git a/0008-module-access-use-the-auth-hook-and-pid.patch b/0008-module-access-use-the-auth-hook-and-pid.patch
deleted file mode 100644
index 32e69ed..0000000
--- a/0008-module-access-use-the-auth-hook-and-pid.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 8fcf8065b8329ab9abe14ecddc1040e14adc6461 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Fri, 15 Jul 2016 12:36:45 +0200
-Subject: [PATCH 08/18] module-access: use the auth hook and pid
-
-Connect to the client_auth hook and also check the pid from the
-credentials to find the right policy for a client.
----
- src/modules/module-access.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/src/modules/module-access.c b/src/modules/module-access.c
-index 290d052..c00612a 100644
---- a/src/modules/module-access.c
-+++ b/src/modules/module-access.c
-@@ -89,6 +89,7 @@ struct userdata {
-
- pa_hashmap *clients;
- pa_hook_slot *client_put_slot;
-+ pa_hook_slot *client_auth_slot;
- pa_hook_slot *client_proplist_changed_slot;
- pa_hook_slot *client_unlink_slot;
- };
-@@ -368,6 +369,9 @@ static uint32_t find_policy_for_client (struct userdata *u, pa_client *cl) {
- pa_log ("client proplist %s", s);
- pa_xfree(s);
-
-+ if (cl->creds_valid) {
-+ pa_log ("client has trusted pid %d", cl->creds.pid);
-+ }
- return u->default_policy;
- }
-
-@@ -381,6 +385,8 @@ static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata
- cl = (pa_client *) o;
- pa_assert(cl);
-
-+ /* when we get here, the client just connected and is not yet authenticated
-+ * we should probably install a policy that denies all access */
- policy = find_policy_for_client(u, cl);
-
- client_data_new(u, cl->index, policy);
-@@ -388,6 +394,27 @@ static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata
- return PA_HOOK_OK;
- }
-
-+static pa_hook_result_t client_auth_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ client_data *cd;
-+ uint32_t policy;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ cd = client_data_get (u, cl->index);
-+ if (cd == NULL)
-+ return PA_HOOK_OK;
-+
-+ policy = find_policy_for_client(u, cl);
-+ cd->policy = policy;
-+
-+ return PA_HOOK_OK;
-+}
-+
- static pa_hook_result_t client_proplist_changed_cb(pa_core *c, pa_object *o, struct userdata *u) {
- pa_client *cl;
- client_data *cd;
-@@ -446,6 +473,7 @@ int pa__init(pa_module*m) {
- (pa_free_cb_t) client_data_free);
-
- u->client_put_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PUT], PA_HOOK_EARLY, (pa_hook_cb_t) client_put_cb, u);
-+ u->client_auth_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_AUTH], PA_HOOK_EARLY, (pa_hook_cb_t) client_auth_cb, u);
- u->client_proplist_changed_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) client_proplist_changed_cb, u);
- u->client_unlink_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) client_unlink_cb, u);
-
-@@ -519,6 +547,8 @@ void pa__done(pa_module*m) {
-
- if (u->client_put_slot)
- pa_hook_slot_free(u->client_put_slot);
-+ if (u->client_auth_slot)
-+ pa_hook_slot_free(u->client_auth_slot);
- if (u->client_proplist_changed_slot)
- pa_hook_slot_free(u->client_proplist_changed_slot);
- if (u->client_unlink_slot)
---
-2.9.3
-
diff --git a/0009-pulsecore-Move-pa_core-structure-into-its-own-header.patch b/0009-pulsecore-Move-pa_core-structure-into-its-own-header.patch
deleted file mode 100644
index ef13b29..0000000
--- a/0009-pulsecore-Move-pa_core-structure-into-its-own-header.patch
+++ /dev/null
@@ -1,1619 +0,0 @@
-From 6347cd3e72347d8698af0b48fc626fa43f4e218f Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <arun(a)arunraghavan.net>
-Date: Mon, 4 Jul 2016 13:57:16 +0530
-Subject: [PATCH 09/18] pulsecore: Move pa_core structure into its own header
-
-The idea is to allow some parts of the code to use pa_core as an opaque
-structure and access required members via API, over which we can then
-perform some form of access control
-
-Signed-off-by: Arun Raghavan <arun(a)arunraghavan.net>
----
- src/Makefile.am | 1 +
- src/daemon/main.c | 1 +
- src/daemon/server-lookup.c | 1 +
- src/modules/alsa/alsa-sink.c | 1 +
- src/modules/alsa/alsa-source.c | 1 +
- src/modules/alsa/alsa-ucm.c | 1 +
- src/modules/alsa/module-alsa-card.c | 1 +
- src/modules/bluetooth/backend-native.c | 1 +
- src/modules/bluetooth/bluez4-util.c | 1 +
- src/modules/bluetooth/bluez5-util.c | 1 +
- src/modules/bluetooth/module-bluetooth-policy.c | 1 +
- src/modules/bluetooth/module-bluez4-device.c | 1 +
- src/modules/bluetooth/module-bluez5-device.c | 1 +
- src/modules/bluetooth/module-bluez5-discover.c | 1 +
- src/modules/dbus/iface-card.c | 1 +
- src/modules/dbus/iface-client.c | 1 +
- src/modules/dbus/iface-core.c | 1 +
- src/modules/dbus/iface-device-port.c | 1 +
- src/modules/dbus/iface-device.c | 1 +
- src/modules/dbus/iface-memstats.c | 1 +
- src/modules/dbus/iface-module.c | 1 +
- src/modules/dbus/iface-sample.c | 1 +
- src/modules/dbus/iface-stream.c | 1 +
- src/modules/dbus/module-dbus-protocol.c | 1 +
- src/modules/echo-cancel/adrian.c | 1 +
- src/modules/echo-cancel/module-echo-cancel.c | 1 +
- src/modules/gconf/module-gconf.c | 1 +
- src/modules/jack/module-jack-sink.c | 1 +
- src/modules/jack/module-jack-source.c | 1 +
- src/modules/module-access.c | 1 +
- src/modules/module-allow-passthrough.c | 1 +
- src/modules/module-always-sink.c | 1 +
- src/modules/module-augment-properties.c | 1 +
- src/modules/module-card-restore.c | 1 +
- src/modules/module-cli.c | 1 +
- src/modules/module-combine-sink.c | 1 +
- src/modules/module-default-device-restore.c | 1 +
- src/modules/module-device-manager.c | 1 +
- src/modules/module-device-restore.c | 1 +
- src/modules/module-equalizer-sink.c | 1 +
- src/modules/module-esound-sink.c | 1 +
- src/modules/module-filter-apply.c | 1 +
- src/modules/module-filter-heuristics.c | 1 +
- src/modules/module-intended-roles.c | 1 +
- src/modules/module-ladspa-sink.c | 1 +
- src/modules/module-lirc.c | 1 +
- src/modules/module-loopback.c | 1 +
- src/modules/module-match.c | 1 +
- src/modules/module-mmkbd-evdev.c | 1 +
- src/modules/module-native-protocol-fd.c | 1 +
- src/modules/module-null-sink.c | 1 +
- src/modules/module-null-source.c | 1 +
- src/modules/module-pipe-sink.c | 1 +
- src/modules/module-pipe-source.c | 1 +
- src/modules/module-position-event-sounds.c | 1 +
- src/modules/module-protocol-stub.c | 1 +
- src/modules/module-rescue-streams.c | 1 +
- src/modules/module-role-cork.c | 1 +
- src/modules/module-role-ducking.c | 1 +
- src/modules/module-rygel-media-server.c | 1 +
- src/modules/module-sine-source.c | 1 +
- src/modules/module-sine.c | 1 +
- src/modules/module-stream-restore.c | 1 +
- src/modules/module-suspend-on-idle.c | 1 +
- src/modules/module-switch-on-connect.c | 1 +
- src/modules/module-switch-on-port-available.c | 1 +
- src/modules/module-systemd-login.c | 1 +
- src/modules/module-tunnel-sink-new.c | 1 +
- src/modules/module-tunnel-source-new.c | 1 +
- src/modules/module-tunnel.c | 1 +
- src/modules/module-udev-detect.c | 1 +
- src/modules/module-virtual-sink.c | 1 +
- src/modules/module-virtual-source.c | 1 +
- src/modules/module-virtual-surround-sink.c | 1 +
- src/modules/module-zeroconf-discover.c | 1 +
- src/modules/module-zeroconf-publish.c | 1 +
- src/modules/oss/module-oss.c | 1 +
- src/modules/raop/module-raop-discover.c | 1 +
- src/modules/raop/module-raop-sink.c | 1 +
- src/modules/raop/raop_client.c | 1 +
- src/modules/rtp/module-rtp-recv.c | 1 +
- src/modules/rtp/module-rtp-send.c | 1 +
- src/modules/stream-interaction.c | 1 +
- src/modules/x11/module-x11-cork-request.c | 1 +
- src/modules/x11/module-x11-xsmp.c | 1 +
- src/pulsecore/card.c | 1 +
- src/pulsecore/cli-command.c | 1 +
- src/pulsecore/cli-text.c | 1 +
- src/pulsecore/client.c | 1 +
- src/pulsecore/core-scache.c | 1 +
- src/pulsecore/core-struct.h | 103 ++++++++++++++++++++++++
- src/pulsecore/core-subscribe.c | 1 +
- src/pulsecore/core.c | 1 +
- src/pulsecore/core.h | 76 -----------------
- src/pulsecore/dbus-shared.c | 1 +
- src/pulsecore/device-port.c | 1 +
- src/pulsecore/module.c | 1 +
- src/pulsecore/namereg.c | 1 +
- src/pulsecore/play-memchunk.c | 1 +
- src/pulsecore/protocol-esound.c | 1 +
- src/pulsecore/protocol-http.c | 1 +
- src/pulsecore/protocol-native.c | 1 +
- src/pulsecore/protocol-simple.c | 1 +
- src/pulsecore/shared.c | 1 +
- src/pulsecore/sink-input.c | 1 +
- src/pulsecore/sink.c | 1 +
- src/pulsecore/sound-file-stream.c | 1 +
- src/pulsecore/source-output.c | 1 +
- src/pulsecore/source.c | 1 +
- src/pulsecore/x11wrap.c | 1 +
- 110 files changed, 211 insertions(+), 76 deletions(-)
- create mode 100644 src/pulsecore/core-struct.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7c66064..70bc848 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -960,6 +960,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
- pulsecore/core-scache.c pulsecore/core-scache.h \
- pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
- pulsecore/core.c pulsecore/core.h \
-+ pulsecore/core-struct.h \
- pulsecore/hook-list.c pulsecore/hook-list.h \
- pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
- pulsecore/modargs.c pulsecore/modargs.h \
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index dc5e5bc..cb69f17 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -73,6 +73,7 @@
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/module.h>
- #include <pulsecore/cli-command.h>
- #include <pulsecore/log.h>
-diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
-index ca390c7..b5c53e4 100644
---- a/src/daemon/server-lookup.c
-+++ b/src/daemon/server-lookup.c
-@@ -27,6 +27,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-shared.h>
- #include <pulsecore/macro.h>
-diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
-index 886c735..41ef1ae 100644
---- a/src/modules/alsa/alsa-sink.c
-+++ b/src/modules/alsa/alsa-sink.c
-@@ -38,6 +38,7 @@
- #include <pulse/internal.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/module.h>
- #include <pulsecore/memchunk.h>
-diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
-index b788df2..4a3f407 100644
---- a/src/modules/alsa/alsa-source.c
-+++ b/src/modules/alsa/alsa-source.c
-@@ -33,6 +33,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/module.h>
- #include <pulsecore/memchunk.h>
-diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
-index b42c040..227ed7d 100644
---- a/src/modules/alsa/alsa-ucm.c
-+++ b/src/modules/alsa/alsa-ucm.c
-@@ -40,6 +40,7 @@
-
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/atomic.h>
- #include <pulsecore/core-error.h>
-diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
-index 4f1236e..b6ac865 100644
---- a/src/modules/alsa/module-alsa-card.c
-+++ b/src/modules/alsa/module-alsa-card.c
-@@ -23,6 +23,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
-index cf88126..f78cebc 100644
---- a/src/modules/bluetooth/backend-native.c
-+++ b/src/modules/bluetooth/backend-native.c
-@@ -22,6 +22,7 @@
- #endif
-
- #include <pulsecore/shared.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-shared.h>
-diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c
-index 542ce35..c582b95 100644
---- a/src/modules/bluetooth/bluez4-util.c
-+++ b/src/modules/bluetooth/bluez4-util.c
-@@ -23,6 +23,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/shared.h>
- #include <pulsecore/dbus-shared.h>
-diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
-index 7d63f35..dac176b 100644
---- a/src/modules/bluetooth/bluez5-util.c
-+++ b/src/modules/bluetooth/bluez5-util.c
-@@ -26,6 +26,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-shared.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/bluetooth/module-bluetooth-policy.c b/src/modules/bluetooth/module-bluetooth-policy.c
-index df702cc..aa9fa4a 100644
---- a/src/modules/bluetooth/module-bluetooth-policy.c
-+++ b/src/modules/bluetooth/module-bluetooth-policy.c
-@@ -26,6 +26,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/source.h>
-diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
-index ac4ed63..3f2e70f 100644
---- a/src/modules/bluetooth/module-bluez4-device.c
-+++ b/src/modules/bluetooth/module-bluez4-device.c
-@@ -36,6 +36,7 @@
- #include <pulsecore/i18n.h>
- #include <pulsecore/module.h>
- #include <pulsecore/modargs.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/core-error.h>
-diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
-index 065fcaa..0dbe6f3 100644
---- a/src/modules/bluetooth/module-bluez5-device.c
-+++ b/src/modules/bluetooth/module-bluez5-device.c
-@@ -30,6 +30,7 @@
- #include <pulse/rtclock.h>
- #include <pulse/timeval.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/bluetooth/module-bluez5-discover.c b/src/modules/bluetooth/module-bluez5-discover.c
-index 080e5d0..a5a0b45 100644
---- a/src/modules/bluetooth/module-bluez5-discover.c
-+++ b/src/modules/bluetooth/module-bluez5-discover.c
-@@ -22,6 +22,7 @@
- #endif
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/macro.h>
- #include <pulsecore/module.h>
-diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
-index 1b705ba..ffcbc7a 100644
---- a/src/modules/dbus/iface-card.c
-+++ b/src/modules/dbus/iface-card.c
-@@ -23,6 +23,7 @@
-
- #include <dbus/dbus.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/protocol-dbus.h>
-diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
-index 455ea45..3f3003f 100644
---- a/src/modules/dbus/iface-client.c
-+++ b/src/modules/dbus/iface-client.c
-@@ -24,6 +24,7 @@
-
- #include <dbus/dbus.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/protocol-dbus.h>
-diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
-index 508913d..bfabd61 100644
---- a/src/modules/dbus/iface-core.c
-+++ b/src/modules/dbus/iface-core.c
-@@ -28,6 +28,7 @@
- #include <pulse/utf8.h>
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/macro.h>
-diff --git a/src/modules/dbus/iface-device-port.c b/src/modules/dbus/iface-device-port.c
-index 4892443..96a2abd 100644
---- a/src/modules/dbus/iface-device-port.c
-+++ b/src/modules/dbus/iface-device-port.c
-@@ -23,6 +23,7 @@
-
- #include <dbus/dbus.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
-
-diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
-index 2c370a8..abaa42b 100644
---- a/src/modules/dbus/iface-device.c
-+++ b/src/modules/dbus/iface-device.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/protocol-dbus.h>
-diff --git a/src/modules/dbus/iface-memstats.c b/src/modules/dbus/iface-memstats.c
-index cd1d7ea..6ed4b07 100644
---- a/src/modules/dbus/iface-memstats.c
-+++ b/src/modules/dbus/iface-memstats.c
-@@ -23,6 +23,7 @@
-
- #include <dbus/dbus.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
-diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c
-index 222cd73..a6fdf50 100644
---- a/src/modules/dbus/iface-module.c
-+++ b/src/modules/dbus/iface-module.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
-index 61f2ba0..accdf46 100644
---- a/src/modules/dbus/iface-sample.c
-+++ b/src/modules/dbus/iface-sample.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/namereg.h>
-diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
-index ade62ca..76bbeb0 100644
---- a/src/modules/dbus/iface-stream.c
-+++ b/src/modules/dbus/iface-stream.c
-@@ -22,6 +22,7 @@
- #include <config.h>
- #endif
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/protocol-dbus.h>
-diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
-index 8079d6b..abd340a 100644
---- a/src/modules/dbus/module-dbus-protocol.c
-+++ b/src/modules/dbus/module-dbus-protocol.c
-@@ -30,6 +30,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/client.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-util.h>
- #include <pulsecore/idxset.h>
-diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
-index 3c47fae..870a1fe 100644
---- a/src/modules/echo-cancel/adrian.c
-+++ b/src/modules/echo-cancel/adrian.c
-@@ -29,6 +29,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/modargs.h>
-
- #include "echo-cancel.h"
-diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
-index dfd05b6..f3f24ed 100644
---- a/src/modules/echo-cancel/module-echo-cancel.c
-+++ b/src/modules/echo-cancel/module-echo-cancel.c
-@@ -43,6 +43,7 @@
- #include <pulsecore/namereg.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
-index 1e1b855..5baa1ae 100644
---- a/src/modules/gconf/module-gconf.c
-+++ b/src/modules/gconf/module-gconf.c
-@@ -32,6 +32,7 @@
- #include <pulse/xmalloc.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulse/mainloop-api.h>
-diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
-index 4d31493..22dbbad 100644
---- a/src/modules/jack/module-jack-sink.c
-+++ b/src/modules/jack/module-jack-sink.c
-@@ -33,6 +33,7 @@
-
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c
-index e45f304..ce5a096 100644
---- a/src/modules/jack/module-jack-source.c
-+++ b/src/modules/jack/module-jack-source.c
-@@ -33,6 +33,7 @@
-
- #include <pulsecore/source.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-access.c b/src/modules/module-access.c
-index c00612a..39e2f0e 100644
---- a/src/modules/module-access.c
-+++ b/src/modules/module-access.c
-@@ -34,6 +34,7 @@
- #include <pulse/timeval.h>
-
- #include <pulsecore/core-error.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/module-allow-passthrough.c b/src/modules/module-allow-passthrough.c
-index 4b801e4..45e7a41 100644
---- a/src/modules/module-allow-passthrough.c
-+++ b/src/modules/module-allow-passthrough.c
-@@ -26,6 +26,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
-diff --git a/src/modules/module-always-sink.c b/src/modules/module-always-sink.c
-index 12f63f7..a7f3568 100644
---- a/src/modules/module-always-sink.c
-+++ b/src/modules/module-always-sink.c
-@@ -24,6 +24,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/sink.h>
-diff --git a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c
-index 541f0e7..4608d45 100644
---- a/src/modules/module-augment-properties.c
-+++ b/src/modules/module-augment-properties.c
-@@ -28,6 +28,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c
-index 3c0307b..ff6066f 100644
---- a/src/modules/module-card-restore.c
-+++ b/src/modules/module-card-restore.c
-@@ -33,6 +33,7 @@
- #include <pulse/timeval.h>
- #include <pulse/rtclock.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
-index a69ad4a..b23519d 100644
---- a/src/modules/module-cli.c
-+++ b/src/modules/module-cli.c
-@@ -33,6 +33,7 @@
- #include <pulsecore/log.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/macro.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
-
- #include "module-cli-symdef.h"
-diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
-index 250240a..4fadbb9 100644
---- a/src/modules/module-combine-sink.c
-+++ b/src/modules/module-combine-sink.c
-@@ -35,6 +35,7 @@
- #include <pulsecore/sink-input.h>
- #include <pulsecore/memblockq.h>
- #include <pulsecore/log.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c
-index d76e28e..4b169bb 100644
---- a/src/modules/module-default-device-restore.c
-+++ b/src/modules/module-default-device-restore.c
-@@ -28,6 +28,7 @@
- #include <pulse/timeval.h>
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/module.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
-index 2a0a67f..17406c3 100644
---- a/src/modules/module-device-manager.c
-+++ b/src/modules/module-device-manager.c
-@@ -34,6 +34,7 @@
- #include <pulse/timeval.h>
- #include <pulse/rtclock.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
-index 8d7b34b..f150dbd 100644
---- a/src/modules/module-device-restore.c
-+++ b/src/modules/module-device-restore.c
-@@ -37,6 +37,7 @@
- #include <pulse/format.h>
- #include <pulse/internal.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
-index 9c25f3f..8c50468 100644
---- a/src/modules/module-equalizer-sink.c
-+++ b/src/modules/module-equalizer-sink.c
-@@ -46,6 +46,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/timeval.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/aupdate.h>
-diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
-index 2ce0c85..f304c97 100644
---- a/src/modules/module-esound-sink.c
-+++ b/src/modules/module-esound-sink.c
-@@ -48,6 +48,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/socket.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/iochannel.h>
- #include <pulsecore/sink.h>
-diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
-index 364d68b..ceeb541 100644
---- a/src/modules/module-filter-apply.c
-+++ b/src/modules/module-filter-apply.c
-@@ -26,6 +26,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/macro.h>
-diff --git a/src/modules/module-filter-heuristics.c b/src/modules/module-filter-heuristics.c
-index 423e873..15baa1c 100644
---- a/src/modules/module-filter-heuristics.c
-+++ b/src/modules/module-filter-heuristics.c
-@@ -26,6 +26,7 @@
- #include <pulsecore/macro.h>
- #include <pulsecore/hook-list.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
-index 60ec7e9..e083c11 100644
---- a/src/modules/module-intended-roles.c
-+++ b/src/modules/module-intended-roles.c
-@@ -24,6 +24,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c
-index c11fa5e..3602830 100644
---- a/src/modules/module-ladspa-sink.c
-+++ b/src/modules/module-ladspa-sink.c
-@@ -32,6 +32,7 @@
- #include <pulsecore/namereg.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
-index d63fdbd..7c325da 100644
---- a/src/modules/module-lirc.c
-+++ b/src/modules/module-lirc.c
-@@ -30,6 +30,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/module.h>
- #include <pulsecore/log.h>
- #include <pulsecore/namereg.h>
-diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
-index 9410c98..75da911 100644
---- a/src/modules/module-loopback.c
-+++ b/src/modules/module-loopback.c
-@@ -31,6 +31,7 @@
- #include <pulsecore/modargs.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/log.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
-
- #include <pulse/rtclock.h>
-diff --git a/src/modules/module-match.c b/src/modules/module-match.c
-index 559687c..f371139 100644
---- a/src/modules/module-match.c
-+++ b/src/modules/module-match.c
-@@ -36,6 +36,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
-index 6c9cf34..818a502 100644
---- a/src/modules/module-mmkbd-evdev.c
-+++ b/src/modules/module-mmkbd-evdev.c
-@@ -32,6 +32,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
-index 5fd7f6a..c951bc6 100644
---- a/src/modules/module-native-protocol-fd.c
-+++ b/src/modules/module-native-protocol-fd.c
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <unistd.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/module.h>
- #include <pulsecore/macro.h>
- #include <pulsecore/iochannel.h>
-diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
-index b8157e8..be3c98f 100644
---- a/src/modules/module-null-sink.c
-+++ b/src/modules/module-null-sink.c
-@@ -34,6 +34,7 @@
- #include <pulsecore/macro.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-null-source.c b/src/modules/module-null-source.c
-index a75a04f..a791883 100644
---- a/src/modules/module-null-source.c
-+++ b/src/modules/module-null-source.c
-@@ -31,6 +31,7 @@
- #include <pulse/timeval.h>
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
-index da65021..0b32f0d 100644
---- a/src/modules/module-pipe-sink.c
-+++ b/src/modules/module-pipe-sink.c
-@@ -35,6 +35,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
-index f39fc55..4b651cc 100644
---- a/src/modules/module-pipe-source.c
-+++ b/src/modules/module-pipe-source.c
-@@ -35,6 +35,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/source.h>
- #include <pulsecore/module.h>
-diff --git a/src/modules/module-position-event-sounds.c b/src/modules/module-position-event-sounds.c
-index fb9f5b3..ef03786 100644
---- a/src/modules/module-position-event-sounds.c
-+++ b/src/modules/module-position-event-sounds.c
-@@ -32,6 +32,7 @@
- #include <pulse/channelmap.h>
-
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
-index 5a183c8..8fd4392 100644
---- a/src/modules/module-protocol-stub.c
-+++ b/src/modules/module-protocol-stub.c
-@@ -32,6 +32,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/socket.h>
-diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
-index 60ac1c4..e844e16 100644
---- a/src/modules/module-rescue-streams.c
-+++ b/src/modules/module-rescue-streams.c
-@@ -24,6 +24,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
-index d71cc38..d11be8c 100644
---- a/src/modules/module-role-cork.c
-+++ b/src/modules/module-role-cork.c
-@@ -23,6 +23,7 @@
-
- #include <pulsecore/macro.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <stream-interaction.h>
-
- #include "module-role-cork-symdef.h"
-diff --git a/src/modules/module-role-ducking.c b/src/modules/module-role-ducking.c
-index add2d36..af3e98c 100644
---- a/src/modules/module-role-ducking.c
-+++ b/src/modules/module-role-ducking.c
-@@ -23,6 +23,7 @@
-
- #include <pulsecore/macro.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <stream-interaction.h>
-
- #include "module-role-ducking-symdef.h"
-diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
-index e2c2e6f..0737fa9 100644
---- a/src/modules/module-rygel-media-server.c
-+++ b/src/modules/module-rygel-media-server.c
-@@ -33,6 +33,7 @@
- #include <pulsecore/i18n.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/source.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
-index cdeb2c0..a3be322 100644
---- a/src/modules/module-sine-source.c
-+++ b/src/modules/module-sine-source.c
-@@ -32,6 +32,7 @@
-
- #include <pulsecore/source.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c
-index d56fae5..a95cf79 100644
---- a/src/modules/module-sine.c
-+++ b/src/modules/module-sine.c
-@@ -25,6 +25,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/module.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
-index d1c2597..75ca729 100644
---- a/src/modules/module-stream-restore.c
-+++ b/src/modules/module-stream-restore.c
-@@ -35,6 +35,7 @@
- #include <pulse/timeval.h>
- #include <pulse/rtclock.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
-index a284f85..030de4d 100644
---- a/src/modules/module-suspend-on-idle.c
-+++ b/src/modules/module-suspend-on-idle.c
-@@ -26,6 +26,7 @@
- #include <pulse/rtclock.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
-diff --git a/src/modules/module-switch-on-connect.c b/src/modules/module-switch-on-connect.c
-index c844add..f3171e9 100644
---- a/src/modules/module-switch-on-connect.c
-+++ b/src/modules/module-switch-on-connect.c
-@@ -25,6 +25,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/source.h>
-diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
-index b9a0f3b..ee787cc 100644
---- a/src/modules/module-switch-on-port-available.c
-+++ b/src/modules/module-switch-on-port-available.c
-@@ -23,6 +23,7 @@
- #endif
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/device-port.h>
- #include <pulsecore/hashmap.h>
-diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
-index d15bee5..62eeb4c 100644
---- a/src/modules/module-systemd-login.c
-+++ b/src/modules/module-systemd-login.c
-@@ -32,6 +32,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/module.h>
- #include <pulsecore/log.h>
- #include <pulsecore/hashmap.h>
-diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
-index 92f99df..82eb7c6 100644
---- a/src/modules/module-tunnel-sink-new.c
-+++ b/src/modules/module-tunnel-sink-new.c
-@@ -30,6 +30,7 @@
- #include <pulse/error.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/sink.h>
-diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
-index e159c33..ff40140 100644
---- a/src/modules/module-tunnel-source-new.c
-+++ b/src/modules/module-tunnel-source-new.c
-@@ -30,6 +30,7 @@
- #include <pulse/error.h>
-
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/i18n.h>
- #include <pulsecore/source.h>
-diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
-index d7114ee..9e5f316 100644
---- a/src/modules/module-tunnel.c
-+++ b/src/modules/module-tunnel.c
-@@ -40,6 +40,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
-index bb41a96..d36b136 100644
---- a/src/modules/module-udev-detect.c
-+++ b/src/modules/module-udev-detect.c
-@@ -30,6 +30,7 @@
- #include <pulse/timeval.h>
-
- #include <pulsecore/modargs.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/namereg.h>
-diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
-index 02cc1ac..286310e 100644
---- a/src/modules/module-virtual-sink.c
-+++ b/src/modules/module-virtual-sink.c
-@@ -29,6 +29,7 @@
- #include <pulsecore/namereg.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
-index 36edf78..b3403a6 100644
---- a/src/modules/module-virtual-source.c
-+++ b/src/modules/module-virtual-source.c
-@@ -31,6 +31,7 @@
- #include <pulsecore/namereg.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c
-index 6c7120a..4d0cee5 100644
---- a/src/modules/module-virtual-surround-sink.c
-+++ b/src/modules/module-virtual-surround-sink.c
-@@ -30,6 +30,7 @@
- #include <pulsecore/namereg.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
-diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
-index 96476b7..e628c6b 100644
---- a/src/modules/module-zeroconf-discover.c
-+++ b/src/modules/module-zeroconf-discover.c
-@@ -35,6 +35,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulsecore/hashmap.h>
-diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
-index 482881c..74018eb 100644
---- a/src/modules/module-zeroconf-publish.c
-+++ b/src/modules/module-zeroconf-publish.c
-@@ -39,6 +39,7 @@
- #include <pulsecore/sink.h>
- #include <pulsecore/source.h>
- #include <pulsecore/native-common.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulsecore/dynarray.h>
-diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
-index 8a5a692..a53b725 100644
---- a/src/modules/oss/module-oss.c
-+++ b/src/modules/oss/module-oss.c
-@@ -51,6 +51,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/util.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/thread.h>
- #include <pulsecore/sink.h>
-diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c
-index f083044..f4ac133 100644
---- a/src/modules/raop/module-raop-discover.c
-+++ b/src/modules/raop/module-raop-discover.c
-@@ -36,6 +36,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/log.h>
- #include <pulsecore/hashmap.h>
-diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
-index 7a97e83..2827b04 100644
---- a/src/modules/raop/module-raop-sink.c
-+++ b/src/modules/raop/module-raop-sink.c
-@@ -41,6 +41,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/core-error.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/module.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
-index 864c558..bd4f90b 100644
---- a/src/modules/raop/raop_client.c
-+++ b/src/modules/raop/raop_client.c
-@@ -40,6 +40,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/iochannel.h>
-diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
-index 5977500..e77f3d0 100644
---- a/src/modules/rtp/module-rtp-recv.c
-+++ b/src/modules/rtp/module-rtp-recv.c
-@@ -34,6 +34,7 @@
- #include <pulse/timeval.h>
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/llist.h>
-diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
-index 15a7436..ef5c526 100644
---- a/src/modules/rtp/module-rtp-send.c
-+++ b/src/modules/rtp/module-rtp-send.c
-@@ -32,6 +32,7 @@
- #include <pulse/util.h>
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/module.h>
- #include <pulsecore/source.h>
-diff --git a/src/modules/stream-interaction.c b/src/modules/stream-interaction.c
-index 4184786..728398c 100644
---- a/src/modules/stream-interaction.c
-+++ b/src/modules/stream-interaction.c
-@@ -28,6 +28,7 @@
- #include <pulsecore/hashmap.h>
- #include <pulsecore/hook-list.h>
- #include <pulsecore/core.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/modargs.h>
-diff --git a/src/modules/x11/module-x11-cork-request.c b/src/modules/x11/module-x11-cork-request.c
-index 5c76711..a86a82e 100644
---- a/src/modules/x11/module-x11-cork-request.c
-+++ b/src/modules/x11/module-x11-cork-request.c
-@@ -36,6 +36,7 @@
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
- #include <pulsecore/x11wrap.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
-
- #include "module-x11-cork-request-symdef.h"
-diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
-index 7c6fb23..5f09d52 100644
---- a/src/modules/x11/module-x11-xsmp.c
-+++ b/src/modules/x11/module-x11-xsmp.c
-@@ -31,6 +31,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/util.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/modargs.h>
- #include <pulsecore/log.h>
- #include <pulsecore/x11wrap.h>
-diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
-index bc5b75b..39f4261 100644
---- a/src/pulsecore/card.c
-+++ b/src/pulsecore/card.c
-@@ -30,6 +30,7 @@
-
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/device-port.h>
-diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
-index 9a73605..05c2b8f 100644
---- a/src/pulsecore/cli-command.c
-+++ b/src/pulsecore/cli-command.c
-@@ -47,6 +47,7 @@
- #include <pulsecore/strbuf.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/cli-text.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/sound-file.h>
- #include <pulsecore/play-memchunk.h>
-diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
-index af79a1e..9e32524 100644
---- a/src/pulsecore/cli-text.c
-+++ b/src/pulsecore/cli-text.c
-@@ -32,6 +32,7 @@
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/strbuf.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/macro.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/pulsecore/client.c b/src/pulsecore/client.c
-index 2e6af47..24faa1f 100644
---- a/src/pulsecore/client.c
-+++ b/src/pulsecore/client.c
-@@ -29,6 +29,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/util.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c
-index 026eeca..8d54720 100644
---- a/src/pulsecore/core-scache.c
-+++ b/src/pulsecore/core-scache.c
-@@ -49,6 +49,7 @@
-
- #include <pulsecore/sink-input.h>
- #include <pulsecore/play-memchunk.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/sound-file.h>
-diff --git a/src/pulsecore/core-struct.h b/src/pulsecore/core-struct.h
-new file mode 100644
-index 0000000..e6aa374
---- /dev/null
-+++ b/src/pulsecore/core-struct.h
-@@ -0,0 +1,103 @@
-+#ifndef foocorestructhfoo
-+#define foocorestructhfoo
-+
-+/***
-+ This file is part of PulseAudio.
-+
-+ Copyright 2004-2006 Lennart Poettering
-+
-+ PulseAudio is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as published
-+ by the Free Software Foundation; either version 2.1 of the License,
-+ or (at your option) any later version.
-+
-+ PulseAudio is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#include "core.h"
-+
-+/* The core structure of PulseAudio. Every PulseAudio daemon contains
-+ * exactly one of these. It is used for storing kind of global
-+ * variables for the daemon. */
-+
-+struct pa_core {
-+ pa_msgobject parent;
-+
-+ pa_core_state_t state;
-+
-+ /* A random value which may be used to identify this instance of
-+ * PulseAudio. Not cryptographically secure in any way. */
-+ uint32_t cookie;
-+
-+ pa_mainloop_api *mainloop;
-+
-+ /* idxset of all kinds of entities */
-+ pa_idxset *clients, *cards, *sinks, *sources, *sink_inputs, *source_outputs, *modules, *scache;
-+
-+ /* Some hashmaps for all sorts of entities */
-+ pa_hashmap *namereg, *shared;
-+
-+ /* The default sink/source */
-+ pa_source *default_source;
-+ pa_sink *default_sink;
-+
-+ pa_channel_map default_channel_map;
-+ pa_sample_spec default_sample_spec;
-+ uint32_t alternate_sample_rate;
-+ unsigned default_n_fragments, default_fragment_size_msec;
-+ unsigned deferred_volume_safety_margin_usec;
-+ int deferred_volume_extra_delay_usec;
-+ unsigned lfe_crossover_freq;
-+
-+ pa_defer_event *module_defer_unload_event;
-+ pa_hashmap *modules_pending_unload; /* pa_module -> pa_module (hashmap-as-a-set) */
-+
-+ pa_defer_event *subscription_defer_event;
-+ PA_LLIST_HEAD(pa_subscription, subscriptions);
-+ PA_LLIST_HEAD(pa_subscription_event, subscription_event_queue);
-+ pa_subscription_event *subscription_event_last;
-+
-+ /* The mempool is used for data we write to, it's readonly for the client. */
-+ pa_mempool *mempool;
-+
-+ /* Shared memory size, as specified either by daemon configuration
-+ * or PA daemon defaults (~ 64 MiB). */
-+ size_t shm_size;
-+
-+ pa_silence_cache silence_cache;
-+
-+ pa_time_event *exit_event;
-+ pa_time_event *scache_auto_unload_event;
-+
-+ int exit_idle_time, scache_idle_time;
-+
-+ bool flat_volumes:1;
-+ bool disallow_module_loading:1;
-+ bool disallow_exit:1;
-+ bool running_as_daemon:1;
-+ bool realtime_scheduling:1;
-+ bool avoid_resampling:1;
-+ bool disable_remixing:1;
-+ bool remixing_use_all_sink_channels:1;
-+ bool disable_lfe_remixing:1;
-+ bool deferred_volume:1;
-+
-+ pa_resample_method_t resample_method;
-+ int realtime_priority;
-+
-+ pa_server_type_t server_type;
-+ pa_cpu_info cpu_info;
-+
-+ /* hooks */
-+ pa_hook hooks[PA_CORE_HOOK_MAX];
-+ /* access hooks */
-+ pa_hook access[PA_ACCESS_HOOK_MAX];
-+};
-+
-+#endif /* foocorestructhfoo */
-diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
-index 5a88b7e..88d900b 100644
---- a/src/pulsecore/core-subscribe.c
-+++ b/src/pulsecore/core-subscribe.c
-@@ -28,6 +28,7 @@
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-
-+#include <pulsecore/core-struct.h>
- #include "core-subscribe.h"
-
- /* The subscription subsystem may be used to be notified whenever an
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index e5d6879..b8dbde9 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -31,6 +31,7 @@
- #include <pulse/xmalloc.h>
-
- #include <pulsecore/module.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-rtclock.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/core-scache.h>
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 152a53f..955db89 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -141,82 +141,6 @@ typedef enum pa_core_hook {
- PA_CORE_HOOK_MAX
- } pa_core_hook_t;
-
--/* The core structure of PulseAudio. Every PulseAudio daemon contains
-- * exactly one of these. It is used for storing kind of global
-- * variables for the daemon. */
--
--struct pa_core {
-- pa_msgobject parent;
--
-- pa_core_state_t state;
--
-- /* A random value which may be used to identify this instance of
-- * PulseAudio. Not cryptographically secure in any way. */
-- uint32_t cookie;
--
-- pa_mainloop_api *mainloop;
--
-- /* idxset of all kinds of entities */
-- pa_idxset *clients, *cards, *sinks, *sources, *sink_inputs, *source_outputs, *modules, *scache;
--
-- /* Some hashmaps for all sorts of entities */
-- pa_hashmap *namereg, *shared;
--
-- /* The default sink/source */
-- pa_source *default_source;
-- pa_sink *default_sink;
--
-- pa_channel_map default_channel_map;
-- pa_sample_spec default_sample_spec;
-- uint32_t alternate_sample_rate;
-- unsigned default_n_fragments, default_fragment_size_msec;
-- unsigned deferred_volume_safety_margin_usec;
-- int deferred_volume_extra_delay_usec;
-- unsigned lfe_crossover_freq;
--
-- pa_defer_event *module_defer_unload_event;
-- pa_hashmap *modules_pending_unload; /* pa_module -> pa_module (hashmap-as-a-set) */
--
-- pa_defer_event *subscription_defer_event;
-- PA_LLIST_HEAD(pa_subscription, subscriptions);
-- PA_LLIST_HEAD(pa_subscription_event, subscription_event_queue);
-- pa_subscription_event *subscription_event_last;
--
-- /* The mempool is used for data we write to, it's readonly for the client. */
-- pa_mempool *mempool;
--
-- /* Shared memory size, as specified either by daemon configuration
-- * or PA daemon defaults (~ 64 MiB). */
-- size_t shm_size;
--
-- pa_silence_cache silence_cache;
--
-- pa_time_event *exit_event;
-- pa_time_event *scache_auto_unload_event;
--
-- int exit_idle_time, scache_idle_time;
--
-- bool flat_volumes:1;
-- bool disallow_module_loading:1;
-- bool disallow_exit:1;
-- bool running_as_daemon:1;
-- bool realtime_scheduling:1;
-- bool disable_remixing:1;
-- bool disable_lfe_remixing:1;
-- bool deferred_volume:1;
--
-- pa_resample_method_t resample_method;
-- int realtime_priority;
--
-- pa_server_type_t server_type;
-- pa_cpu_info cpu_info;
--
-- /* hooks */
-- pa_hook hooks[PA_CORE_HOOK_MAX];
-- /* access hooks */
-- pa_hook access[PA_ACCESS_HOOK_MAX];
--};
--
- PA_DECLARE_PUBLIC_CLASS(pa_core);
- #define PA_CORE(o) pa_core_cast(o)
-
-diff --git a/src/pulsecore/dbus-shared.c b/src/pulsecore/dbus-shared.c
-index 935b068..3309f87 100644
---- a/src/pulsecore/dbus-shared.c
-+++ b/src/pulsecore/dbus-shared.c
-@@ -24,6 +24,7 @@
-
- #include <pulse/xmalloc.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/shared.h>
-
- #include "dbus-shared.h"
-diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
-index 7c9ddf3..bc4d704 100644
---- a/src/pulsecore/device-port.c
-+++ b/src/pulsecore/device-port.c
-@@ -21,6 +21,7 @@
-
- #include "device-port.h"
- #include <pulsecore/card.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
-
- PA_DEFINE_PUBLIC_CLASS(pa_device_port, pa_object);
-diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
-index ac15815..da2abe0 100644
---- a/src/pulsecore/module.c
-+++ b/src/pulsecore/module.c
-@@ -31,6 +31,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/proplist.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/log.h>
- #include <pulsecore/core-util.h>
-diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
-index 47bfc08..dfdcc43 100644
---- a/src/pulsecore/namereg.c
-+++ b/src/pulsecore/namereg.c
-@@ -30,6 +30,7 @@
-
- #include <pulsecore/source.h>
- #include <pulsecore/sink.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/macro.h>
-diff --git a/src/pulsecore/play-memchunk.c b/src/pulsecore/play-memchunk.c
-index cc0bc16..3c7e5a6 100644
---- a/src/pulsecore/play-memchunk.c
-+++ b/src/pulsecore/play-memchunk.c
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/play-memblockq.h>
-
-diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
-index 4f83ac4..ead1d81 100644
---- a/src/pulsecore/protocol-esound.c
-+++ b/src/pulsecore/protocol-esound.c
-@@ -41,6 +41,7 @@
- #include <pulsecore/sink.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/source.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/sample-util.h>
- #include <pulsecore/namereg.h>
-diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
-index 25a2cd0..bbb03c3 100644
---- a/src/pulsecore/protocol-http.c
-+++ b/src/pulsecore/protocol-http.c
-@@ -30,6 +30,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/timeval.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/ioline.h>
- #include <pulsecore/thread-mq.h>
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index 8f07b2d..cbb6ae6 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -45,6 +45,7 @@
- #include <pulsecore/pdispatch.h>
- #include <pulsecore/pstream-util.h>
- #include <pulsecore/namereg.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/log.h>
-diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
-index 923ec87..bd9136b 100644
---- a/src/pulsecore/protocol-simple.c
-+++ b/src/pulsecore/protocol-simple.c
-@@ -34,6 +34,7 @@
- #include <pulsecore/sample-util.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/log.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/atomic.h>
- #include <pulsecore/thread-mq.h>
-diff --git a/src/pulsecore/shared.c b/src/pulsecore/shared.c
-index 1b5eea9..2e63d0e 100644
---- a/src/pulsecore/shared.c
-+++ b/src/pulsecore/shared.c
-@@ -22,6 +22,7 @@
- #endif
-
- #include <pulse/xmalloc.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/macro.h>
-
- #include "shared.h"
-diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
-index e9694f2..9a866b4 100644
---- a/src/pulsecore/sink-input.c
-+++ b/src/pulsecore/sink-input.c
-@@ -30,6 +30,7 @@
- #include <pulse/util.h>
- #include <pulse/internal.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-format.h>
- #include <pulsecore/mix.h>
- #include <pulsecore/stream-util.h>
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index aa21822..20249ec 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -38,6 +38,7 @@
- #include <pulsecore/i18n.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/namereg.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/sample-util.h>
- #include <pulsecore/mix.h>
-diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
-index ddda456..3ac935d 100644
---- a/src/pulsecore/sound-file-stream.c
-+++ b/src/pulsecore/sound-file-stream.c
-@@ -32,6 +32,7 @@
- #include <pulse/xmalloc.h>
- #include <pulse/util.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/sink-input.h>
- #include <pulsecore/log.h>
-diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
-index 6714ea9..a265e6f 100644
---- a/src/pulsecore/source-output.c
-+++ b/src/pulsecore/source-output.c
-@@ -30,6 +30,7 @@
- #include <pulse/util.h>
- #include <pulse/internal.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-format.h>
- #include <pulsecore/mix.h>
- #include <pulsecore/stream-util.h>
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index 8ce7818..7a33d5b 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -33,6 +33,7 @@
- #include <pulse/rtclock.h>
- #include <pulse/internal.h>
-
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/namereg.h>
-diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c
-index 0c040cf..76cb83b 100644
---- a/src/pulsecore/x11wrap.c
-+++ b/src/pulsecore/x11wrap.c
-@@ -28,6 +28,7 @@
- #include <pulsecore/llist.h>
- #include <pulsecore/log.h>
- #include <pulsecore/shared.h>
-+#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/macro.h>
-
---
-2.9.3
-
diff --git a/0010-Don-t-access-pa_core-structures-directly.patch b/0010-Don-t-access-pa_core-structures-directly.patch
deleted file mode 100644
index 9bc94a5..0000000
--- a/0010-Don-t-access-pa_core-structures-directly.patch
+++ /dev/null
@@ -1,1639 +0,0 @@
-From 420e714464f6ab6f943de7ef99b92b5d3f4814e2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Tue, 7 Apr 2015 16:53:09 +0200
-Subject: [PATCH 10/18] Don't access pa_core structures directly
-
-First step to allowing access control. Make sure we only use the
-methods to get core datastructures so that we can do access control
-later.
----
- src/pulsecore/cli-command.c | 72 ++++++++++++--------
- src/pulsecore/cli-text.c | 85 ++++++++++++++++-------
- src/pulsecore/core.c | 102 ++++++++++++++++++++++++++++
- src/pulsecore/core.h | 30 ++++++++
- src/pulsecore/namereg.c | 35 +++++++---
- src/pulsecore/protocol-esound.c | 29 ++++----
- src/pulsecore/protocol-http.c | 12 +++-
- src/pulsecore/protocol-native.c | 147 ++++++++++++++++++++++------------------
- src/pulsecore/protocol-simple.c | 5 +-
- src/pulsecore/sink.c | 6 +-
- src/pulsecore/source.c | 6 +-
- 11 files changed, 380 insertions(+), 149 deletions(-)
-
-diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
-index 05c2b8f..138881c 100644
---- a/src/pulsecore/cli-command.c
-+++ b/src/pulsecore/cli-command.c
-@@ -47,7 +47,6 @@
- #include <pulsecore/strbuf.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/cli-text.h>
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/sound-file.h>
- #include <pulsecore/play-memchunk.h>
-@@ -362,7 +361,7 @@ static int pa_cli_command_stat(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- pa_assert(buf);
- pa_assert(fail);
-
-- mstat = pa_mempool_get_stat(c->mempool);
-+ mstat = pa_mempool_get_stat(pa_core_get_mempool(c));
-
- pa_strbuf_printf(buf, "Memory blocks currently allocated: %u, size: %s.\n",
- (unsigned) pa_atomic_load(&mstat->n_allocated),
-@@ -384,10 +383,10 @@ static int pa_cli_command_stat(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- pa_bytes_snprint(bytes, sizeof(bytes), (unsigned) pa_scache_total_size(c)));
-
- pa_strbuf_printf(buf, "Default sample spec: %s\n",
-- pa_sample_spec_snprint(ss, sizeof(ss), &c->default_sample_spec));
-+ pa_sample_spec_snprint(ss, sizeof(ss), pa_core_get_sample_spec(c)));
-
- pa_strbuf_printf(buf, "Default channel map: %s\n",
-- pa_channel_map_snprint(cm, sizeof(cm), &c->default_channel_map));
-+ pa_channel_map_snprint(cm, sizeof(cm), pa_core_get_channel_map(c)));
-
- def_sink = pa_namereg_get_default_sink(c);
- def_source = pa_namereg_get_default_source(c);
-@@ -437,7 +436,7 @@ static int pa_cli_command_load(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- return -1;
- }
-
-- if (!pa_module_load(c, name, pa_tokenizer_get(t, 2))) {
-+ if (!pa_module_load(c, name, pa_tokenizer_get(t, 2))) {
- pa_strbuf_puts(buf, "Module load failed.\n");
- return -1;
- }
-@@ -462,7 +461,7 @@ static int pa_cli_command_unload(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bo
- }
-
- if (pa_atou(i, &idx) >= 0) {
-- if (!(m = pa_idxset_get_by_index(c->modules, idx))) {
-+ if (!(m = pa_core_get_module(c, idx))) {
- pa_strbuf_puts(buf, "Invalid module index.\n");
- return -1;
- }
-@@ -470,12 +469,15 @@ static int pa_cli_command_unload(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bo
- pa_module_unload_request(m, false);
-
- } else {
-- PA_IDXSET_FOREACH(m, c->modules, idx)
-+ pa_idxset *modules = pa_core_get_modules(c);
-+ PA_IDXSET_FOREACH(m, modules, idx)
- if (pa_streq(i, m->name)) {
- unloaded = true;
- pa_module_unload_request(m, false);
- }
-
-+ pa_idxset_free(modules, NULL);
-+
- if (unloaded == false) {
- pa_strbuf_printf(buf, "Module %s not loaded.\n", i);
- return -1;
-@@ -604,7 +606,7 @@ static int pa_cli_command_sink_input_volume(pa_core *c, pa_tokenizer *t, pa_strb
- return -1;
- }
-
-- if (!(si = pa_idxset_get_by_index(c->sink_inputs, idx))) {
-+ if (!(si = pa_core_get_sink_input(c, idx))) {
- pa_strbuf_puts(buf, "No sink input found with this index.\n");
- return -1;
- }
-@@ -697,7 +699,7 @@ static int pa_cli_command_source_output_volume(pa_core *c, pa_tokenizer *t, pa_s
- return -1;
- }
-
-- if (!(so = pa_idxset_get_by_index(c->source_outputs, idx))) {
-+ if (!(so = pa_core_get_source_output(c, idx))) {
- pa_strbuf_puts(buf, "No source output found with this index.\n");
- return -1;
- }
-@@ -880,7 +882,7 @@ static int pa_cli_command_update_sink_input_proplist(pa_core *c, pa_tokenizer *t
- return -1;
- }
-
-- if (!(si = pa_idxset_get_by_index(c->sink_inputs, (uint32_t) idx))) {
-+ if (!(si = pa_core_get_sink_input(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No sink input found with this index.\n");
- return -1;
- }
-@@ -923,7 +925,7 @@ static int pa_cli_command_update_source_output_proplist(pa_core *c, pa_tokenizer
- return -1;
- }
-
-- if (!(so = pa_idxset_get_by_index(c->source_outputs, (uint32_t) idx))) {
-+ if (!(so = pa_core_get_source_output(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No source output found with this index.\n");
- return -1;
- }
-@@ -971,7 +973,7 @@ static int pa_cli_command_sink_input_mute(pa_core *c, pa_tokenizer *t, pa_strbuf
- return -1;
- }
-
-- if (!(si = pa_idxset_get_by_index(c->sink_inputs, (uint32_t) idx))) {
-+ if (!(si = pa_core_get_sink_input(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No sink input found with this index.\n");
- return -1;
- }
-@@ -1011,7 +1013,7 @@ static int pa_cli_command_source_output_mute(pa_core *c, pa_tokenizer *t, pa_str
- return -1;
- }
-
-- if (!(so = pa_idxset_get_by_index(c->source_outputs, (uint32_t) idx))) {
-+ if (!(so = pa_core_get_source_output(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No source output found with this index.\n");
- return -1;
- }
-@@ -1065,7 +1067,7 @@ static int pa_cli_command_source_default(pa_core *c, pa_tokenizer *t, pa_strbuf
-
- static int pa_cli_command_kill_client(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool *fail) {
- const char *n;
-- pa_client *client;
-+ pa_client *cl;
- uint32_t idx;
-
- pa_core_assert_ref(c);
-@@ -1083,12 +1085,12 @@ static int pa_cli_command_kill_client(pa_core *c, pa_tokenizer *t, pa_strbuf *bu
- return -1;
- }
-
-- if (!(client = pa_idxset_get_by_index(c->clients, idx))) {
-+ if (!(cl = pa_core_get_client(c, idx))) {
- pa_strbuf_puts(buf, "No client found by this index.\n");
- return -1;
- }
-
-- pa_client_kill(client);
-+ pa_client_kill(cl);
- return 0;
- }
-
-@@ -1112,7 +1114,7 @@ static int pa_cli_command_kill_sink_input(pa_core *c, pa_tokenizer *t, pa_strbuf
- return -1;
- }
-
-- if (!(sink_input = pa_idxset_get_by_index(c->sink_inputs, idx))) {
-+ if (!(sink_input = pa_core_get_sink_input(c, idx))) {
- pa_strbuf_puts(buf, "No sink input found by this index.\n");
- return -1;
- }
-@@ -1141,7 +1143,7 @@ static int pa_cli_command_kill_source_output(pa_core *c, pa_tokenizer *t, pa_str
- return -1;
- }
-
-- if (!(source_output = pa_idxset_get_by_index(c->source_outputs, idx))) {
-+ if (!(source_output = pa_core_get_source_output(c, idx))) {
- pa_strbuf_puts(buf, "No source output found by this index.\n");
- return -1;
- }
-@@ -1300,7 +1302,7 @@ static int pa_cli_command_vacuum(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bo
- pa_assert(buf);
- pa_assert(fail);
-
-- pa_mempool_vacuum(c->mempool);
-+ pa_mempool_vacuum(pa_core_get_mempool(c));
-
- return 0;
- }
-@@ -1331,7 +1333,7 @@ static int pa_cli_command_move_sink_input(pa_core *c, pa_tokenizer *t, pa_strbuf
- return -1;
- }
-
-- if (!(si = pa_idxset_get_by_index(c->sink_inputs, (uint32_t) idx))) {
-+ if (!(si = pa_core_get_sink_input(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No sink input found with this index.\n");
- return -1;
- }
-@@ -1374,7 +1376,7 @@ static int pa_cli_command_move_source_output(pa_core *c, pa_tokenizer *t, pa_str
- return -1;
- }
-
-- if (!(so = pa_idxset_get_by_index(c->source_outputs, (uint32_t) idx))) {
-+ if (!(so = pa_core_get_source_output(c, (uint32_t) idx))) {
- pa_strbuf_puts(buf, "No source output found with this index.\n");
- return -1;
- }
-@@ -1789,6 +1791,7 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- #ifdef HAVE_CTIME_R
- char txt[256];
- #endif
-+ pa_idxset *i;
-
- pa_core_assert_ref(c);
- pa_assert(t);
-@@ -1802,8 +1805,8 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- #else
- pa_strbuf_printf(buf, "### Configuration dump generated at %s\n", ctime(&now));
- #endif
--
-- PA_IDXSET_FOREACH(m, c->modules, idx) {
-+ i = pa_core_get_modules(c);
-+ PA_IDXSET_FOREACH(m, i, idx) {
-
- pa_strbuf_printf(buf, "load-module %s", m->name);
-
-@@ -1812,9 +1815,11 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
-
- pa_strbuf_puts(buf, "\n");
- }
-+ pa_idxset_free(i, NULL);
-
- nl = false;
-- PA_IDXSET_FOREACH(sink, c->sinks, idx) {
-+ i = pa_core_get_sinks(c);
-+ PA_IDXSET_FOREACH(sink, i, idx) {
-
- if (!nl) {
- pa_strbuf_puts(buf, "\n");
-@@ -1825,9 +1830,11 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- pa_strbuf_printf(buf, "set-sink-mute %s %s\n", sink->name, pa_yes_no(pa_sink_get_mute(sink, false)));
- pa_strbuf_printf(buf, "suspend-sink %s %s\n", sink->name, pa_yes_no(pa_sink_get_state(sink) == PA_SINK_SUSPENDED));
- }
-+ pa_idxset_free(i, NULL);
-
- nl = false;
-- PA_IDXSET_FOREACH(source, c->sources, idx) {
-+ i = pa_core_get_sources(c);
-+ PA_IDXSET_FOREACH(source, i, idx) {
-
- if (!nl) {
- pa_strbuf_puts(buf, "\n");
-@@ -1838,9 +1845,11 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
- pa_strbuf_printf(buf, "set-source-mute %s %s\n", source->name, pa_yes_no(pa_source_get_mute(source, false)));
- pa_strbuf_printf(buf, "suspend-source %s %s\n", source->name, pa_yes_no(pa_source_get_state(source) == PA_SOURCE_SUSPENDED));
- }
-+ pa_idxset_free(i, NULL);
-
- nl = false;
-- PA_IDXSET_FOREACH(card, c->cards, idx) {
-+ i = pa_core_get_cards(c);
-+ PA_IDXSET_FOREACH(card, i, idx) {
-
- if (!nl) {
- pa_strbuf_puts(buf, "\n");
-@@ -1849,6 +1858,7 @@ static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool
-
- pa_strbuf_printf(buf, "set-card-profile %s %s\n", card->name, card->active_profile->name);
- }
-+ pa_idxset_free(i, NULL);
-
- nl = false;
- if ((sink = pa_namereg_get_default_sink(c))) {
-@@ -1880,13 +1890,16 @@ static int pa_cli_command_dump_volumes(pa_core *c, pa_tokenizer *t, pa_strbuf *b
- uint32_t s_idx, i_idx;
- char v_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
- pa_channel_map *map;
-+ pa_idxset *sinks, *sources;
-
- pa_core_assert_ref(c);
- pa_assert(t);
- pa_assert(buf);
- pa_assert(fail);
-
-- PA_IDXSET_FOREACH(s, c->sinks, s_idx) {
-+ sinks = pa_core_get_sinks(c);
-+
-+ PA_IDXSET_FOREACH(s, sinks, s_idx) {
- map = &s->channel_map;
- pa_strbuf_printf(buf, "Sink %d: ", s_idx);
- pa_strbuf_printf(buf,
-@@ -1937,8 +1950,10 @@ static int pa_cli_command_dump_volumes(pa_core *c, pa_tokenizer *t, pa_strbuf *b
- pa_strbuf_printf(buf, "save = %s\n", pa_yes_no(i->save_volume));
- }
- }
-+ pa_idxset_free(sinks, NULL);
-
-- PA_IDXSET_FOREACH(so, c->sources, s_idx) {
-+ sources = pa_core_get_sources(c);
-+ PA_IDXSET_FOREACH(so, sources, s_idx) {
- map = &so->channel_map;
- pa_strbuf_printf(buf, "Source %d: ", s_idx);
- pa_strbuf_printf(buf,
-@@ -1989,6 +2004,7 @@ static int pa_cli_command_dump_volumes(pa_core *c, pa_tokenizer *t, pa_strbuf *b
- pa_strbuf_printf(buf, "save = %s\n", pa_yes_no(o->save_volume));
- }
- }
-+ pa_idxset_free(sources, NULL);
-
- return 0;
- }
-diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
-index 9e32524..239ab5d 100644
---- a/src/pulsecore/cli-text.c
-+++ b/src/pulsecore/cli-text.c
-@@ -32,7 +32,6 @@
- #include <pulsecore/sink-input.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/strbuf.h>
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/macro.h>
- #include <pulsecore/core-util.h>
-@@ -44,13 +43,17 @@ char *pa_module_list_to_string(pa_core *c) {
- pa_strbuf *s;
- pa_module *m;
- uint32_t idx = PA_IDXSET_INVALID;
-+ pa_idxset *modules;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u module(s) loaded.\n", pa_idxset_size(c->modules));
-+ modules = pa_core_get_modules(c);
-+
-+ pa_strbuf_printf(s, "%u module(s) loaded.\n", pa_idxset_size(modules));
-
-- PA_IDXSET_FOREACH(m, c->modules, idx) {
-+ PA_IDXSET_FOREACH(m, modules, idx) {
- char *t;
-
- pa_strbuf_printf(s, " index: %u\n"
-@@ -68,36 +71,42 @@ char *pa_module_list_to_string(pa_core *c) {
- pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
- pa_xfree(t);
- }
-+ pa_idxset_free(modules, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-
- char *pa_client_list_to_string(pa_core *c) {
- pa_strbuf *s;
-- pa_client *client;
-+ pa_client *cl;
- uint32_t idx = PA_IDXSET_INVALID;
-+ pa_idxset *clients;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u client(s) logged in.\n", pa_idxset_size(c->clients));
-+ clients = pa_core_get_clients(c);
-+
-+ pa_strbuf_printf(s, "%u client(s) logged in.\n", pa_idxset_size(clients));
-
-- PA_IDXSET_FOREACH(client, c->clients, idx) {
-+ PA_IDXSET_FOREACH(cl, clients, idx) {
- char *t;
- pa_strbuf_printf(
- s,
- " index: %u\n"
- "\tdriver: <%s>\n",
-- client->index,
-- client->driver);
-+ cl->index,
-+ cl->driver);
-
-- if (client->module)
-- pa_strbuf_printf(s, "\towner module: %u\n", client->module->index);
-+ if (cl->module)
-+ pa_strbuf_printf(s, "\towner module: %u\n", cl->module->index);
-
-- t = pa_proplist_to_string_sep(client->proplist, "\n\t\t");
-+ t = pa_proplist_to_string_sep(cl->proplist, "\n\t\t");
- pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
- pa_xfree(t);
- }
-+ pa_idxset_free(clients, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-@@ -139,13 +148,17 @@ char *pa_card_list_to_string(pa_core *c) {
- pa_strbuf *s;
- pa_card *card;
- uint32_t idx = PA_IDXSET_INVALID;
-+ pa_idxset *cards;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u card(s) available.\n", pa_idxset_size(c->cards));
-+ cards = pa_core_get_cards(c);
-+
-+ pa_strbuf_printf(s, "%u card(s) available.\n", pa_idxset_size(cards));
-
-- PA_IDXSET_FOREACH(card, c->cards, idx) {
-+ PA_IDXSET_FOREACH(card, cards, idx) {
- char *t;
- pa_sink *sink;
- pa_source *source;
-@@ -193,6 +206,7 @@ char *pa_card_list_to_string(pa_core *c) {
-
- append_port_list(s, card->ports);
- }
-+ pa_idxset_free(cards, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-@@ -235,15 +249,19 @@ char *pa_sink_list_to_string(pa_core *c) {
- pa_strbuf *s;
- pa_sink *sink, *default_sink;
- uint32_t idx = PA_IDXSET_INVALID;
-+ pa_idxset *sinks;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u sink(s) available.\n", pa_idxset_size(c->sinks));
-+ sinks = pa_core_get_sinks(c);
-+
-+ pa_strbuf_printf(s, "%u sink(s) available.\n", pa_idxset_size(sinks));
-
- default_sink = pa_namereg_get_default_sink(c);
-
-- PA_IDXSET_FOREACH(sink, c->sinks, idx) {
-+ PA_IDXSET_FOREACH(sink, sinks, idx) {
- char ss[PA_SAMPLE_SPEC_SNPRINT_MAX],
- cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX],
- v[PA_VOLUME_SNPRINT_VERBOSE_MAX],
-@@ -345,6 +363,7 @@ char *pa_sink_list_to_string(pa_core *c) {
- "\tactive port: <%s>\n",
- sink->active_port->name);
- }
-+ pa_idxset_free(sinks, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-@@ -353,15 +372,19 @@ char *pa_source_list_to_string(pa_core *c) {
- pa_strbuf *s;
- pa_source *source, *default_source;
- uint32_t idx = PA_IDXSET_INVALID;
-+ pa_idxset *sources;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u source(s) available.\n", pa_idxset_size(c->sources));
-+ sources = pa_core_get_sources(c);
-+
-+ pa_strbuf_printf(s, "%u source(s) available.\n", pa_idxset_size(sources));
-
- default_source = pa_namereg_get_default_source(c);
-
-- PA_IDXSET_FOREACH(source, c->sources, idx) {
-+ PA_IDXSET_FOREACH(source, sources, idx) {
- char ss[PA_SAMPLE_SPEC_SNPRINT_MAX],
- cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX],
- v[PA_VOLUME_SNPRINT_VERBOSE_MAX],
-@@ -460,6 +483,7 @@ char *pa_source_list_to_string(pa_core *c) {
- "\tactive port: <%s>\n",
- source->active_port->name);
- }
-+ pa_idxset_free(sources, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-@@ -474,13 +498,16 @@ char *pa_source_output_list_to_string(pa_core *c) {
- [PA_SOURCE_OUTPUT_CORKED] = "CORKED",
- [PA_SOURCE_OUTPUT_UNLINKED] = "UNLINKED"
- };
-+ pa_idxset *source_outputs;
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u source output(s) available.\n", pa_idxset_size(c->source_outputs));
-+ source_outputs = pa_core_get_source_outputs(c);
-+
-+ pa_strbuf_printf(s, "%u source output(s) available.\n", pa_idxset_size(source_outputs));
-
-- PA_IDXSET_FOREACH(o, c->source_outputs, idx) {
-+ PA_IDXSET_FOREACH(o, source_outputs, idx) {
- char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], *t, clt[28];
- pa_usec_t cl;
- const char *cmn;
-@@ -557,6 +584,7 @@ char *pa_source_output_list_to_string(pa_core *c) {
- pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
- pa_xfree(t);
- }
-+ pa_idxset_free(source_outputs, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-@@ -572,13 +600,16 @@ char *pa_sink_input_list_to_string(pa_core *c) {
- [PA_SINK_INPUT_CORKED] = "CORKED",
- [PA_SINK_INPUT_UNLINKED] = "UNLINKED"
- };
-+ pa_idxset *sink_inputs;
-
- pa_assert(c);
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u sink input(s) available.\n", pa_idxset_size(c->sink_inputs));
-+ sink_inputs = pa_core_get_sink_inputs(c);
-
-- PA_IDXSET_FOREACH(i, c->sink_inputs, idx) {
-+ pa_strbuf_printf(s, "%u sink input(s) available.\n", pa_idxset_size(sink_inputs));
-+
-+ PA_IDXSET_FOREACH(i, sink_inputs, idx) {
- char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], *t, clt[28];
- pa_usec_t cl;
- const char *cmn;
-@@ -653,23 +684,28 @@ char *pa_sink_input_list_to_string(pa_core *c) {
- pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
- pa_xfree(t);
- }
-+ pa_idxset_free(sink_inputs, NULL);
-
- return pa_strbuf_to_string_free(s);
- }
-
- char *pa_scache_list_to_string(pa_core *c) {
- pa_strbuf *s;
-+ pa_idxset *scache;
-+
- pa_assert(c);
-
- s = pa_strbuf_new();
-
-- pa_strbuf_printf(s, "%u cache entrie(s) available.\n", c->scache ? pa_idxset_size(c->scache) : 0);
-+ scache = pa_core_get_scache(c);
-+
-+ pa_strbuf_printf(s, "%u cache entrie(s) available.\n", scache ? pa_idxset_size(scache) : 0);
-
-- if (c->scache) {
-+ if (scache) {
- pa_scache_entry *e;
- uint32_t idx = PA_IDXSET_INVALID;
-
-- PA_IDXSET_FOREACH(e, c->scache, idx) {
-+ PA_IDXSET_FOREACH(e, scache, idx) {
- double l = 0;
- char ss[PA_SAMPLE_SPEC_SNPRINT_MAX] = "n/a", cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX] = "n/a", *t;
- const char *cmn;
-@@ -711,6 +747,7 @@ char *pa_scache_list_to_string(pa_core *c) {
- pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
- pa_xfree(t);
- }
-+ pa_idxset_free(scache, NULL);
- }
-
- return pa_strbuf_to_string_free(s);
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index b8dbde9..b068f5d 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -262,6 +262,11 @@ int pa_core_exit(pa_core *c, bool force, int retval) {
- return 0;
- }
-
-+pa_hook_result_t pa_core_hook_fire(pa_core *c, pa_core_hook_t hook, void *data) {
-+ pa_assert(c);
-+ return pa_hook_fire(&c->hooks[hook], data);
-+}
-+
- void pa_core_maybe_vacuum(pa_core *c) {
- pa_assert(c);
-
-@@ -305,3 +310,100 @@ void pa_core_rttime_restart(pa_core *c, pa_time_event *e, pa_usec_t usec) {
-
- c->mainloop->time_restart(e, pa_timeval_rtstore(&tv, usec, true));
- }
-+
-+pa_mainloop_api* pa_core_get_mainloop(pa_core *c) {
-+ pa_assert(c);
-+ pa_assert(c->mainloop);
-+
-+ return c->mainloop;
-+}
-+
-+/* FIXME: Should we expose this at all? */
-+pa_mempool* pa_core_get_mempool(pa_core *c) {
-+ pa_assert(c);
-+ pa_assert(c->mempool);
-+
-+ return c->mempool;
-+}
-+
-+pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_client) {
-+ return pa_mempool_new(shm_type, c->shm_size, per_client);
-+}
-+
-+/* FIXME: Should these be taking a ref during the copy? */
-+
-+pa_idxset* pa_core_get_modules(pa_core *c) {
-+ return pa_idxset_copy(c->modules, NULL);
-+}
-+
-+pa_idxset* pa_core_get_clients(pa_core *c) {
-+ return pa_idxset_copy(c->clients, NULL);
-+}
-+
-+pa_idxset* pa_core_get_cards(pa_core *c) {
-+ return pa_idxset_copy(c->cards, NULL);
-+}
-+
-+pa_idxset* pa_core_get_sinks(pa_core *c) {
-+ return pa_idxset_copy(c->sinks, NULL);
-+}
-+
-+pa_idxset* pa_core_get_sources(pa_core *c) {
-+ return pa_idxset_copy(c->sources, NULL);
-+}
-+
-+pa_idxset* pa_core_get_sink_inputs(pa_core *c) {
-+ return pa_idxset_copy(c->sink_inputs, NULL);
-+}
-+
-+pa_idxset* pa_core_get_source_outputs(pa_core *c) {
-+ return pa_idxset_copy(c->source_outputs, NULL);
-+}
-+
-+pa_idxset* pa_core_get_scache(pa_core *c) {
-+ return pa_idxset_copy(c->scache, NULL);
-+}
-+
-+pa_module* pa_core_get_module(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->modules, idx);
-+}
-+
-+pa_client* pa_core_get_client(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->clients, idx);
-+}
-+
-+pa_card* pa_core_get_card(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->cards, idx);
-+}
-+
-+pa_sink* pa_core_get_sink(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->sinks, idx);
-+}
-+
-+pa_source* pa_core_get_source(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->sources, idx);
-+}
-+
-+pa_sink_input* pa_core_get_sink_input(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->sink_inputs, idx);
-+}
-+
-+pa_source_output* pa_core_get_source_output(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->source_outputs, idx);
-+}
-+
-+pa_scache_entry* pa_core_get_scache_entry(pa_core *c, uint32_t idx) {
-+ return pa_idxset_get_by_index(c->scache, idx);
-+}
-+
-+const pa_sample_spec* pa_core_get_sample_spec(pa_core *c) {
-+ return &c->default_sample_spec;
-+}
-+
-+const pa_channel_map* pa_core_get_channel_map(pa_core *c) {
-+ return &c->default_channel_map;
-+}
-+
-+uint32_t pa_core_get_cookie(pa_core *c) {
-+ return c->cookie;
-+}
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 955db89..87b055d 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -158,8 +158,38 @@ int pa_core_exit(pa_core *c, bool force, int retval);
-
- void pa_core_maybe_vacuum(pa_core *c);
-
-+pa_hook_result_t pa_core_hook_fire(pa_core *c, pa_core_hook_t hook, void *data);
-+
- /* wrapper for c->mainloop->time_*() RT time events */
- pa_time_event* pa_core_rttime_new(pa_core *c, pa_usec_t usec, pa_time_event_cb_t cb, void *userdata);
- void pa_core_rttime_restart(pa_core *c, pa_time_event *e, pa_usec_t usec);
-
-+pa_mainloop_api* pa_core_get_mainloop(pa_core *c);
-+pa_mempool* pa_core_get_mempool(pa_core *c);
-+pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_client);
-+
-+pa_idxset* pa_core_get_modules(pa_core *c);
-+pa_idxset* pa_core_get_clients(pa_core *c);
-+pa_idxset* pa_core_get_cards(pa_core *c);
-+pa_idxset* pa_core_get_sinks(pa_core *c);
-+pa_idxset* pa_core_get_sources(pa_core *c);
-+pa_idxset* pa_core_get_sink_inputs(pa_core *c);
-+pa_idxset* pa_core_get_source_outputs(pa_core *c);
-+pa_idxset* pa_core_get_scache(pa_core *c);
-+
-+pa_module* pa_core_get_module(pa_core *c, uint32_t idx);
-+pa_client* pa_core_get_client(pa_core *c, uint32_t idx);
-+pa_card* pa_core_get_card(pa_core *c, uint32_t idx);
-+pa_sink* pa_core_get_sink(pa_core *c, uint32_t idx);
-+pa_source* pa_core_get_source(pa_core *c, uint32_t idx);
-+pa_sink_input* pa_core_get_sink_input(pa_core *c, uint32_t idx);
-+pa_source_output* pa_core_get_source_output(pa_core *c, uint32_t idx);
-+typedef struct pa_scache_entry pa_scache_entry;
-+pa_scache_entry* pa_core_get_scache_entry(pa_core *c, uint32_t idx);
-+
-+const pa_sample_spec* pa_core_get_sample_spec(pa_core *c);
-+const pa_channel_map* pa_core_get_channel_map(pa_core *c);
-+
-+uint32_t pa_core_get_cookie(pa_core *c);
-+
- #endif
-diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
-index dfdcc43..699fa1b 100644
---- a/src/pulsecore/namereg.c
-+++ b/src/pulsecore/namereg.c
-@@ -31,6 +31,7 @@
- #include <pulsecore/source.h>
- #include <pulsecore/sink.h>
- #include <pulsecore/core-struct.h>
-+#include <pulsecore/core-scache.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/macro.h>
-@@ -239,13 +240,13 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) {
- return NULL;
-
- if (type == PA_NAMEREG_SINK)
-- return pa_idxset_get_by_index(c->sinks, idx);
-+ return pa_core_get_sink(c, idx);
- else if (type == PA_NAMEREG_SOURCE)
-- return pa_idxset_get_by_index(c->sources, idx);
-- else if (type == PA_NAMEREG_SAMPLE && c->scache)
-- return pa_idxset_get_by_index(c->scache, idx);
-+ return pa_core_get_source(c, idx);
-+ else if (type == PA_NAMEREG_SAMPLE)
-+ return pa_core_get_scache_entry(c, idx);
- else if (type == PA_NAMEREG_CARD)
-- return pa_idxset_get_by_index(c->cards, idx);
-+ return pa_core_get_card(c, idx);
-
- return NULL;
- }
-@@ -258,7 +259,7 @@ pa_sink* pa_namereg_set_default_sink(pa_core*c, pa_sink *s) {
-
- if (c->default_sink != s) {
- c->default_sink = s;
-- pa_hook_fire(&c->hooks[PA_CORE_HOOK_DEFAULT_SINK_CHANGED], c->default_sink);
-+ pa_core_hook_fire(c, PA_CORE_HOOK_DEFAULT_SINK_CHANGED, c->default_sink);
- pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SERVER|PA_SUBSCRIPTION_EVENT_CHANGE, PA_INVALID_INDEX);
- }
-
-@@ -273,7 +274,7 @@ pa_source* pa_namereg_set_default_source(pa_core*c, pa_source *s) {
-
- if (c->default_source != s) {
- c->default_source = s;
-- pa_hook_fire(&c->hooks[PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED], c->default_source);
-+ pa_core_hook_fire(c, PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED, c->default_source);
- pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SERVER|PA_SUBSCRIPTION_EVENT_CHANGE, PA_INVALID_INDEX);
- }
-
-@@ -283,41 +284,50 @@ pa_source* pa_namereg_set_default_source(pa_core*c, pa_source *s) {
- pa_sink *pa_namereg_get_default_sink(pa_core *c) {
- pa_sink *s, *best = NULL;
- uint32_t idx;
-+ pa_idxset *sinks;
-
- pa_assert(c);
-
- if (c->default_sink && PA_SINK_IS_LINKED(pa_sink_get_state(c->default_sink)))
- return c->default_sink;
-
-- PA_IDXSET_FOREACH(s, c->sinks, idx)
-+ sinks = pa_core_get_sinks(c);
-+
-+ PA_IDXSET_FOREACH(s, sinks, idx)
- if (PA_SINK_IS_LINKED(pa_sink_get_state(s)))
- if (!best || s->priority > best->priority)
- best = s;
-
-+ pa_idxset_free(sinks, NULL);
-+
- return best;
- }
-
- pa_source *pa_namereg_get_default_source(pa_core *c) {
- pa_source *s, *best = NULL;
- uint32_t idx;
-+ pa_idxset *sources;
-
- pa_assert(c);
-
- if (c->default_source && PA_SOURCE_IS_LINKED(pa_source_get_state(c->default_source)))
- return c->default_source;
-
-+ sources = pa_core_get_sources(c);
-+
- /* First, try to find one that isn't a monitor */
-- PA_IDXSET_FOREACH(s, c->sources, idx)
-+ PA_IDXSET_FOREACH(s, sources, idx)
- if (!s->monitor_of && PA_SOURCE_IS_LINKED(pa_source_get_state(s)))
- if (!best ||
- s->priority > best->priority)
- best = s;
-
-+
- if (best)
-- return best;
-+ goto done;
-
- /* Then, fallback to a monitor */
-- PA_IDXSET_FOREACH(s, c->sources, idx)
-+ PA_IDXSET_FOREACH(s, sources, idx)
- if (PA_SOURCE_IS_LINKED(pa_source_get_state(s)))
- if (!best ||
- s->priority > best->priority ||
-@@ -327,5 +337,8 @@ pa_source *pa_namereg_get_default_source(pa_core *c) {
- s->monitor_of->priority > best->monitor_of->priority))
- best = s;
-
-+done:
-+ pa_idxset_free(sources, NULL);
-+
- return best;
- }
-diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
-index ead1d81..0d76525 100644
---- a/src/pulsecore/protocol-esound.c
-+++ b/src/pulsecore/protocol-esound.c
-@@ -41,7 +41,6 @@
- #include <pulsecore/sink.h>
- #include <pulsecore/source-output.h>
- #include <pulsecore/source.h>
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/sample-util.h>
- #include <pulsecore/namereg.h>
-@@ -240,12 +239,12 @@ static void connection_unlink(connection *c) {
- }
-
- if (c->defer_event) {
-- c->protocol->core->mainloop->defer_free(c->defer_event);
-+ pa_core_get_mainloop (c->protocol->core)->defer_free(c->defer_event);
- c->defer_event = NULL;
- }
-
- if (c->auth_timeout_event) {
-- c->protocol->core->mainloop->time_free(c->auth_timeout_event);
-+ pa_core_get_mainloop (c->protocol->core)->time_free(c->auth_timeout_event);
- c->auth_timeout_event = NULL;
- }
-
-@@ -293,7 +292,7 @@ static void connection_write(connection *c, const void *data, size_t length) {
- size_t i;
- pa_assert(c);
-
-- c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
-+ pa_core_get_mainloop (c->protocol->core)->defer_enable(c->defer_event, 1);
-
- connection_write_prepare(c, length);
-
-@@ -355,7 +354,7 @@ static int esd_proto_connect(connection *c, esd_proto_t request, const void *dat
- }
-
- if (c->auth_timeout_event) {
-- c->protocol->core->mainloop->time_free(c->auth_timeout_event);
-+ pa_core_get_mainloop (c->protocol->core)->time_free(c->auth_timeout_event);
- c->auth_timeout_event = NULL;
- }
-
-@@ -614,6 +613,7 @@ static int esd_proto_all_info(connection *c, esd_proto_t request, const void *da
- uint32_t idx = PA_IDXSET_INVALID;
- unsigned nsamples;
- char terminator[sizeof(int32_t)*6+ESD_NAME_MAX];
-+ pa_idxset *scache;
-
- connection_assert_ref(c);
- pa_assert(data);
-@@ -624,7 +624,8 @@ static int esd_proto_all_info(connection *c, esd_proto_t request, const void *da
-
- k = sizeof(int32_t)*5+ESD_NAME_MAX;
- s = sizeof(int32_t)*6+ESD_NAME_MAX;
-- nsamples = pa_idxset_size(c->protocol->core->scache);
-+ scache = pa_core_get_scache(c->protocol->core);
-+ nsamples = pa_idxset_size(scache);
- t = s*(nsamples+1) + k*(c->protocol->n_player+1);
-
- connection_write_prepare(c, t);
-@@ -690,7 +691,7 @@ static int esd_proto_all_info(connection *c, esd_proto_t request, const void *da
-
- idx = PA_IDXSET_INVALID;
-
-- PA_IDXSET_FOREACH(ce, c->protocol->core->scache, idx) {
-+ PA_IDXSET_FOREACH(ce, scache, idx) {
- int32_t id, rate, lvolume, rvolume, format, len;
- char name[ESD_NAME_MAX];
- pa_channel_map stereo = { .channels = 2, .map = { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT } };
-@@ -748,6 +749,7 @@ static int esd_proto_all_info(connection *c, esd_proto_t request, const void *da
- t -= s;
- }
- }
-+ pa_idxset_free(scache, NULL);
-
- pa_assert(t == s);
-
-@@ -817,7 +819,7 @@ static int esd_proto_sample_pan(connection *c, esd_proto_t request, const void *
- volume.values[1] = (rvolume*PA_VOLUME_NORM)/ESD_VOLUME_BASE;
- volume.channels = 2;
-
-- if ((ce = pa_idxset_get_by_index(c->protocol->core->scache, idx))) {
-+ if ((ce = pa_core_get_scache_entry(c->protocol->core, idx))) {
- pa_channel_map stereo = { .channels = 2, .map = { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT } };
-
- pa_cvolume_remap(&volume, &stereo, &ce->channel_map);
-@@ -866,7 +868,7 @@ static int esd_proto_sample_cache(connection *c, esd_proto_t request, const void
- CHECK_VALIDITY(pa_utf8_valid(name), "Invalid UTF8 in sample name.");
-
- pa_assert(!c->scache.memchunk.memblock);
-- c->scache.memchunk.memblock = pa_memblock_new(c->protocol->core->mempool, (size_t) sc_length);
-+ c->scache.memchunk.memblock = pa_memblock_new(pa_core_get_mempool (c->protocol->core), (size_t) sc_length);
- c->scache.memchunk.index = 0;
- c->scache.memchunk.length = (size_t) sc_length;
- c->scache.sample_spec = ss;
-@@ -1150,7 +1152,7 @@ static int do_read(connection *c) {
- }
-
- if (!c->playback.current_memblock) {
-- pa_assert_se(c->playback.current_memblock = pa_memblock_new(c->protocol->core->mempool, (size_t) -1));
-+ pa_assert_se(c->playback.current_memblock = pa_memblock_new(pa_core_get_mempool(c->protocol->core), (size_t) -1));
- c->playback.memblock_index = 0;
-
- space = pa_memblock_get_length(c->playback.current_memblock);
-@@ -1237,7 +1239,7 @@ static int do_write(connection *c) {
- static void do_work(connection *c) {
- connection_assert_ref(c);
-
-- c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
-+ pa_core_get_mainloop(c->protocol->core)->defer_enable(c->defer_event, 0);
-
- if (c->dead)
- return;
-@@ -1273,6 +1275,7 @@ fail:
- pa_asyncmsgq_post(c->sink_input->sink->asyncmsgq, PA_MSGOBJECT(c->sink_input), SINK_INPUT_MESSAGE_DISABLE_PREBUF, NULL, 0, NULL, NULL);
- } else
- connection_unlink(c);
-+
- }
-
- static void io_callback(pa_iochannel*io, void *userdata) {
-@@ -1562,8 +1565,8 @@ void pa_esound_protocol_connect(pa_esound_protocol *p, pa_iochannel *io, pa_esou
- else
- c->auth_timeout_event = NULL;
-
-- c->defer_event = p->core->mainloop->defer_new(p->core->mainloop, defer_callback, c);
-- p->core->mainloop->defer_enable(c->defer_event, 0);
-+ c->defer_event = pa_core_get_mainloop(p->core)->defer_new(pa_core_get_mainloop(p->core), defer_callback, c);
-+ pa_core_get_mainloop(p->core)->defer_enable(c->defer_event, 0);
-
- pa_idxset_put(p->connections, c, &c->index);
- }
-diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
-index bbb03c3..64024df 100644
---- a/src/pulsecore/protocol-http.c
-+++ b/src/pulsecore/protocol-http.c
-@@ -30,7 +30,6 @@
- #include <pulse/xmalloc.h>
- #include <pulse/timeval.h>
-
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-util.h>
- #include <pulsecore/ioline.h>
- #include <pulsecore/thread-mq.h>
-@@ -458,6 +457,7 @@ static void handle_listen(struct connection *c) {
- pa_source *source;
- pa_sink *sink;
- uint32_t idx;
-+ pa_idxset *sinks, *sources;
-
- http_response(c, 200, "OK", MIME_HTML);
-
-@@ -471,7 +471,9 @@ static void handle_listen(struct connection *c) {
- return;
- }
-
-- PA_IDXSET_FOREACH(sink, c->protocol->core->sinks, idx) {
-+ sinks = pa_core_get_sinks(c->protocol->core);
-+
-+ PA_IDXSET_FOREACH(sink, sinks, idx) {
- char *t, *m;
-
- t = escape_html(pa_strna(pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_DESCRIPTION)));
-@@ -484,13 +486,16 @@ static void handle_listen(struct connection *c) {
- pa_xfree(t);
- pa_xfree(m);
- }
-+ pa_idxset_free(sinks, NULL);
-
- pa_ioline_puts(c->line,
- "</p>\n"
- "<h2>Sources</h2>\n"
- "<p>\n");
-
-- PA_IDXSET_FOREACH(source, c->protocol->core->sources, idx) {
-+ sources = pa_core_get_sources(c->protocol->core);
-+
-+ PA_IDXSET_FOREACH(source, sources, idx) {
- char *t, *m;
-
- if (source->monitor_of)
-@@ -507,6 +512,7 @@ static void handle_listen(struct connection *c) {
- pa_xfree(t);
-
- }
-+ pa_idxset_free(sources, NULL);
-
- pa_ioline_puts(c->line,
- "</p>\n"
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index cbb6ae6..4cae6df 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -45,7 +45,6 @@
- #include <pulsecore/pdispatch.h>
- #include <pulsecore/pstream-util.h>
- #include <pulsecore/namereg.h>
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/log.h>
-@@ -1204,7 +1203,7 @@ static void native_connection_unlink(pa_native_connection *c) {
- pa_pstream_unlink(c->pstream);
-
- if (c->auth_timeout_event) {
-- c->protocol->core->mainloop->time_free(c->auth_timeout_event);
-+ pa_core_get_mainloop(c->protocol->core)->time_free(c->auth_timeout_event);
- c->auth_timeout_event = NULL;
- }
-
-@@ -1875,7 +1874,7 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u
- int ret = PA_ERR_INVALID;
- uint8_t n_formats = 0;
- pa_format_info *format;
-- pa_idxset *formats = NULL;
-+ pa_idxset *sinks = NULL, *formats = NULL;
- uint32_t i;
-
- pa_native_connection_assert_ref(c);
-@@ -2014,8 +2013,9 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u
- }
-
- if (sink_index != PA_INVALID_INDEX) {
-+ sinks = pa_core_get_sinks(c->protocol->core);
-
-- if (!(sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index))) {
-+ if (!(sink = pa_idxset_get_by_index(sinks, sink_index))) {
- pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
- goto finish;
- }
-@@ -2105,6 +2105,8 @@ finish:
- pa_proplist_free(p);
- if (formats)
- pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free);
-+ if (sinks)
-+ pa_idxset_free(sinks, NULL);
- }
-
- static void command_delete_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -2203,7 +2205,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin
- int ret = PA_ERR_INVALID;
- uint8_t n_formats = 0;
- pa_format_info *format;
-- pa_idxset *formats = NULL;
-+ pa_idxset *sources = NULL, *sink_inputs = NULL, *formats = NULL;
- uint32_t i;
-
- pa_native_connection_assert_ref(c);
-@@ -2333,8 +2335,9 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin
- }
-
- if (source_index != PA_INVALID_INDEX) {
-+ sources = pa_core_get_sources(c->protocol->core);
-
-- if (!(source = pa_idxset_get_by_index(c->protocol->core->sources, source_index))) {
-+ if (!(source = pa_idxset_get_by_index(sources, source_index))) {
- pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
- goto finish;
- }
-@@ -2348,8 +2351,9 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin
- }
-
- if (direct_on_input_idx != PA_INVALID_INDEX) {
-+ sink_inputs = pa_core_get_sink_inputs(c->protocol->core);
-
-- if (!(direct_on_input = pa_idxset_get_by_index(c->protocol->core->sink_inputs, direct_on_input_idx))) {
-+ if (!(direct_on_input = pa_idxset_get_by_index(sink_inputs, direct_on_input_idx))) {
- pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
- goto finish;
- }
-@@ -2419,6 +2423,10 @@ finish:
- pa_proplist_free(p);
- if (formats)
- pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free);
-+ if (sources)
-+ pa_idxset_free(sources, NULL);
-+ if (sink_inputs)
-+ pa_idxset_free(sink_inputs, NULL);
- }
-
- static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -2475,7 +2483,7 @@ static void setup_srbchannel(pa_native_connection *c, pa_mem_type_t shm_type) {
- return;
- }
-
-- if (!(c->rw_mempool = pa_mempool_new(shm_type, c->protocol->core->shm_size, true))) {
-+ if (!(c->rw_mempool = pa_core_new_mempool(c->protocol->core, shm_type, true))) {
- pa_log_warn("Disabling srbchannel, reason: Failed to allocate shared "
- "writable memory pool.");
- return;
-@@ -2490,7 +2498,7 @@ static void setup_srbchannel(pa_native_connection *c, pa_mem_type_t shm_type) {
- }
- pa_mempool_set_is_remote_writable(c->rw_mempool, true);
-
-- srb = pa_srbchannel_new(c->protocol->core->mainloop, c->rw_mempool);
-+ srb = pa_srbchannel_new(pa_core_get_mainloop(c->protocol->core), c->rw_mempool);
- if (!srb) {
- pa_log_debug("Failed to create srbchannel");
- goto fail;
-@@ -2634,14 +2642,14 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
-
- c->authorized = true;
- if (c->auth_timeout_event) {
-- c->protocol->core->mainloop->time_free(c->auth_timeout_event);
-+ pa_core_get_mainloop(c->protocol->core)->time_free(c->auth_timeout_event);
- c->auth_timeout_event = NULL;
- }
- }
-
- /* Enable shared memory and memfd support if possible */
- do_shm =
-- pa_mempool_is_shared(c->protocol->core->mempool) &&
-+ pa_mempool_is_shared(pa_core_get_mempool(c->protocol->core)) &&
- c->is_local;
-
- pa_log_debug("SHM possible: %s", pa_yes_no(do_shm));
-@@ -2668,7 +2676,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- * 64-bit kernel. Thus influence them to use the POSIX shared memory model
- * instead. Check commit 451d1d676237c81 for further details. */
- do_memfd =
-- c->version >= 32 && do_shm && pa_mempool_is_memfd_backed(c->protocol->core->mempool);
-+ c->version >= 32 && do_shm && pa_mempool_is_memfd_backed(pa_core_get_mempool(c->protocol->core));
-
- shm_type = PA_MEM_TYPE_PRIVATE;
- if (do_shm) {
-@@ -2710,13 +2718,13 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- if (shm_type == PA_MEM_TYPE_SHARED_MEMFD) {
- const char *reason;
-
-- if (pa_pstream_register_memfd_mempool(c->pstream, c->protocol->core->mempool, &reason))
-+ if (pa_pstream_register_memfd_mempool(c->pstream, pa_core_get_mempool(c->protocol->core), &reason))
- pa_log("Failed to register memfd mempool. Reason: %s", reason);
- }
-
- setup_srbchannel(c, shm_type);
-
-- pa_hook_fire(&c->protocol->core->hooks[PA_CORE_HOOK_CLIENT_AUTH], c->client);
-+ pa_core_hook_fire(c->protocol->core, PA_CORE_HOOK_CLIENT_AUTH, c->client);
- }
-
- static void command_register_memfd_shmid(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -2842,7 +2850,7 @@ static void command_stat(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
-
- CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
-
-- stat = pa_mempool_get_stat(c->protocol->core->mempool);
-+ stat = pa_mempool_get_stat(pa_core_get_mempool(c->protocol->core));
-
- reply = reply_new(tag);
- pa_tagstruct_putu32(reply, (uint32_t) pa_atomic_load(&stat->n_allocated));
-@@ -3059,7 +3067,7 @@ static void command_play_sample(pa_pdispatch *pd, uint32_t command, uint32_t tag
- CHECK_VALIDITY(c->pstream, name && pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID);
-
- if (sink_index != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index);
-+ sink = pa_core_get_sink(c->protocol->core, sink_index);
- else
- sink = pa_namereg_get(c->protocol->core, sink_name, PA_NAMEREG_SINK);
-
-@@ -3522,31 +3530,31 @@ static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, p
-
- if (command == PA_COMMAND_GET_SINK_INFO) {
- if (idx != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
-+ sink = pa_core_get_sink(c->protocol->core, idx);
- else
- sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK);
- } else if (command == PA_COMMAND_GET_SOURCE_INFO) {
- if (idx != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
-+ source = pa_core_get_source(c->protocol->core, idx);
- else
- source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE);
- } else if (command == PA_COMMAND_GET_CARD_INFO) {
- if (idx != PA_INVALID_INDEX)
-- card = pa_idxset_get_by_index(c->protocol->core->cards, idx);
-+ card = pa_core_get_card(c->protocol->core, idx);
- else
- card = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_CARD);
- } else if (command == PA_COMMAND_GET_CLIENT_INFO)
-- client = pa_idxset_get_by_index(c->protocol->core->clients, idx);
-+ client = pa_core_get_client(c->protocol->core, idx);
- else if (command == PA_COMMAND_GET_MODULE_INFO)
-- module = pa_idxset_get_by_index(c->protocol->core->modules, idx);
-+ module = pa_core_get_module(c->protocol->core, idx);
- else if (command == PA_COMMAND_GET_SINK_INPUT_INFO)
-- si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
-+ si = pa_core_get_sink_input(c->protocol->core, idx);
- else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO)
-- so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
-+ so = pa_core_get_source_output(c->protocol->core, idx);
- else {
- pa_assert(command == PA_COMMAND_GET_SAMPLE_INFO);
- if (idx != PA_INVALID_INDEX)
-- sce = pa_idxset_get_by_index(c->protocol->core->scache, idx);
-+ sce = pa_core_get_scache_entry(c->protocol->core, idx);
- else
- sce = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SAMPLE);
- }
-@@ -3596,22 +3604,22 @@ static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t t
- reply = reply_new(tag);
-
- if (command == PA_COMMAND_GET_SINK_INFO_LIST)
-- i = c->protocol->core->sinks;
-+ i = pa_core_get_sinks(c->protocol->core);
- else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
-- i = c->protocol->core->sources;
-+ i = pa_core_get_sources(c->protocol->core);
- else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST)
-- i = c->protocol->core->clients;
-+ i = pa_core_get_clients(c->protocol->core);
- else if (command == PA_COMMAND_GET_CARD_INFO_LIST)
-- i = c->protocol->core->cards;
-+ i = pa_core_get_cards(c->protocol->core);
- else if (command == PA_COMMAND_GET_MODULE_INFO_LIST)
-- i = c->protocol->core->modules;
-+ i = pa_core_get_modules(c->protocol->core);
- else if (command == PA_COMMAND_GET_SINK_INPUT_INFO_LIST)
-- i = c->protocol->core->sink_inputs;
-+ i = pa_core_get_sink_inputs(c->protocol->core);
- else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST)
-- i = c->protocol->core->source_outputs;
-+ i = pa_core_get_source_outputs(c->protocol->core);
- else {
- pa_assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST);
-- i = c->protocol->core->scache;
-+ i = pa_core_get_scache(c->protocol->core);
- }
-
- if (i) {
-@@ -3635,9 +3643,12 @@ static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t t
- scache_fill_tagstruct(c, reply, p);
- }
- }
-+
-+ pa_idxset_free(i, NULL);
- }
-
- pa_pstream_send_tagstruct(c->pstream, reply);
-+ return;
- }
-
- static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-@@ -3658,6 +3669,9 @@ static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t
-
- CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
-
-+ def_sink = pa_namereg_get_default_sink(c->protocol->core);
-+ def_source = pa_namereg_get_default_source(c->protocol->core);
-+
- reply = reply_new(tag);
- pa_tagstruct_puts(reply, PACKAGE_NAME);
- pa_tagstruct_puts(reply, PACKAGE_VERSION);
-@@ -3670,18 +3684,16 @@ static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t
- pa_tagstruct_puts(reply, h);
- pa_xfree(h);
-
-- fixup_sample_spec(c, &fixed_ss, &c->protocol->core->default_sample_spec);
-+ fixup_sample_spec(c, &fixed_ss, pa_core_get_sample_spec(c->protocol->core));
- pa_tagstruct_put_sample_spec(reply, &fixed_ss);
-
-- def_sink = pa_namereg_get_default_sink(c->protocol->core);
- pa_tagstruct_puts(reply, def_sink ? def_sink->name : NULL);
-- def_source = pa_namereg_get_default_source(c->protocol->core);
- pa_tagstruct_puts(reply, def_source ? def_source->name : NULL);
-
-- pa_tagstruct_putu32(reply, c->protocol->core->cookie);
-+ pa_tagstruct_putu32(reply, pa_core_get_cookie(c->protocol->core));
-
- if (c->version >= 15)
-- pa_tagstruct_put_channel_map(reply, &c->protocol->core->default_channel_map);
-+ pa_tagstruct_put_channel_map(reply, pa_core_get_channel_map(c->protocol->core));
-
- pa_pstream_send_tagstruct(c->pstream, reply);
- }
-@@ -3766,24 +3778,24 @@ static void command_set_volume(
-
- case PA_COMMAND_SET_SINK_VOLUME:
- if (idx != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
-+ sink = pa_core_get_sink(c->protocol->core, idx);
- else
- sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK);
- break;
-
- case PA_COMMAND_SET_SOURCE_VOLUME:
- if (idx != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
-+ source = pa_core_get_source(c->protocol->core, idx);
- else
- source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE);
- break;
-
- case PA_COMMAND_SET_SINK_INPUT_VOLUME:
-- si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
-+ si = pa_core_get_sink_input(c->protocol->core, idx);
- break;
-
- case PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME:
-- so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
-+ so = pa_core_get_source_output(c->protocol->core, idx);
- break;
-
- default:
-@@ -3861,7 +3873,7 @@ static void command_set_mute(
-
- case PA_COMMAND_SET_SINK_MUTE:
- if (idx != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
-+ sink = pa_core_get_sink(c->protocol->core, idx);
- else
- sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK);
-
-@@ -3869,18 +3881,18 @@ static void command_set_mute(
-
- case PA_COMMAND_SET_SOURCE_MUTE:
- if (idx != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
-+ source = pa_core_get_source(c->protocol->core, idx);
- else
- source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE);
-
- break;
-
- case PA_COMMAND_SET_SINK_INPUT_MUTE:
-- si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
-+ si = pa_core_get_sink_input(c->protocol->core, idx);
- break;
-
- case PA_COMMAND_SET_SOURCE_OUTPUT_MUTE:
-- so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
-+ so = pa_core_get_source_output(c->protocol->core, idx);
- break;
-
- default:
-@@ -4425,7 +4437,7 @@ static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- if (command == PA_COMMAND_KILL_CLIENT) {
- pa_client *client;
-
-- client = pa_idxset_get_by_index(c->protocol->core->clients, idx);
-+ client = pa_core_get_client(c->protocol->core, idx);
- CHECK_VALIDITY(c->pstream, client, tag, PA_ERR_NOENTITY);
-
- pa_native_connection_ref(c);
-@@ -4434,7 +4446,7 @@ static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
- } else if (command == PA_COMMAND_KILL_SINK_INPUT) {
- pa_sink_input *s;
-
-- s = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
-+ s = pa_core_get_sink_input(c->protocol->core, idx);
- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
-
- pa_native_connection_ref(c);
-@@ -4444,7 +4456,7 @@ static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
-
- pa_assert(command == PA_COMMAND_KILL_SOURCE_OUTPUT);
-
-- s = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
-+ s = pa_core_get_source_output(c->protocol->core, idx);
- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
-
- pa_native_connection_ref(c);
-@@ -4500,7 +4512,7 @@ static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t t
- }
-
- CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
-- m = pa_idxset_get_by_index(c->protocol->core->modules, idx);
-+ m = pa_core_get_module(c->protocol->core, idx);
- CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOENTITY);
-
- pa_module_unload_request(m, false);
-@@ -4533,10 +4545,10 @@ static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag
- pa_sink_input *si = NULL;
- pa_sink *sink = NULL;
-
-- si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
-+ si = pa_core_get_sink_input(c->protocol->core, idx);
-
- if (idx_device != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx_device);
-+ sink = pa_core_get_sink(c->protocol->core, idx_device);
- else
- sink = pa_namereg_get(c->protocol->core, name_device, PA_NAMEREG_SINK);
-
-@@ -4552,10 +4564,10 @@ static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag
-
- pa_assert(command == PA_COMMAND_MOVE_SOURCE_OUTPUT);
-
-- so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
-+ so = pa_core_get_source_output(c->protocol->core, idx);
-
- if (idx_device != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx_device);
-+ source = pa_core_get_source(c->protocol->core, idx_device);
- else
- source = pa_namereg_get(c->protocol->core, name_device, PA_NAMEREG_SOURCE);
-
-@@ -4605,7 +4617,7 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa
- pa_sink *sink = NULL;
-
- if (idx != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
-+ sink = pa_core_get_sink(c->protocol->core, idx);
- else
- sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK);
-
-@@ -4636,7 +4648,7 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa
- pa_source *source;
-
- if (idx != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
-+ source = pa_core_get_source(c->protocol->core, idx);
- else
- source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE);
-
-@@ -4676,12 +4688,17 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag,
- CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID);
-
- if (idx != PA_INVALID_INDEX)
-- m = pa_idxset_get_by_index(c->protocol->core->modules, idx);
-- else
-- PA_IDXSET_FOREACH(m, c->protocol->core->modules, idx)
-+ m = pa_core_get_module(c->protocol->core, idx);
-+ else {
-+ pa_idxset *modules = pa_core_get_modules (c->protocol->core);
-+
-+ PA_IDXSET_FOREACH(m, modules, idx)
- if (pa_streq(name, m->name))
- break;
-
-+ pa_idxset_free (modules, NULL);
-+ }
-+
- CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION);
- CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID);
-
-@@ -4717,7 +4734,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_
- CHECK_VALIDITY(c->pstream, profile_name, tag, PA_ERR_INVALID);
-
- if (idx != PA_INVALID_INDEX)
-- card = pa_idxset_get_by_index(c->protocol->core->cards, idx);
-+ card = pa_core_get_card(c->protocol->core, idx);
- else
- card = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_CARD);
-
-@@ -4761,7 +4778,7 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command,
- pa_sink *sink;
-
- if (idx != PA_INVALID_INDEX)
-- sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
-+ sink = pa_core_get_sink(c->protocol->core, idx);
- else
- sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK);
-
-@@ -4777,7 +4794,7 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command,
- pa_assert(command == PA_COMMAND_SET_SOURCE_PORT);
-
- if (idx != PA_INVALID_INDEX)
-- source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
-+ source = pa_core_get_source(c->protocol->core, idx);
- else
- source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE);
-
-@@ -4818,7 +4835,7 @@ static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command,
- CHECK_VALIDITY(c->pstream, port_name, tag, PA_ERR_INVALID);
-
- if (idx != PA_INVALID_INDEX)
-- card = pa_idxset_get_by_index(c->protocol->core->cards, idx);
-+ card = pa_core_get_card(c->protocol->core, idx);
- else
- card = pa_namereg_get(c->protocol->core, card_name, PA_NAMEREG_CARD);
-
-@@ -5003,7 +5020,7 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o
- pa_memblock_ref(u->memchunk.memblock);
- u->length = 0;
- } else {
-- u->memchunk.memblock = pa_memblock_new(c->protocol->core->mempool, u->length);
-+ u->memchunk.memblock = pa_memblock_new(pa_core_get_mempool(c->protocol->core), u->length);
- u->memchunk.index = u->memchunk.length = 0;
- }
- }
-@@ -5181,7 +5198,7 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati
-
- c->rw_mempool = NULL;
-
-- c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool);
-+ c->pstream = pa_pstream_new(pa_core_get_mainloop(p->core), io, pa_core_get_mempool(p->core));
- pa_pstream_set_receive_packet_callback(c->pstream, pstream_packet_callback, c);
- pa_pstream_set_receive_memblock_callback(c->pstream, pstream_memblock_callback, c);
- pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
-@@ -5189,7 +5206,7 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati
- pa_pstream_set_revoke_callback(c->pstream, pstream_revoke_callback, c);
- pa_pstream_set_release_callback(c->pstream, pstream_release_callback, c);
-
-- c->pdispatch = pa_pdispatch_new(p->core->mainloop, true, command_table, PA_COMMAND_MAX);
-+ c->pdispatch = pa_pdispatch_new(pa_core_get_mainloop(p->core), true, command_table, PA_COMMAND_MAX);
-
- c->record_streams = pa_idxset_new(NULL, NULL);
- c->output_streams = pa_idxset_new(NULL, NULL);
-diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
-index bd9136b..e1ead2f 100644
---- a/src/pulsecore/protocol-simple.c
-+++ b/src/pulsecore/protocol-simple.c
-@@ -34,7 +34,6 @@
- #include <pulsecore/sample-util.h>
- #include <pulsecore/namereg.h>
- #include <pulsecore/log.h>
--#include <pulsecore/core-struct.h>
- #include <pulsecore/core-error.h>
- #include <pulsecore/atomic.h>
- #include <pulsecore/thread-mq.h>
-@@ -169,7 +168,7 @@ static int do_read(connection *c) {
- }
-
- if (!c->playback.current_memblock) {
-- pa_assert_se(c->playback.current_memblock = pa_memblock_new(c->protocol->core->mempool, (size_t) -1));
-+ pa_assert_se(c->playback.current_memblock = pa_memblock_new(pa_core_get_mempool(c->protocol->core), (size_t) -1));
- c->playback.memblock_index = 0;
-
- space = pa_memblock_get_length(c->playback.current_memblock);
-@@ -737,7 +736,7 @@ int pa_simple_options_parse(pa_simple_options *o, pa_core *c, pa_modargs *ma) {
- pa_assert(PA_REFCNT_VALUE(o) >= 1);
- pa_assert(ma);
-
-- o->sample_spec = c->default_sample_spec;
-+ o->sample_spec = *pa_core_get_sample_spec(c);
- if (pa_modargs_get_sample_spec_and_channel_map(ma, &o->sample_spec, &o->channel_map, PA_CHANNEL_MAP_DEFAULT) < 0) {
- pa_log("Failed to parse sample type specification.");
- return -1;
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index 20249ec..a5cb1ee 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -2892,17 +2892,21 @@ int pa_sink_suspend_all(pa_core *c, bool suspend, pa_suspend_cause_t cause) {
- pa_sink *sink;
- uint32_t idx;
- int ret = 0;
-+ pa_idxset *sinks;
-
- pa_core_assert_ref(c);
- pa_assert_ctl_context();
- pa_assert(cause != 0);
-
-- PA_IDXSET_FOREACH(sink, c->sinks, idx) {
-+ sinks = pa_core_get_sinks(c);
-+
-+ PA_IDXSET_FOREACH(sink, sinks, idx) {
- int r;
-
- if ((r = pa_sink_suspend(sink, suspend, cause)) < 0)
- ret = r;
- }
-+ pa_idxset_free(sinks, NULL);
-
- return ret;
- }
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index 7a33d5b..5f42965 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -2254,12 +2254,15 @@ int pa_source_suspend_all(pa_core *c, bool suspend, pa_suspend_cause_t cause) {
- pa_source *source;
- uint32_t idx;
- int ret = 0;
-+ pa_idxset *sources;
-
- pa_core_assert_ref(c);
- pa_assert_ctl_context();
- pa_assert(cause != 0);
-
-- for (source = PA_SOURCE(pa_idxset_first(c->sources, &idx)); source; source = PA_SOURCE(pa_idxset_next(c->sources, &idx))) {
-+ sources = pa_core_get_sources(c);
-+
-+ PA_IDXSET_FOREACH(source, sources, idx) {
- int r;
-
- if (source->monitor_of)
-@@ -2268,6 +2271,7 @@ int pa_source_suspend_all(pa_core *c, bool suspend, pa_suspend_cause_t cause) {
- if ((r = pa_source_suspend(source, suspend, cause)) < 0)
- ret = r;
- }
-+ pa_idxset_free(sources, NULL);
-
- return ret;
- }
---
-2.9.3
-
diff --git a/0011-Add-access-checks.patch b/0011-Add-access-checks.patch
deleted file mode 100644
index fb9ec60..0000000
--- a/0011-Add-access-checks.patch
+++ /dev/null
@@ -1,840 +0,0 @@
-From 70721d64d1bd4428d59cb4038eb56d9d79cf24fc Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Fri, 27 Jan 2017 16:41:41 +0100
-Subject: [PATCH 11/18] Add access checks
-
-Put some access control checks in various core objects
----
- src/pulsecore/card.c | 6 ++
- src/pulsecore/client.c | 3 +
- src/pulsecore/core-scache.c | 12 +++
- src/pulsecore/core-subscribe.c | 6 +-
- src/pulsecore/core.c | 176 ++++++++++++++++++++++++++++++++++----
- src/pulsecore/core.h | 4 +
- src/pulsecore/module.c | 18 ++++
- src/pulsecore/namereg.c | 27 +++++-
- src/pulsecore/protocol-native.c | 1 +
- src/pulsecore/sink-input.c | 27 ++++++
- src/pulsecore/sink.c | 22 +++++
- src/pulsecore/sound-file-stream.c | 3 +
- src/pulsecore/source-output.c | 21 +++++
- src/pulsecore/source.c | 21 +++++
- 14 files changed, 325 insertions(+), 22 deletions(-)
-
-diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
-index 39f4261..5018d07 100644
---- a/src/pulsecore/card.c
-+++ b/src/pulsecore/card.c
-@@ -296,6 +296,9 @@ int pa_card_set_profile(pa_card *c, pa_card_profile *profile, bool save) {
- pa_assert(profile);
- pa_assert(profile->card == c);
-
-+ if (!pa_core_check_access_sync(c->core, PA_ACCESS_HOOK_SET_CARD_PROFILE, c->index, 0, NULL))
-+ return -PA_ERR_ACCESS;
-+
- if (!c->set_profile) {
- pa_log_debug("set_profile() operation not implemented for card %u \"%s\"", c->index, c->name);
- return -PA_ERR_NOTIMPLEMENTED;
-@@ -378,6 +381,9 @@ int pa_card_suspend(pa_card *c, bool suspend, pa_suspend_cause_t cause) {
- pa_assert(c);
- pa_assert(cause != 0);
-
-+ if (!pa_core_check_access_sync(c->core, PA_ACCESS_HOOK_SUSPEND_CARD, c->index, 0, NULL))
-+ return -1;
-+
- suspend_cause = c->suspend_cause;
-
- if (suspend)
-diff --git a/src/pulsecore/client.c b/src/pulsecore/client.c
-index 24faa1f..fa10ae1 100644
---- a/src/pulsecore/client.c
-+++ b/src/pulsecore/client.c
-@@ -112,6 +112,9 @@ void pa_client_free(pa_client *c) {
- void pa_client_kill(pa_client *c) {
- pa_assert(c);
-
-+ if (!pa_core_check_access_sync(c->core, PA_ACCESS_HOOK_KILL_CLIENT, c->index, 0, NULL))
-+ return;
-+
- if (!c->kill) {
- pa_log_warn("kill() operation not implemented for client %u", c->index);
- return;
-diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c
-index 8d54720..4eaa997 100644
---- a/src/pulsecore/core-scache.c
-+++ b/src/pulsecore/core-scache.c
-@@ -97,6 +97,9 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name, bool *new_
- pa_assert(name);
- pa_assert(new_sample);
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_ADD_SAMPLE, PA_INVALID_INDEX, 0, name))
-+ return NULL;
-+
- if ((e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE))) {
- if (e->memchunk.memblock)
- pa_memblock_unref(e->memchunk.memblock);
-@@ -281,6 +284,9 @@ int pa_scache_remove_item(pa_core *c, const char *name) {
- if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE)))
- return -1;
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_REMOVE_SAMPLE, PA_INVALID_INDEX, 0, name))
-+ return -1;
-+
- pa_assert_se(pa_idxset_remove_by_data(c->scache, e, NULL) == e);
-
- pa_log_debug("Removed sample \"%s\"", name);
-@@ -293,6 +299,9 @@ int pa_scache_remove_item(pa_core *c, const char *name) {
- void pa_scache_free_all(pa_core *c) {
- pa_assert(c);
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_REMOVE_SAMPLE, PA_INVALID_INDEX, 0, NULL))
-+ return;
-+
- pa_idxset_remove_all(c->scache, (pa_free_cb_t) free_entry);
-
- if (c->scache_auto_unload_event) {
-@@ -314,6 +323,9 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
- if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE)))
- return -1;
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_PLAY_SAMPLE, e->index, 0, NULL))
-+ return -1;
-+
- merged = pa_proplist_new();
- pa_proplist_sets(merged, PA_PROP_MEDIA_NAME, name);
- pa_proplist_sets(merged, PA_PROP_EVENT_ID, name);
-diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
-index 88d900b..e60af21 100644
---- a/src/pulsecore/core-subscribe.c
-+++ b/src/pulsecore/core-subscribe.c
-@@ -169,8 +169,10 @@ static void defer_cb(pa_mainloop_api *m, pa_defer_event *de, void *userdata) {
-
- for (s = c->subscriptions; s; s = s->next) {
-
-- if (!s->dead && pa_subscription_match_flags(s->mask, e->type))
-- s->callback(c, e->type, e->index, s->userdata);
-+ if (!s->dead && pa_subscription_match_flags(s->mask, e->type)) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_FILTER_SUBSCRIBE_EVENT, e->index, e->type, NULL))
-+ s->callback(c, e->type, e->index, s->userdata);
-+ }
- }
-
- #ifdef DEBUG
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index b068f5d..6b9fb8b 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -257,6 +257,8 @@ int pa_core_exit(pa_core *c, bool force, int retval) {
-
- if (c->disallow_exit && !force)
- return -1;
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_EXIT_DAEMON, PA_INVALID_INDEX, 0, NULL))
-+ return -1;
-
- c->mainloop->quit(c->mainloop, retval);
- return 0;
-@@ -330,70 +332,212 @@ pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_cli
- return pa_mempool_new(shm_type, c->shm_size, per_client);
- }
-
-+bool pa_core_check_access_sync(pa_core *c, pa_access_hook_t hook, uint32_t idx, pa_subscription_event_type_t event, const char *name) {
-+ pa_access_data data;
-+
-+ pa_assert(c);
-+
-+ if (c->current_client == NULL)
-+ return true;
-+
-+ data.hook = hook;
-+ data.client_index = c->current_client->index;
-+ data.object_index = idx;
-+ data.event = event;
-+ data.name = name;
-+ data.complete_cb = NULL;
-+
-+ return pa_hook_fire(&c->access[data.hook], &data) == PA_HOOK_OK;
-+}
-+
-+pa_hook_result_t pa_core_check_access(pa_core *c, pa_access_data *data) {
-+ pa_assert(c);
-+ pa_assert(data);
-+
-+ if (c->current_client == NULL)
-+ return PA_HOOK_OK;
-+
-+ data->client_index = c->current_client->index;
-+
-+ return pa_hook_fire(&c->access[data->hook], data);
-+}
-+
- /* FIXME: Should these be taking a ref during the copy? */
-
- pa_idxset* pa_core_get_modules(pa_core *c) {
-- return pa_idxset_copy(c->modules, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_module *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->modules, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_MODULE, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_clients(pa_core *c) {
-- return pa_idxset_copy(c->clients, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_client *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->clients, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_CLIENT, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_cards(pa_core *c) {
-- return pa_idxset_copy(c->cards, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_card *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->cards, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_CARD, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_sinks(pa_core *c) {
-- return pa_idxset_copy(c->sinks, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_sink *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->sinks, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_sources(pa_core *c) {
-- return pa_idxset_copy(c->sources, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_source *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->sources, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_sink_inputs(pa_core *c) {
-- return pa_idxset_copy(c->sink_inputs, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_sink_input *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->sink_inputs, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK_INPUT, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_source_outputs(pa_core *c) {
-- return pa_idxset_copy(c->source_outputs, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_source_output *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->source_outputs, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_idxset* pa_core_get_scache(pa_core *c) {
-- return pa_idxset_copy(c->scache, NULL);
-+ pa_idxset *s;
-+ uint32_t idx;
-+ pa_scache_entry *e;
-+
-+ s = pa_idxset_new(NULL, NULL);
-+ PA_IDXSET_FOREACH(e, c->scache, idx) {
-+ if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SAMPLE, e->index, 0, NULL))
-+ pa_idxset_put(s, e, NULL);
-+ }
-+ return s;
- }
-
- pa_module* pa_core_get_module(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->modules, idx);
-+ pa_module *e = pa_idxset_get_by_index(c->modules, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_MODULE, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_client* pa_core_get_client(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->clients, idx);
-+ pa_client *e = pa_idxset_get_by_index(c->clients, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_CLIENT, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_card* pa_core_get_card(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->cards, idx);
-+ pa_card *e = pa_idxset_get_by_index(c->cards, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_CARD, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_sink* pa_core_get_sink(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->sinks, idx);
-+ pa_sink *e = pa_idxset_get_by_index(c->sinks, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_source* pa_core_get_source(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->sources, idx);
-+ pa_source *e = pa_idxset_get_by_index(c->sources, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_sink_input* pa_core_get_sink_input(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->sink_inputs, idx);
-+ pa_sink_input *e = pa_idxset_get_by_index(c->sink_inputs, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK_INPUT, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_source_output* pa_core_get_source_output(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->source_outputs, idx);
-+ pa_source_output *e = pa_idxset_get_by_index(c->source_outputs, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- pa_scache_entry* pa_core_get_scache_entry(pa_core *c, uint32_t idx) {
-- return pa_idxset_get_by_index(c->scache, idx);
-+ pa_scache_entry *e = pa_idxset_get_by_index(c->scache, idx);
-+
-+ if (e == NULL || !pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SAMPLE, e->index, 0, NULL))
-+ return NULL;
-+
-+ return e;
- }
-
- const pa_sample_spec* pa_core_get_sample_spec(pa_core *c) {
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 87b055d..316a88e 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -192,4 +192,8 @@ const pa_channel_map* pa_core_get_channel_map(pa_core *c);
-
- uint32_t pa_core_get_cookie(pa_core *c);
-
-+bool pa_core_check_access_sync(pa_core *c, pa_access_hook_t hook, uint32_t idx, pa_subscription_event_type_t event, const char *name);
-+
-+pa_hook_result_t pa_core_check_access(pa_core *c, pa_access_data *data);
-+
- #endif
-diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
-index da2abe0..bcc1a0e 100644
---- a/src/pulsecore/module.c
-+++ b/src/pulsecore/module.c
-@@ -120,6 +120,9 @@ pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) {
- if (c->disallow_module_loading)
- goto fail;
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_LOAD_MODULE, PA_INVALID_INDEX, 0, name))
-+ goto fail;
-+
- m = pa_xnew(pa_module, 1);
- m->name = pa_xstrdup(name);
- m->argument = pa_xstrdup(argument);
-@@ -280,6 +283,9 @@ void pa_module_unload(pa_module *m, bool force) {
- if (m->core->disallow_module_loading && !force)
- return;
-
-+ if (!pa_core_check_access_sync(m->core, PA_ACCESS_HOOK_UNLOAD_MODULE, m->index, 0, NULL))
-+ return;
-+
- if (!(m = pa_idxset_remove_by_data(m->core->modules, m, NULL)))
- return;
-
-@@ -294,6 +300,9 @@ void pa_module_unload_by_index(pa_core *c, uint32_t idx, bool force) {
- if (c->disallow_module_loading && !force)
- return;
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_UNLOAD_MODULE, idx, 0, NULL))
-+ return;
-+
- if (!(m = pa_idxset_remove_by_index(c->modules, idx)))
- return;
-
-@@ -312,6 +321,9 @@ void pa_module_unload_all(pa_core *c) {
- if (pa_idxset_isempty(c->modules))
- return;
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_UNLOAD_MODULE, PA_INVALID_INDEX, 0, NULL))
-+ return;
-+
- /* Unload modules in reverse order by default */
- indices = pa_xnew(uint32_t, pa_idxset_size(c->modules));
- i = 0;
-@@ -357,6 +369,9 @@ void pa_module_unload_request(pa_module *m, bool force) {
- if (m->core->disallow_module_loading && !force)
- return;
-
-+ if (!pa_core_check_access_sync(m->core, PA_ACCESS_HOOK_UNLOAD_MODULE, m->index, 0, NULL))
-+ return;
-+
- m->unload_requested = true;
- pa_hashmap_put(m->core->modules_pending_unload, m, m);
-
-@@ -370,6 +385,9 @@ void pa_module_unload_request_by_index(pa_core *c, uint32_t idx, bool force) {
- pa_module *m;
- pa_assert(c);
-
-+ if (!pa_core_check_access_sync(c, PA_ACCESS_HOOK_UNLOAD_MODULE, idx, 0, NULL))
-+ return;
-+
- if (!(m = pa_idxset_get_by_index(c->modules, idx)))
- return;
-
-diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
-index 699fa1b..fb68faf 100644
---- a/src/pulsecore/namereg.c
-+++ b/src/pulsecore/namereg.c
-@@ -232,9 +232,20 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) {
- !pa_namereg_is_valid_name(name))
- return NULL;
-
-- if ((e = pa_hashmap_get(c->namereg, name)))
-- if (e->type == type)
-+ if ((e = pa_hashmap_get(c->namereg, name)) && e->type == type) {
-+ if (type == PA_NAMEREG_SINK &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK, ((pa_sink*)e->data)->index, 0, NULL))
- return e->data;
-+ else if (type == PA_NAMEREG_SOURCE &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE, ((pa_source*)e->data)->index, 0, NULL))
-+ return e->data;
-+ else if (type == PA_NAMEREG_SAMPLE &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SAMPLE, ((pa_scache_entry*)e->data)->index, 0, NULL))
-+ return e->data;
-+ else if (type == PA_NAMEREG_CARD &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_CARD, ((pa_card*)e->data)->index, 0, NULL))
-+ return e->data;
-+ }
-
- if (pa_atou(name, &idx) < 0)
- return NULL;
-@@ -257,6 +268,9 @@ pa_sink* pa_namereg_set_default_sink(pa_core*c, pa_sink *s) {
- if (s && !PA_SINK_IS_LINKED(pa_sink_get_state(s)))
- return NULL;
-
-+ if (s && !pa_core_check_access_sync(c, PA_ACCESS_HOOK_SET_DEFAULT_SINK, s->index, 0, NULL))
-+ return NULL;
-+
- if (c->default_sink != s) {
- c->default_sink = s;
- pa_core_hook_fire(c, PA_CORE_HOOK_DEFAULT_SINK_CHANGED, c->default_sink);
-@@ -272,6 +286,9 @@ pa_source* pa_namereg_set_default_source(pa_core*c, pa_source *s) {
- if (s && !PA_SOURCE_IS_LINKED(pa_source_get_state(s)))
- return NULL;
-
-+ if (s && !pa_core_check_access_sync(c, PA_ACCESS_HOOK_SET_DEFAULT_SOURCE, s->index, 0, NULL))
-+ return NULL;
-+
- if (c->default_source != s) {
- c->default_source = s;
- pa_core_hook_fire(c, PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED, c->default_source);
-@@ -288,7 +305,8 @@ pa_sink *pa_namereg_get_default_sink(pa_core *c) {
-
- pa_assert(c);
-
-- if (c->default_sink && PA_SINK_IS_LINKED(pa_sink_get_state(c->default_sink)))
-+ if (c->default_sink && PA_SINK_IS_LINKED(pa_sink_get_state(c->default_sink)) &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SINK, c->default_sink->index, 0, NULL))
- return c->default_sink;
-
- sinks = pa_core_get_sinks(c);
-@@ -310,7 +328,8 @@ pa_source *pa_namereg_get_default_source(pa_core *c) {
-
- pa_assert(c);
-
-- if (c->default_source && PA_SOURCE_IS_LINKED(pa_source_get_state(c->default_source)))
-+ if (c->default_source && PA_SOURCE_IS_LINKED(pa_source_get_state(c->default_source)) &&
-+ pa_core_check_access_sync(c, PA_ACCESS_HOOK_VIEW_SOURCE, c->default_source->index, 0, NULL))
- return c->default_source;
-
- sources = pa_core_get_sources(c);
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index 4cae6df..4ff97c4 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -45,6 +45,7 @@
- #include <pulsecore/pdispatch.h>
- #include <pulsecore/pstream-util.h>
- #include <pulsecore/namereg.h>
-+#include <pulsecore/access.h>
- #include <pulsecore/core-scache.h>
- #include <pulsecore/core-subscribe.h>
- #include <pulsecore/log.h>
-diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
-index 9a866b4..00c370a 100644
---- a/src/pulsecore/sink-input.c
-+++ b/src/pulsecore/sink-input.c
-@@ -297,6 +297,9 @@ int pa_sink_input_new(
- pa_assert(data);
- pa_assert_ctl_context();
-
-+ if (!pa_core_check_access_sync(core, PA_ACCESS_HOOK_CREATE_SINK_INPUT, PA_INVALID_INDEX, 0, NULL))
-+ return -PA_ERR_ACCESS;
-+
- if (data->client)
- pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist);
-
-@@ -811,6 +814,9 @@ void pa_sink_input_kill(pa_sink_input*i) {
- pa_assert_ctl_context();
- pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_KILL_SINK_INPUT, i->index, 0, NULL))
-+ return;
-+
- i->kill(i);
- }
-
-@@ -1238,6 +1244,9 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, bool s
- pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &i->sample_spec));
- pa_assert(i->volume_writable);
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, i->index, 0, NULL))
-+ return;
-+
- if (!absolute && pa_sink_flat_volume_enabled(i->sink)) {
- v = i->sink->reference_volume;
- pa_cvolume_remap(&v, &i->sink->channel_map, &i->channel_map);
-@@ -1289,6 +1298,9 @@ void pa_sink_input_add_volume_factor(pa_sink_input *i, const char *key, const pa
- pa_assert(pa_cvolume_valid(volume_factor));
- pa_assert(volume_factor->channels == 1 || pa_cvolume_compatible(volume_factor, &i->sample_spec));
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, i->index, 0, NULL))
-+ return;
-+
- v = volume_factor_entry_new(key, volume_factor);
- if (!pa_cvolume_compatible(volume_factor, &i->sample_spec))
- pa_cvolume_set(&v->volume, i->sample_spec.channels, volume_factor->values[0]);
-@@ -1315,6 +1327,9 @@ int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key) {
- pa_assert_ctl_context();
- pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, i->index, 0, NULL))
-+ return -1;
-+
- if (pa_hashmap_remove_and_free(i->volume_factor_items, key) < 0)
- return -1;
-
-@@ -1403,6 +1418,9 @@ void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save) {
- pa_assert_ctl_context();
- pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, i->index, 0, NULL))
-+ return;
-+
- old_mute = i->muted;
-
- if (mute == old_mute) {
-@@ -1625,6 +1643,12 @@ bool pa_sink_input_may_move_to(pa_sink_input *i, pa_sink *dest) {
- if (!pa_sink_input_may_move(i))
- return false;
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_MOVE_SINK_INPUT, i->index, 0, NULL))
-+ return false;
-+
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_VIEW_SINK, dest->index, 0, NULL))
-+ return false;
-+
- /* Make sure we're not creating a filter sink cycle */
- if (find_filter_sink_input(i, dest)) {
- pa_log_debug("Can't connect input to %s, as that would create a cycle.", dest->name);
-@@ -2332,6 +2356,9 @@ void pa_sink_input_set_volume_direct(pa_sink_input *i, const pa_cvolume *volume)
- pa_assert(i);
- pa_assert(volume);
-
-+ if (!pa_core_check_access_sync(i->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, i->index, 0, NULL))
-+ return;
-+
- old_volume = i->volume;
-
- if (pa_cvolume_equal(volume, &old_volume))
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index a5cb1ee..891c55c 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -839,6 +839,9 @@ int pa_sink_suspend(pa_sink *s, bool suspend, pa_suspend_cause_t cause) {
- pa_assert(PA_SINK_IS_LINKED(s->state));
- pa_assert(cause != 0);
-
-+ if (!pa_core_check_access_sync (s->core, PA_ACCESS_HOOK_SUSPEND_SINK, s->index, 0, NULL))
-+ return -PA_ERR_ACCESS;
-+
- if (suspend) {
- s->suspend_cause |= cause;
- s->monitor_source->suspend_cause |= cause;
-@@ -1610,6 +1613,9 @@ bool pa_sink_is_passthrough(pa_sink *s) {
- void pa_sink_enter_passthrough(pa_sink *s) {
- pa_cvolume volume;
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_ENTER_PASSTHROUGH_SINK, s->index, 0, NULL))
-+ return;
-+
- /* disable the monitor in passthrough mode */
- if (s->monitor_source) {
- pa_log_debug("Suspending monitor source %s, because the sink is entering the passthrough mode.", s->monitor_source->name);
-@@ -1626,6 +1632,10 @@ void pa_sink_enter_passthrough(pa_sink *s) {
-
- /* Called from main context */
- void pa_sink_leave_passthrough(pa_sink *s) {
-+
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_LEAVE_PASSTHROUGH_SINK, s->index, 0, NULL))
-+ return;
-+
- /* Unsuspend monitor */
- if (s->monitor_source) {
- pa_log_debug("Resuming monitor source %s, because the sink is leaving the passthrough mode.", s->monitor_source->name);
-@@ -2013,6 +2023,9 @@ void pa_sink_set_volume(
- pa_assert(volume || pa_sink_flat_volume_enabled(s));
- pa_assert(!volume || volume->channels == 1 || pa_cvolume_compatible(volume, &s->sample_spec));
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SINK_VOLUME, s->index, 0, NULL))
-+ return;
-+
- /* make sure we don't change the volume when a PASSTHROUGH input is connected ...
- * ... *except* if we're being invoked to reset the volume to ensure 0 dB gain */
- if (pa_sink_is_passthrough(s) && (!volume || !pa_cvolume_is_norm(volume))) {
-@@ -2229,6 +2242,9 @@ void pa_sink_set_mute(pa_sink *s, bool mute, bool save) {
- pa_sink_assert_ref(s);
- pa_assert_ctl_context();
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SINK_VOLUME, s->index, 0, NULL))
-+ return;
-+
- old_muted = s->muted;
-
- if (mute == old_muted) {
-@@ -3280,6 +3296,9 @@ void pa_sink_set_fixed_latency_within_thread(pa_sink *s, pa_usec_t latency) {
- void pa_sink_set_port_latency_offset(pa_sink *s, int64_t offset) {
- pa_sink_assert_ref(s);
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SINK_PORT_LATENCY_OFFSET, s->index, 0, NULL))
-+ return;
-+
- s->port_latency_offset = offset;
-
- if (PA_SINK_IS_LINKED(s->state))
-@@ -3332,6 +3351,9 @@ int pa_sink_set_port(pa_sink *s, const char *name, bool save) {
- if (!name)
- return -PA_ERR_NOENTITY;
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SINK_PORT, s->index, 0, name))
-+ return -PA_ERR_ACCESS;
-+
- if (!(port = pa_hashmap_get(s->ports, name)))
- return -PA_ERR_NOENTITY;
-
-diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
-index 3ac935d..985de6b 100644
---- a/src/pulsecore/sound-file-stream.c
-+++ b/src/pulsecore/sound-file-stream.c
-@@ -242,6 +242,9 @@ int pa_play_file(
- pa_assert(sink);
- pa_assert(fname);
-
-+ if (!pa_core_check_access_sync (sink->core, PA_ACCESS_HOOK_PLAY_FILE, PA_INVALID_INDEX, 0, fname))
-+ return -1;
-+
- u = pa_msgobject_new(file_stream);
- u->parent.parent.free = file_stream_free;
- u->parent.process_msg = file_stream_process_msg;
-diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
-index a265e6f..872ee27 100644
---- a/src/pulsecore/source-output.c
-+++ b/src/pulsecore/source-output.c
-@@ -231,6 +231,9 @@ int pa_source_output_new(
- pa_assert(data);
- pa_assert_ctl_context();
-
-+ if (!pa_core_check_access_sync(core, PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT, PA_INVALID_INDEX, 0, NULL))
-+ return -PA_ERR_ACCESS;
-+
- if (data->client)
- pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist);
-
-@@ -687,6 +690,9 @@ void pa_source_output_kill(pa_source_output*o) {
- pa_assert_ctl_context();
- pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state));
-
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT, o->index, 0, NULL))
-+ return;
-+
- o->kill(o);
- }
-
-@@ -945,6 +951,9 @@ void pa_source_output_set_volume(pa_source_output *o, const pa_cvolume *volume,
- pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &o->sample_spec));
- pa_assert(o->volume_writable);
-
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME, o->index, 0, NULL))
-+ return;
-+
- if (!absolute && pa_source_flat_volume_enabled(o->source)) {
- v = o->source->reference_volume;
- pa_cvolume_remap(&v, &o->source->channel_map, &o->channel_map);
-@@ -1056,6 +1065,9 @@ void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save) {
- pa_assert_ctl_context();
- pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state));
-
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME, o->index, 0, NULL))
-+ return;
-+
- old_mute = o->muted;
-
- if (mute == old_mute) {
-@@ -1275,6 +1287,12 @@ bool pa_source_output_may_move_to(pa_source_output *o, pa_source *dest) {
- if (!pa_source_output_may_move(o))
- return false;
-
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_MOVE_SOURCE_OUTPUT, o->index, 0, NULL))
-+ return false;
-+
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_VIEW_SOURCE, dest->index, 0, NULL))
-+ return false;
-+
- /* Make sure we're not creating a filter source cycle */
- if (find_filter_source_output(o, dest)) {
- pa_log_debug("Can't connect output to %s, as that would create a cycle.", dest->name);
-@@ -1787,6 +1805,9 @@ void pa_source_output_set_volume_direct(pa_source_output *o, const pa_cvolume *v
- pa_assert(o);
- pa_assert(volume);
-
-+ if (!pa_core_check_access_sync(o->core, PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME, o->index, 0, NULL))
-+ return;
-+
- old_volume = o->volume;
-
- if (pa_cvolume_equal(volume, &old_volume))
-diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
-index 5f42965..449aeff 100644
---- a/src/pulsecore/source.c
-+++ b/src/pulsecore/source.c
-@@ -763,6 +763,9 @@ int pa_source_suspend(pa_source *s, bool suspend, pa_suspend_cause_t cause) {
- if (s->monitor_of && cause != PA_SUSPEND_PASSTHROUGH)
- return -PA_ERR_NOTSUPPORTED;
-
-+ if (!pa_core_check_access_sync (s->core, PA_ACCESS_HOOK_SUSPEND_SOURCE, s->index, 0, NULL))
-+ return -PA_ERR_ACCESS;
-+
- if (suspend)
- s->suspend_cause |= cause;
- else
-@@ -1196,6 +1199,9 @@ bool pa_source_is_passthrough(pa_source *s) {
- void pa_source_enter_passthrough(pa_source *s) {
- pa_cvolume volume;
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_ENTER_PASSTHROUGH_SOURCE, s->index, 0, NULL))
-+ return;
-+
- /* set the volume to NORM */
- s->saved_volume = *pa_source_get_volume(s, true);
- s->saved_save_volume = s->save_volume;
-@@ -1206,6 +1212,9 @@ void pa_source_enter_passthrough(pa_source *s) {
-
- /* Called from main context */
- void pa_source_leave_passthrough(pa_source *s) {
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_LEAVE_PASSTHROUGH_SOURCE, s->index, 0, NULL))
-+ return;
-+
- /* Restore source volume to what it was before we entered passthrough mode */
- pa_source_set_volume(s, &s->saved_volume, true, s->saved_save_volume);
-
-@@ -1587,6 +1596,9 @@ void pa_source_set_volume(
- pa_assert(volume || pa_source_flat_volume_enabled(s));
- pa_assert(!volume || volume->channels == 1 || pa_cvolume_compatible(volume, &s->sample_spec));
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SOURCE_VOLUME, s->index, 0, NULL))
-+ return;
-+
- /* make sure we don't change the volume in PASSTHROUGH mode ...
- * ... *except* if we're being invoked to reset the volume to ensure 0 dB gain */
- if (pa_source_is_passthrough(s) && (!volume || !pa_cvolume_is_norm(volume))) {
-@@ -1812,6 +1824,9 @@ void pa_source_set_mute(pa_source *s, bool mute, bool save) {
- pa_source_assert_ref(s);
- pa_assert_ctl_context();
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SOURCE_VOLUME, s->index, 0, NULL))
-+ return;
-+
- old_muted = s->muted;
-
- if (mute == old_muted) {
-@@ -2571,6 +2586,9 @@ void pa_source_set_fixed_latency_within_thread(pa_source *s, pa_usec_t latency)
- void pa_source_set_port_latency_offset(pa_source *s, int64_t offset) {
- pa_source_assert_ref(s);
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SOURCE_PORT_LATENCY_OFFSET, s->index, 0, NULL))
-+ return;
-+
- s->port_latency_offset = offset;
-
- if (PA_SOURCE_IS_LINKED(s->state))
-@@ -2609,6 +2627,9 @@ int pa_source_set_port(pa_source *s, const char *name, bool save) {
- if (!name)
- return -PA_ERR_NOENTITY;
-
-+ if (!pa_core_check_access_sync(s->core, PA_ACCESS_HOOK_SET_SOURCE_PORT, s->index, 0, name))
-+ return -PA_ERR_ACCESS;
-+
- if (!(port = pa_hashmap_get(s->ports, name)))
- return -PA_ERR_NOENTITY;
-
---
-2.9.3
-
diff --git a/0012-protocol-native-add-async-access-checks.patch b/0012-protocol-native-add-async-access-checks.patch
deleted file mode 100644
index 2a746c3..0000000
--- a/0012-protocol-native-add-async-access-checks.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From fe86adb46f57c8b8ef683591506cbe98fff0c071 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Fri, 27 Jan 2017 16:42:34 +0100
-Subject: [PATCH 12/18] protocol-native: add async access checks
-
----
- src/pulsecore/protocol-native.c | 91 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 87 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index 4ff97c4..a866802 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -4850,14 +4850,97 @@ static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command,
- pa_pstream_send_simple_ack(c->pstream, tag);
- }
-
-+typedef struct pa_protocol_native_access_data {
-+ pa_access_data d;
-+
-+ pa_pdispatch *pd;
-+ uint32_t command;
-+ uint32_t tag;
-+ pa_tagstruct *tc;
-+ void *userdata;
-+} pa_protocol_native_access_data;
-+
-+static const pa_pdispatch_cb_t access_ok_table[PA_COMMAND_MAX] = {
-+ [PA_COMMAND_CREATE_PLAYBACK_STREAM] = command_create_playback_stream,
-+ [PA_COMMAND_CREATE_RECORD_STREAM] = command_create_record_stream,
-+ [PA_COMMAND_CREATE_UPLOAD_STREAM] = command_create_upload_stream,
-+ [PA_COMMAND_STAT] = command_stat,
-+};
-+
-+static void check_access_finish_cb(pa_access_data *data, bool res) {
-+ pa_protocol_native_access_data *d = (pa_protocol_native_access_data *) data;
-+ pa_native_connection *c = PA_NATIVE_CONNECTION(d->userdata);
-+ uint32_t command, tag;
-+
-+ if (!res || pa_tagstruct_getu32(d->tc, &command) < 0 ||
-+ pa_tagstruct_getu32(d->tc, &tag) < 0 ||
-+ command != d->command || tag != d->tag) {
-+ pa_pstream_send_error(c->pstream, d->tag, PA_ERR_ACCESS);
-+ goto finish;
-+ }
-+
-+ /* call the dispatcher again, hopefully this time, the access check will
-+ * fail or succeed immediately */
-+ access_ok_table[d->command](d->pd, d->command, d->tag, d->tc, d->userdata);
-+
-+finish:
-+ if (d->pd)
-+ pa_pdispatch_unref(d->pd);
-+ if (d->tc)
-+ pa_tagstruct_free(d->tc);
-+ pa_xfree(d);
-+}
-+
-+static const pa_access_hook_t access_table[PA_COMMAND_MAX] = {
-+ [PA_COMMAND_CREATE_PLAYBACK_STREAM] = PA_ACCESS_HOOK_CONNECT_PLAYBACK,
-+ [PA_COMMAND_CREATE_RECORD_STREAM] = PA_ACCESS_HOOK_CONNECT_RECORD,
-+ [PA_COMMAND_CREATE_UPLOAD_STREAM] = PA_ACCESS_HOOK_CONNECT_UPLOAD,
-+ [PA_COMMAND_STAT] = PA_ACCESS_HOOK_STAT,
-+};
-+
-+static void check_command_access(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
-+ pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
-+ pa_protocol_native_access_data *data;
-+ pa_hook_result_t res;
-+
-+ pa_native_connection_assert_ref(c);
-+
-+ if (access_table[command] == 0) {
-+ pa_pstream_send_error(c->pstream, tag, PA_ERR_ACCESS);
-+ return;
-+ }
-+
-+ data = pa_xnew0 (pa_protocol_native_access_data, 1);
-+ data->d.client_index = c->client->index;
-+ data->d.object_index = PA_INVALID_INDEX;
-+ data->d.event = 0;
-+ data->d.name = NULL;
-+ data->d.hook = access_table[command];
-+
-+ res = pa_core_check_access(c->protocol->core, &data->d);
-+ if (res == PA_HOOK_CANCEL) {
-+ /* async */
-+ data->d.complete_cb = check_access_finish_cb;
-+ data->pd = pd ? pa_pdispatch_ref (pd) : NULL;
-+ data->command = command;
-+ data->tag = tag;
-+ data->tc = t ? pa_tagstruct_copy (t) : NULL;
-+ data->userdata = userdata;
-+ } else {
-+ pa_xfree(data);
-+ access_ok_table[command](pd, command, tag, t, userdata);
-+ }
-+}
-+
-+
- static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
- [PA_COMMAND_ERROR] = NULL,
- [PA_COMMAND_TIMEOUT] = NULL,
- [PA_COMMAND_REPLY] = NULL,
-- [PA_COMMAND_CREATE_PLAYBACK_STREAM] = command_create_playback_stream,
-+ [PA_COMMAND_CREATE_PLAYBACK_STREAM] = check_command_access,
- [PA_COMMAND_DELETE_PLAYBACK_STREAM] = command_delete_stream,
- [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = command_drain_playback_stream,
-- [PA_COMMAND_CREATE_RECORD_STREAM] = command_create_record_stream,
-+ [PA_COMMAND_CREATE_RECORD_STREAM] = check_command_access,
- [PA_COMMAND_DELETE_RECORD_STREAM] = command_delete_stream,
- [PA_COMMAND_AUTH] = command_auth,
- [PA_COMMAND_REQUEST] = NULL,
-@@ -4865,10 +4948,10 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
- [PA_COMMAND_SET_CLIENT_NAME] = command_set_client_name,
- [PA_COMMAND_LOOKUP_SINK] = command_lookup,
- [PA_COMMAND_LOOKUP_SOURCE] = command_lookup,
-- [PA_COMMAND_STAT] = command_stat,
-+ [PA_COMMAND_STAT] = check_command_access,
- [PA_COMMAND_GET_PLAYBACK_LATENCY] = command_get_playback_latency,
- [PA_COMMAND_GET_RECORD_LATENCY] = command_get_record_latency,
-- [PA_COMMAND_CREATE_UPLOAD_STREAM] = command_create_upload_stream,
-+ [PA_COMMAND_CREATE_UPLOAD_STREAM] = check_command_access,
- [PA_COMMAND_DELETE_UPLOAD_STREAM] = command_delete_stream,
- [PA_COMMAND_FINISH_UPLOAD_STREAM] = command_finish_upload_stream,
- [PA_COMMAND_PLAY_SAMPLE] = command_play_sample,
---
-2.9.3
-
diff --git a/0013-core-add-current_client.patch b/0013-core-add-current_client.patch
deleted file mode 100644
index 425cc18..0000000
--- a/0013-core-add-current_client.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 2c51c85d5c73b2217013a291cc80620e0b1ed268 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Fri, 27 Jan 2017 16:43:11 +0100
-Subject: [PATCH 13/18] core: add current_client
-
-Add the current client to the core object and configure it in the
-various protocols whenever we start executing code for a pa_client.
----
- src/pulsecore/cli.c | 5 +++++
- src/pulsecore/core-struct.h | 2 ++
- src/pulsecore/core-subscribe.c | 4 ++++
- src/pulsecore/core.c | 10 ++++++++++
- src/pulsecore/core.h | 3 +++
- src/pulsecore/protocol-dbus.c | 5 +++++
- src/pulsecore/protocol-esound.c | 4 ++++
- src/pulsecore/protocol-http.c | 4 ++++
- src/pulsecore/protocol-native.c | 3 +++
- src/pulsecore/protocol-simple.c | 2 ++
- 10 files changed, 42 insertions(+)
-
-diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c
-index f942629..0546b06 100644
---- a/src/pulsecore/cli.c
-+++ b/src/pulsecore/cli.c
-@@ -134,6 +134,8 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
- return;
- }
-
-+ pa_core_set_current_client(c->core, c->client);
-+
- /* Magic command, like they had in AT Hayes Modems! Those were the good days! */
- if (pa_streq(s, "/"))
- s = c->last_line;
-@@ -151,10 +153,13 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
- }
- else
- pa_cli_command_execute_line(c->core, s, buf, &c->fail);
-+
- c->defer_kill--;
- pa_ioline_puts(line, p = pa_strbuf_to_string_free(buf));
- pa_xfree(p);
-
-+ pa_core_set_current_client(c->core, NULL);
-+
- if (c->kill_requested) {
- if (c->eof_callback)
- c->eof_callback(c, c->userdata);
-diff --git a/src/pulsecore/core-struct.h b/src/pulsecore/core-struct.h
-index e6aa374..8d58f1a 100644
---- a/src/pulsecore/core-struct.h
-+++ b/src/pulsecore/core-struct.h
-@@ -98,6 +98,8 @@ struct pa_core {
- pa_hook hooks[PA_CORE_HOOK_MAX];
- /* access hooks */
- pa_hook access[PA_ACCESS_HOOK_MAX];
-+
-+ pa_client *current_client;
- };
-
- #endif /* foocorestructhfoo */
-diff --git a/src/pulsecore/core-subscribe.c b/src/pulsecore/core-subscribe.c
-index e60af21..a3f7ec7 100644
---- a/src/pulsecore/core-subscribe.c
-+++ b/src/pulsecore/core-subscribe.c
-@@ -40,6 +40,7 @@
-
- struct pa_subscription {
- pa_core *core;
-+ pa_client *client;
- bool dead;
-
- pa_subscription_cb_t callback;
-@@ -70,6 +71,7 @@ pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m, pa_su
-
- s = pa_xnew(pa_subscription, 1);
- s->core = c;
-+ s->client = pa_core_get_current_client(c);
- s->dead = false;
- s->callback = callback;
- s->userdata = userdata;
-@@ -170,8 +172,10 @@ static void defer_cb(pa_mainloop_api *m, pa_defer_event *de, void *userdata) {
- for (s = c->subscriptions; s; s = s->next) {
-
- if (!s->dead && pa_subscription_match_flags(s->mask, e->type)) {
-+ pa_core_set_current_client(c, s->client);
- if (pa_core_check_access_sync(c, PA_ACCESS_HOOK_FILTER_SUBSCRIBE_EVENT, e->index, e->type, NULL))
- s->callback(c, e->type, e->index, s->userdata);
-+ pa_core_set_current_client(c, NULL);
- }
- }
-
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index 6b9fb8b..311d31f 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -154,6 +154,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, bool enable_memfd, size_t
- for (j = 0; j < PA_ACCESS_HOOK_MAX; j++)
- pa_hook_init(&c->access[j], c);
-
-+ c->current_client = NULL;
-+
- pa_random(&c->cookie, sizeof(c->cookie));
-
- #ifdef SIGPIPE
-@@ -332,6 +334,14 @@ pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_cli
- return pa_mempool_new(shm_type, c->shm_size, per_client);
- }
-
-+pa_client* pa_core_get_current_client(pa_core *c) {
-+ return c->current_client;
-+}
-+
-+void pa_core_set_current_client(pa_core *c, pa_client *client) {
-+ c->current_client = client;
-+}
-+
- bool pa_core_check_access_sync(pa_core *c, pa_access_hook_t hook, uint32_t idx, pa_subscription_event_type_t event, const char *name) {
- pa_access_data data;
-
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index 316a88e..42d1e11 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -168,6 +168,9 @@ pa_mainloop_api* pa_core_get_mainloop(pa_core *c);
- pa_mempool* pa_core_get_mempool(pa_core *c);
- pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_client);
-
-+pa_client* pa_core_get_current_client(pa_core *c);
-+void pa_core_set_current_client(pa_core *c, pa_client *client);
-+
- pa_idxset* pa_core_get_modules(pa_core *c);
- pa_idxset* pa_core_get_clients(pa_core *c);
- pa_idxset* pa_core_get_cards(pa_core *c);
-diff --git a/src/pulsecore/protocol-dbus.c b/src/pulsecore/protocol-dbus.c
-index 59afc1a..2ab0602 100644
---- a/src/pulsecore/protocol-dbus.c
-+++ b/src/pulsecore/protocol-dbus.c
-@@ -494,6 +494,7 @@ static enum find_result_t find_handler(struct call_info *call_info) {
- static DBusHandlerResult handle_message_cb(DBusConnection *connection, DBusMessage *message, void *user_data) {
- pa_dbus_protocol *p = user_data;
- struct call_info call_info;
-+ pa_client *client;
-
- pa_assert(connection);
- pa_assert(message);
-@@ -520,6 +521,9 @@ static DBusHandlerResult handle_message_cb(DBusConnection *connection, DBusMessa
- goto finish;
- }
-
-+ client = pa_dbus_protocol_get_client(p, connection);
-+ pa_core_set_current_client(p->core, client);
-+
- switch (find_handler(&call_info)) {
- case FOUND_GET_PROPERTY:
- call_info.property_handler->get_cb(connection, message, call_info.iface_entry->userdata);
-@@ -586,6 +590,7 @@ static DBusHandlerResult handle_message_cb(DBusConnection *connection, DBusMessa
- default:
- pa_assert_not_reached();
- }
-+ pa_core_set_current_client(p->core, NULL);
-
- finish:
- return DBUS_HANDLER_RESULT_HANDLED;
-diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
-index 0d76525..706a21f 100644
---- a/src/pulsecore/protocol-esound.c
-+++ b/src/pulsecore/protocol-esound.c
-@@ -1284,7 +1284,9 @@ static void io_callback(pa_iochannel*io, void *userdata) {
- connection_assert_ref(c);
- pa_assert(io);
-
-+ pa_core_set_current_client(c->protocol->core, c->client);
- do_work(c);
-+ pa_core_set_current_client(c->protocol->core, NULL);
- }
-
- static void defer_callback(pa_mainloop_api*a, pa_defer_event *e, void *userdata) {
-@@ -1293,7 +1295,9 @@ static void defer_callback(pa_mainloop_api*a, pa_defer_event *e, void *userdata)
- connection_assert_ref(c);
- pa_assert(e);
-
-+ pa_core_set_current_client(c->protocol->core, c->client);
- do_work(c);
-+ pa_core_set_current_client(c->protocol->core, NULL);
- }
-
- static int connection_process_msg(pa_msgobject *o, int code, void*userdata, int64_t offset, pa_memchunk *chunk) {
-diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c
-index 64024df..6fbd553 100644
---- a/src/pulsecore/protocol-http.c
-+++ b/src/pulsecore/protocol-http.c
-@@ -647,6 +647,8 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
- return;
- }
-
-+ pa_core_set_current_client(c->protocol->core, c->client);
-+
- switch (c->state) {
- case STATE_REQUEST_LINE: {
- if (pa_startswith(s, "GET ")) {
-@@ -680,11 +682,13 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
- default:
- ;
- }
-+ pa_core_set_current_client(c->protocol->core, NULL);
-
- return;
-
- fail:
- html_response(c, 500, "Internal Server Error", NULL);
-+ pa_core_set_current_client(c->protocol->core, NULL);
- }
-
- void pa_http_protocol_connect(pa_http_protocol *p, pa_iochannel *io, pa_module *m) {
-diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
-index a866802..728c7e7 100644
---- a/src/pulsecore/protocol-native.c
-+++ b/src/pulsecore/protocol-native.c
-@@ -5051,10 +5051,13 @@ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, pa_cmsg_an
- pa_assert(packet);
- pa_native_connection_assert_ref(c);
-
-+ pa_core_set_current_client(c->protocol->core, c->client);
-+
- if (pa_pdispatch_run(c->pdispatch, packet, ancil_data, c) < 0) {
- pa_log("invalid packet.");
- native_connection_unlink(c);
- }
-+ pa_core_set_current_client(c->protocol->core, NULL);
- }
-
- static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, void *userdata) {
-diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
-index e1ead2f..8d4fbe4 100644
---- a/src/pulsecore/protocol-simple.c
-+++ b/src/pulsecore/protocol-simple.c
-@@ -467,7 +467,9 @@ static void io_callback(pa_iochannel*io, void *userdata) {
- connection_assert_ref(c);
- pa_assert(io);
-
-+ pa_core_set_current_client(c->protocol->core, c->client);
- do_work(c);
-+ pa_core_set_current_client(c->protocol->core, NULL);
- }
-
- /*** socket_server callbacks ***/
---
-2.9.3
-
diff --git a/0014-core-ensure-maincontext-for-current-client.patch b/0014-core-ensure-maincontext-for-current-client.patch
deleted file mode 100644
index 9a058ad..0000000
--- a/0014-core-ensure-maincontext-for-current-client.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9820db2433a37aa1f22d962bb89876c66bcc1185 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Mon, 30 Jan 2017 11:52:54 +0100
-Subject: [PATCH 14/18] core: ensure maincontext for current client
-
-Make sure we can only access the current client from the main context.
----
- src/pulsecore/core.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index 311d31f..f14139f 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -335,17 +335,20 @@ pa_mempool* pa_core_new_mempool(pa_core *c, pa_mem_type_t shm_type, bool per_cli
- }
-
- pa_client* pa_core_get_current_client(pa_core *c) {
-+ pa_assert_ctl_context();
- return c->current_client;
- }
-
- void pa_core_set_current_client(pa_core *c, pa_client *client) {
-- c->current_client = client;
-+ pa_assert_ctl_context();
-+ c->current_client = client;
- }
-
- bool pa_core_check_access_sync(pa_core *c, pa_access_hook_t hook, uint32_t idx, pa_subscription_event_type_t event, const char *name) {
- pa_access_data data;
-
- pa_assert(c);
-+ pa_assert_ctl_context();
-
- if (c->current_client == NULL)
- return true;
-@@ -363,6 +366,7 @@ bool pa_core_check_access_sync(pa_core *c, pa_access_hook_t hook, uint32_t idx,
- pa_hook_result_t pa_core_check_access(pa_core *c, pa_access_data *data) {
- pa_assert(c);
- pa_assert(data);
-+ pa_assert_ctl_context();
-
- if (c->current_client == NULL)
- return PA_HOOK_OK;
---
-2.9.3
-
diff --git a/0015-Add-flatpak-access-control.patch b/0015-Add-flatpak-access-control.patch
deleted file mode 100644
index 1fcbff7..0000000
--- a/0015-Add-flatpak-access-control.patch
+++ /dev/null
@@ -1,828 +0,0 @@
-From 46754adc0e09e7ea8a9c84183425924333c0d251 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen(a)redhat.com>
-Date: Fri, 15 Jul 2016 09:55:44 -0400
-Subject: [PATCH 15/18] Add flatpak access control
-
-Add a module that talks to xdg-desktop-portal for access control
-in sandboxed applications. Currently, it asks the portal for
-access to microphone/speakers when a record or playback stream
-is opened or samples are played.
-
-For non-sandboxed applications, the module imposes no restrictions.
----
- src/Makefile.am | 9 +-
- src/modules/module-access.c | 4 +-
- src/modules/module-flatpak.c | 738 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 749 insertions(+), 2 deletions(-)
- create mode 100644 src/modules/module-flatpak.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 70bc848..0e0a480 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1175,7 +1175,8 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
- if HAVE_DBUS
- # Serveral module (e.g. libalsa-util.la)
- modlibexec_LTLIBRARIES += \
-- module-console-kit.la
-+ module-console-kit.la \
-+ module-flatpak.la
- endif
-
- modlibexec_LTLIBRARIES += \
-@@ -1473,6 +1474,7 @@ endif
- # These are generated by an M4 script
- SYMDEF_FILES = \
- module-access-symdef.h \
-+ module-flatpak-symdef.h \
- module-cli-symdef.h \
- module-cli-protocol-tcp-symdef.h \
- module-cli-protocol-unix-symdef.h \
-@@ -1600,6 +1602,11 @@ module_access_la_SOURCES = modules/module-access.c
- module_access_la_LDFLAGS = $(MODULE_LDFLAGS)
- module_access_la_LIBADD = $(MODULE_LIBADD)
-
-+module_flatpak_la_SOURCES = modules/module-flatpak.c
-+module_flatpak_la_CFLAGS = $(AM_CDFLAGS) $(DBUS_CFLAGS)
-+module_flatpak_la_LDFLAGS = $(MODULE_LDFLAGS)
-+module_flatpak_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
-+
- # CLI protocol
-
- module_cli_la_SOURCES = modules/module-cli.c
-diff --git a/src/modules/module-access.c b/src/modules/module-access.c
-index 39e2f0e..dec1dbf 100644
---- a/src/modules/module-access.c
-+++ b/src/modules/module-access.c
-@@ -498,9 +498,9 @@ int pa__init(pa_module*m) {
- ap->rule[PA_ACCESS_HOOK_VIEW_CARD] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_STAT] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_VIEW_SAMPLE] = rule_allow;
-+
- ap->rule[PA_ACCESS_HOOK_PLAY_SAMPLE] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_CONNECT_PLAYBACK] = rule_allow;
--
- ap->rule[PA_ACCESS_HOOK_CONNECT_RECORD] = rule_check_async;
-
- ap->rule[PA_ACCESS_HOOK_VIEW_CLIENT] = rule_check_owner;
-@@ -508,11 +508,13 @@ int pa__init(pa_module*m) {
-
- ap->rule[PA_ACCESS_HOOK_CREATE_SINK_INPUT] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_VIEW_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SINK_INPUT] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_KILL_SINK_INPUT] = rule_check_owner;
-
- ap->rule[PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT] = rule_allow;
- ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SOURCE_OUTPUT] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT] = rule_check_owner;
-
-diff --git a/src/modules/module-flatpak.c b/src/modules/module-flatpak.c
-new file mode 100644
-index 0000000..64bbe86
---- /dev/null
-+++ b/src/modules/module-flatpak.c
-@@ -0,0 +1,738 @@
-+/***
-+ This file is part of PulseAudio.
-+
-+ Copyright 2016 Red Hat, Inc.
-+
-+ PulseAudio is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as published
-+ by the Free Software Foundation; either version 2.1 of the License,
-+ or (at your option) any later version.
-+
-+ PulseAudio is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <pulse/xmalloc.h>
-+#include <pulse/rtclock.h>
-+#include <pulse/timeval.h>
-+
-+#include <pulsecore/core-error.h>
-+#include <pulsecore/core-struct.h>
-+#include <pulsecore/module.h>
-+#include <pulsecore/core-util.h>
-+#include <pulsecore/modargs.h>
-+#include <pulsecore/log.h>
-+#include <pulsecore/sink-input.h>
-+#include <pulsecore/core-util.h>
-+#include <pulsecore/dbus-shared.h>
-+
-+#include "module-access-symdef.h"
-+
-+PA_MODULE_AUTHOR("Matthias Clasen");
-+PA_MODULE_DESCRIPTION("Controls access to server resources for flatpak apps");
-+PA_MODULE_VERSION(PACKAGE_VERSION);
-+PA_MODULE_LOAD_ONCE(true);
-+PA_MODULE_USAGE("");
-+
-+static const char* const valid_modargs[] = {
-+ NULL,
-+};
-+
-+typedef struct access_policy access_policy;
-+typedef struct event_item event_item;
-+typedef struct client_data client_data;
-+typedef struct userdata userdata;
-+
-+typedef pa_hook_result_t (*access_rule_t)(pa_core *c, pa_access_data *d, struct userdata *u);
-+
-+struct access_policy {
-+ uint32_t index;
-+ struct userdata *userdata;
-+
-+ access_rule_t rule[PA_ACCESS_HOOK_MAX];
-+};
-+
-+struct event_item {
-+ PA_LLIST_FIELDS(event_item);
-+
-+ int facility;
-+ uint32_t object_index;
-+};
-+
-+struct async_cache {
-+ bool checked;
-+ bool granted;
-+};
-+
-+struct userdata {
-+ pa_core *core;
-+
-+ pa_hook_slot *hook[PA_ACCESS_HOOK_MAX];
-+
-+ pa_idxset *policies;
-+ uint32_t default_policy;
-+ uint32_t portal_policy;
-+
-+ pa_dbus_connection *connection;
-+ pa_hashmap *clients;
-+ pa_hook_slot *client_put_slot;
-+ pa_hook_slot *client_auth_slot;
-+ pa_hook_slot *client_proplist_changed_slot;
-+ pa_hook_slot *client_unlink_slot;
-+};
-+
-+struct client_data {
-+ struct userdata *u;
-+
-+ uint32_t index;
-+ uint32_t policy;
-+ pid_t pid;
-+
-+ struct async_cache cached[PA_ACCESS_HOOK_MAX];
-+ pa_access_data *access_data;
-+
-+ PA_LLIST_HEAD(event_item, events);
-+};
-+
-+
-+static void add_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i;
-+
-+ i = pa_xnew0(event_item, 1);
-+ PA_LLIST_INIT(event_item, i);
-+ i->facility = facility;
-+ i->object_index = oidx;
-+
-+ PA_LLIST_PREPEND(event_item, cd->events, i);
-+}
-+
-+static event_item *find_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i;
-+
-+ PA_LLIST_FOREACH(i, cd->events) {
-+ if (i->facility == facility && i->object_index == oidx)
-+ return i;
-+ }
-+ return NULL;
-+}
-+
-+static bool remove_event(struct client_data *cd, int facility, uint32_t oidx) {
-+ event_item *i = find_event(cd, facility, oidx);
-+ if (i) {
-+ PA_LLIST_REMOVE(event_item, cd->events, i);
-+ pa_xfree(i);
-+ return true;
-+ }
-+ return false;
-+}
-+
-+static client_data * client_data_new(struct userdata *u, uint32_t index, uint32_t policy, pid_t pid) {
-+ client_data *cd;
-+
-+ cd = pa_xnew0(client_data, 1);
-+ cd->u = u;
-+ cd->index = index;
-+ cd->policy = policy;
-+ cd->pid = pid;
-+ pa_hashmap_put(u->clients, PA_UINT32_TO_PTR(index), cd);
-+ pa_log("new client %d with pid %d, policy %d", index, pid, policy);
-+
-+ return cd;
-+}
-+
-+static void client_data_free(client_data *cd) {
-+ event_item *e;
-+
-+ while ((e = cd->events)) {
-+ PA_LLIST_REMOVE(event_item, cd->events, e);
-+ pa_xfree(e);
-+ }
-+ pa_log("removed client %d", cd->index);
-+ pa_xfree(cd);
-+}
-+
-+static client_data * client_data_get(struct userdata *u, uint32_t index) {
-+ return pa_hashmap_get(u->clients, PA_UINT32_TO_PTR(index));
-+}
-+
-+static void client_data_remove(struct userdata *u, uint32_t index) {
-+ pa_hashmap_remove_and_free(u->clients, PA_UINT32_TO_PTR(index));
-+}
-+
-+/* rule checks if the operation on the object is performed by the owner of the object */
-+static pa_hook_result_t rule_check_owner (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_hook_result_t result = PA_HOOK_STOP;
-+ uint32_t idx = PA_INVALID_INDEX;
-+
-+ switch (d->hook) {
-+ case PA_ACCESS_HOOK_VIEW_CLIENT:
-+ case PA_ACCESS_HOOK_KILL_CLIENT: {
-+ idx = d->object_index;
-+ break;
-+ }
-+
-+ case PA_ACCESS_HOOK_VIEW_SINK_INPUT:
-+ case PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME:
-+ case PA_ACCESS_HOOK_KILL_SINK_INPUT: {
-+ const pa_sink_input *si = pa_idxset_get_by_index(c->sink_inputs, d->object_index);
-+ idx = (si && si->client) ? si->client->index : PA_INVALID_INDEX;
-+ break;
-+ }
-+
-+ case PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT:
-+ case PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME:
-+ case PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT: {
-+ const pa_source_output *so = pa_idxset_get_by_index(c->source_outputs, d->object_index);
-+ idx = (so && so->client) ? so->client->index : PA_INVALID_INDEX;
-+ break;
-+ }
-+ default:
-+ break;
-+ }
-+ if (idx == d->client_index) {
-+ pa_log("allow operation %d/%d of same client %d", d->hook, d->object_index, idx);
-+ result = PA_HOOK_OK;
-+ } else
-+ pa_log("blocked operation %d/%d of client %d to client %d", d->hook, d->object_index, idx, d->client_index);
-+
-+ return result;
-+}
-+
-+/* rule allows the operation */
-+static pa_hook_result_t rule_allow (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_log("allow operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+}
-+
-+/* rule blocks the operation */
-+static pa_hook_result_t rule_block (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ pa_log("blocked operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ return PA_HOOK_STOP;
-+}
-+
-+static DBusHandlerResult portal_response(DBusConnection *connection, DBusMessage *msg, void *user_data)
-+{
-+ client_data *cd = user_data;
-+ pa_access_data *d = cd->access_data;
-+
-+ if (dbus_message_is_signal(msg, "org.freedesktop.portal.Request", "Response")) {
-+ uint32_t response = 2;
-+ DBusError error;
-+
-+ dbus_error_init(&error);
-+
-+ dbus_connection_remove_filter (connection, portal_response, cd);
-+
-+ if (!dbus_message_get_args(msg, &error, DBUS_TYPE_UINT32, &response, DBUS_TYPE_INVALID)) {
-+ pa_log("failed to parse Response: %s\n", error.message);
-+ dbus_error_free(&error);
-+ }
-+
-+ cd->cached[d->hook].checked = true;
-+ cd->cached[d->hook].granted = response == 0 ? true : false;
-+
-+ pa_log("portal check result: %d\n", cd->cached[d->hook].granted);
-+
-+ d->complete_cb (d, cd->cached[d->hook].granted);
-+
-+ return DBUS_HANDLER_RESULT_HANDLED;
-+ }
-+
-+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
-+static pa_hook_result_t rule_check_portal (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ client_data *cd = client_data_get(u, d->client_index);
-+ DBusMessage *m = NULL, *r = NULL;
-+ DBusError error;
-+ pid_t pid;
-+ DBusMessageIter msg_iter;
-+ DBusMessageIter dict_iter;
-+ const char *handle;
-+ const char *device;
-+
-+ if (cd->cached[d->hook].checked) {
-+ pa_log("returned cached answer for portal check: %d\n", cd->cached[d->hook].granted);
-+ return cd->cached[d->hook].granted ? PA_HOOK_OK : PA_HOOK_STOP;
-+ }
-+
-+ pa_log("ask portal for operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+
-+ cd->access_data = d;
-+
-+ dbus_error_init(&error);
-+
-+ if (!(m = dbus_message_new_method_call("org.freedesktop.portal.Desktop",
-+ "/org/freedesktop/portal/desktop",
-+ "org.freedesktop.portal.Device",
-+ "AccessDevice"))) {
-+ return PA_HOOK_STOP;
-+ }
-+
-+ if (d->hook == PA_ACCESS_HOOK_CONNECT_RECORD)
-+ device = "microphone";
-+ else if (d->hook == PA_ACCESS_HOOK_CONNECT_PLAYBACK ||
-+ d->hook == PA_ACCESS_HOOK_PLAY_SAMPLE)
-+ device = "speakers";
-+ else
-+ pa_assert_not_reached ();
-+
-+ pid = cd->pid;
-+ if (!dbus_message_append_args(m,
-+ DBUS_TYPE_UINT32, &pid,
-+ DBUS_TYPE_INVALID)) {
-+ dbus_message_unref(m);
-+ return PA_HOOK_STOP;
-+ }
-+
-+ dbus_message_iter_init_append(m, &msg_iter);
-+ dbus_message_iter_open_container (&msg_iter, DBUS_TYPE_ARRAY, "s", &dict_iter);
-+ dbus_message_iter_append_basic (&dict_iter, DBUS_TYPE_STRING, &device);
-+ dbus_message_iter_close_container (&msg_iter, &dict_iter);
-+
-+ dbus_message_iter_open_container (&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter);
-+ dbus_message_iter_close_container (&msg_iter, &dict_iter);
-+
-+ if (!(r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(u->connection), m, -1, &error))) {
-+ pa_log("Failed to call portal: %s\n", error.message);
-+ dbus_error_free(&error);
-+ dbus_message_unref(m);
-+ return PA_HOOK_STOP;
-+ }
-+
-+ dbus_message_unref(m);
-+
-+ if (!dbus_message_get_args(r, &error, DBUS_TYPE_OBJECT_PATH, &handle, DBUS_TYPE_INVALID)) {
-+ pa_log("Failed to parse AccessDevice result: %s\n", error.message);
-+ dbus_error_free(&error);
-+ dbus_message_unref(r);
-+ return PA_HOOK_STOP;
-+ }
-+
-+ dbus_message_unref(r);
-+
-+ dbus_bus_add_match(pa_dbus_connection_get(u->connection),
-+ "type='signal',interface='org.freedesktop.portal.Request'",
-+ &error);
-+ dbus_connection_flush(pa_dbus_connection_get(u->connection));
-+ if (dbus_error_is_set(&error)) {
-+ pa_log("Failed to subscribe to Request signal: %s\n", error.message);
-+ dbus_error_free(&error);
-+ return PA_HOOK_STOP;
-+ }
-+
-+ dbus_connection_add_filter(pa_dbus_connection_get(u->connection), portal_response, cd, NULL);
-+
-+ return PA_HOOK_CANCEL;
-+}
-+
-+static access_policy *access_policy_new(struct userdata *u, bool allow_all) {
-+ access_policy *ap;
-+ int i;
-+
-+ ap = pa_xnew0(access_policy, 1);
-+ ap->userdata = u;
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++)
-+ ap->rule[i] = allow_all ? rule_allow : rule_block;
-+
-+ pa_idxset_put(u->policies, ap, &ap->index);
-+
-+ return ap;
-+}
-+
-+static void access_policy_free(access_policy *ap) {
-+ pa_idxset_remove_by_index(ap->userdata->policies, ap->index);
-+ pa_xfree(ap);
-+}
-+
-+static pa_hook_result_t check_access (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ access_policy *ap;
-+ access_rule_t rule;
-+ client_data *cd = client_data_get(u, d->client_index);
-+
-+ /* unknown client */
-+ if (cd == NULL)
-+ return PA_HOOK_STOP;
-+
-+ ap = pa_idxset_get_by_index(u->policies, cd->policy);
-+
-+ rule = ap->rule[d->hook];
-+ if (rule)
-+ return rule(c, d, u);
-+
-+ return PA_HOOK_STOP;
-+}
-+
-+static const pa_access_hook_t event_hook[PA_SUBSCRIPTION_EVENT_FACILITY_MASK+1] = {
-+ [PA_SUBSCRIPTION_EVENT_SINK] = PA_ACCESS_HOOK_VIEW_SINK,
-+ [PA_SUBSCRIPTION_EVENT_SOURCE] = PA_ACCESS_HOOK_VIEW_SOURCE,
-+ [PA_SUBSCRIPTION_EVENT_SINK_INPUT] = PA_ACCESS_HOOK_VIEW_SINK_INPUT,
-+ [PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT] = PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT,
-+ [PA_SUBSCRIPTION_EVENT_MODULE] = PA_ACCESS_HOOK_VIEW_MODULE,
-+ [PA_SUBSCRIPTION_EVENT_CLIENT] = PA_ACCESS_HOOK_VIEW_CLIENT,
-+ [PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE] = PA_ACCESS_HOOK_VIEW_SAMPLE,
-+ [PA_SUBSCRIPTION_EVENT_SERVER] = PA_ACCESS_HOOK_VIEW_SERVER,
-+ [PA_SUBSCRIPTION_EVENT_CARD] = PA_ACCESS_HOOK_VIEW_CARD
-+};
-+
-+static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct userdata *u) {
-+ int facility;
-+ client_data *cd;
-+
-+ facility = d->event & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
-+
-+ cd = client_data_get (u, d->client_index);
-+ /* unknown client destination, block event */
-+ if (cd == NULL)
-+ goto block;
-+
-+ switch (d->event & PA_SUBSCRIPTION_EVENT_TYPE_MASK) {
-+ case PA_SUBSCRIPTION_EVENT_REMOVE:
-+ /* if the client saw this object before, let the event go through */
-+ if (remove_event(cd, facility, d->object_index)) {
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+ break;
-+
-+ case PA_SUBSCRIPTION_EVENT_CHANGE:
-+ /* if the client saw this object before, let it go through */
-+ if (find_event(cd, facility, d->object_index)) {
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+
-+ /* fallthrough to do hook check and register event */
-+ case PA_SUBSCRIPTION_EVENT_NEW: {
-+ pa_access_data data = *d;
-+
-+ /* new object, check if the client is allowed to inspect it */
-+ data.hook = event_hook[facility];
-+ if (data.hook && pa_hook_fire(&c->access[data.hook], &data) == PA_HOOK_OK) {
-+ /* client can inspect the object, remember for later */
-+ add_event(cd, facility, d->object_index);
-+ pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_OK;
-+ }
-+ break;
-+ }
-+ default:
-+ break;
-+ }
-+
-+block:
-+ pa_log("blocked event %02x/%d for client %d", d->event, d->object_index, d->client_index);
-+ return PA_HOOK_STOP;
-+}
-+
-+static bool
-+client_is_sandboxed (pa_client *cl)
-+{
-+ char *path;
-+ char data[2048];
-+ int n;
-+ const char *state = NULL;
-+ const char *current;
-+ bool result;
-+ int fd;
-+ pid_t pid;
-+
-+ if (cl->creds_valid) {
-+ pa_log ("client has trusted pid %d", cl->creds.pid);
-+ }
-+ else {
-+ pa_log ("no trusted pid found, assuming not sandboxed\n");
-+ return false;
-+ }
-+
-+ pid = cl->creds.pid;
-+
-+ path = pa_sprintf_malloc("/proc/%u/cgroup", pid);
-+ fd = pa_open_cloexec(path, O_RDONLY, 0);
-+ free (path);
-+
-+ if (fd == -1)
-+ return false;
-+
-+ pa_loop_read(fd, &data, sizeof(data), NULL);
-+ close(fd);
-+
-+ result = false;
-+ while ((current = pa_split_in_place(data, "\n", &n, &state)) != NULL) {
-+ if (strncmp(current, "1:name=systemd:", strlen("1:name=systemd:")) == 0) {
-+ const char *p = strstr(current, "flatpak-");
-+ if (p && p - current < n) {
-+ pa_log("found a flatpak cgroup, assuming sandboxed\n");
-+ result = true;
-+ break;
-+ }
-+ }
-+ }
-+
-+ return result;
-+}
-+
-+static uint32_t find_policy_for_client (struct userdata *u, pa_client *cl) {
-+ char *s;
-+
-+ s = pa_proplist_to_string(cl->proplist);
-+ pa_log ("client proplist %s", s);
-+ pa_xfree(s);
-+
-+ if (client_is_sandboxed (cl)) {
-+ pa_log("client is sandboxed, choosing portal policy\n");
-+ return u->portal_policy;
-+ }
-+ else {
-+ pa_log("client not sandboxed, choosing default policy\n");
-+ return u->default_policy;
-+ }
-+}
-+
-+static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ uint32_t policy;
-+
-+pa_log("client put\n");
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ /* when we get here, the client just connected and is not yet authenticated
-+ * we should probably install a policy that denies all access */
-+ policy = find_policy_for_client(u, cl);
-+
-+ client_data_new(u, cl->index, policy, cl->creds.pid);
-+
-+ return PA_HOOK_OK;
-+}
-+
-+static pa_hook_result_t client_auth_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ client_data *cd;
-+ uint32_t policy;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ cd = client_data_get (u, cl->index);
-+ if (cd == NULL)
-+ return PA_HOOK_OK;
-+
-+ policy = find_policy_for_client(u, cl);
-+ cd->policy = policy;
-+
-+ return PA_HOOK_OK;
-+}
-+
-+static pa_hook_result_t client_proplist_changed_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+ client_data *cd;
-+ uint32_t policy;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ cd = client_data_get (u, cl->index);
-+ if (cd == NULL)
-+ return PA_HOOK_OK;
-+
-+ policy = find_policy_for_client(u, cl);
-+ cd->policy = policy;
-+ cd->pid = cl->creds.pid;
-+
-+ return PA_HOOK_OK;
-+}
-+
-+static pa_hook_result_t client_unlink_cb(pa_core *c, pa_object *o, struct userdata *u) {
-+ pa_client *cl;
-+
-+ pa_assert(c);
-+ pa_object_assert_ref(o);
-+
-+ cl = (pa_client *) o;
-+ pa_assert(cl);
-+
-+ client_data_remove(u, cl->index);
-+
-+ return PA_HOOK_OK;
-+}
-+
-+
-+int pa__init(pa_module*m) {
-+ pa_modargs *ma = NULL;
-+ struct userdata *u;
-+ int i;
-+ access_policy *ap;
-+ DBusError error;
-+
-+ pa_assert(m);
-+
-+ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-+ pa_log("Failed to parse module arguments");
-+ goto fail;
-+ }
-+
-+ u = pa_xnew0(struct userdata, 1);
-+ u->core = m->core;
-+ m->userdata = u;
-+
-+ dbus_error_init(&error);
-+
-+ if (!(u->connection = pa_dbus_bus_get (u->core, DBUS_BUS_SESSION, &error))) {
-+ pa_log("Failed to connect to session bus: %s\n", error.message);
-+ dbus_error_free(&error);
-+ }
-+
-+ u->policies = pa_idxset_new (NULL, NULL);
-+ u->clients = pa_hashmap_new_full(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func, NULL,
-+ (pa_free_cb_t) client_data_free);
-+
-+ u->client_put_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PUT], PA_HOOK_EARLY, (pa_hook_cb_t) client_put_cb, u);
-+ u->client_auth_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_AUTH], PA_HOOK_EARLY, (pa_hook_cb_t) client_auth_cb, u);
-+ u->client_proplist_changed_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) client_proplist_changed_cb, u);
-+ u->client_unlink_slot = pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_CLIENT_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) client_unlink_cb, u);
-+
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++) {
-+ pa_hook_cb_t cb;
-+
-+ if (i == PA_ACCESS_HOOK_FILTER_SUBSCRIBE_EVENT)
-+ cb = (pa_hook_cb_t) filter_event;
-+ else
-+ cb = (pa_hook_cb_t) check_access;
-+
-+ u->hook[i] = pa_hook_connect(&u->core->access[i], PA_HOOK_EARLY - 1, cb, u);
-+ }
-+
-+ ap = access_policy_new(u, false);
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SERVER] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_MODULE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CARD] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_STAT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SAMPLE] = rule_allow;
-+
-+ ap->rule[PA_ACCESS_HOOK_PLAY_SAMPLE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_PLAYBACK] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_RECORD] = rule_allow;
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CLIENT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_CLIENT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SINK_INPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SINK_INPUT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT] = rule_check_owner;
-+
-+ u->default_policy = ap->index;
-+
-+ ap = access_policy_new(u, false);
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SERVER] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_MODULE] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CARD] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_STAT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SAMPLE] = rule_allow;
-+
-+ ap->rule[PA_ACCESS_HOOK_PLAY_SAMPLE] = rule_check_portal;
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_PLAYBACK] = rule_check_portal;
-+ ap->rule[PA_ACCESS_HOOK_CONNECT_RECORD] = rule_check_portal;
-+
-+ ap->rule[PA_ACCESS_HOOK_VIEW_CLIENT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_CLIENT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SINK_INPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SINK_INPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SINK_INPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SINK_INPUT] = rule_check_owner;
-+
-+ ap->rule[PA_ACCESS_HOOK_CREATE_SOURCE_OUTPUT] = rule_allow;
-+ ap->rule[PA_ACCESS_HOOK_VIEW_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_MOVE_SOURCE_OUTPUT] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME] = rule_check_owner;
-+ ap->rule[PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT] = rule_check_owner;
-+
-+ u->portal_policy = ap->index;
-+
-+ pa_modargs_free(ma);
-+ return 0;
-+
-+fail:
-+ pa__done(m);
-+
-+ if (ma)
-+ pa_modargs_free(ma);
-+ return -1;
-+}
-+
-+void pa__done(pa_module*m) {
-+ struct userdata* u;
-+ int i;
-+
-+ pa_assert(m);
-+
-+ if (!(u = m->userdata))
-+ return;
-+
-+ for (i = 0; i < PA_ACCESS_HOOK_MAX; i++) {
-+ if (u->hook[i])
-+ pa_hook_slot_free(u->hook[i]);
-+ }
-+
-+ if (u->policies)
-+ pa_idxset_free(u->policies, (pa_free_cb_t) access_policy_free);
-+
-+ if (u->client_put_slot)
-+ pa_hook_slot_free(u->client_put_slot);
-+ if (u->client_auth_slot)
-+ pa_hook_slot_free(u->client_auth_slot);
-+ if (u->client_proplist_changed_slot)
-+ pa_hook_slot_free(u->client_proplist_changed_slot);
-+ if (u->client_unlink_slot)
-+ pa_hook_slot_free(u->client_unlink_slot);
-+
-+ if (u->clients)
-+ pa_hashmap_free(u->clients);
-+
-+ if (u->connection)
-+ pa_dbus_connection_unref (u->connection);
-+
-+ pa_xfree(u);
-+}
---
-2.9.3
-
diff --git a/0016-Make-flatpak-module-load.patch b/0016-Make-flatpak-module-load.patch
deleted file mode 100644
index 7c034ed..0000000
--- a/0016-Make-flatpak-module-load.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 161ed876c3c810cb2de47516e11cf632591174bd Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen(a)redhat.com>
-Date: Fri, 15 Jul 2016 15:10:20 -0400
-Subject: [PATCH 16/18] Make flatpak module load
-
-It was using the wrong symver header.
----
- src/modules/module-flatpak.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/module-flatpak.c b/src/modules/module-flatpak.c
-index 64bbe86..cf428d4 100644
---- a/src/modules/module-flatpak.c
-+++ b/src/modules/module-flatpak.c
-@@ -43,7 +43,7 @@
- #include <pulsecore/core-util.h>
- #include <pulsecore/dbus-shared.h>
-
--#include "module-access-symdef.h"
-+#include "module-flatpak-symdef.h"
-
- PA_MODULE_AUTHOR("Matthias Clasen");
- PA_MODULE_DESCRIPTION("Controls access to server resources for flatpak apps");
---
-2.9.3
-
diff --git a/0017-Make-sure-to-set-the-pid-in-auth_cb.patch b/0017-Make-sure-to-set-the-pid-in-auth_cb.patch
deleted file mode 100644
index 8e1f413..0000000
--- a/0017-Make-sure-to-set-the-pid-in-auth_cb.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6fc7131ec231865d2c1ce8267013d9cf78f36e68 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen(a)redhat.com>
-Date: Fri, 15 Jul 2016 16:05:36 -0400
-Subject: [PATCH 17/18] Make sure to set the pid in auth_cb
-
----
- src/modules/module-flatpak.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/module-flatpak.c b/src/modules/module-flatpak.c
-index cf428d4..9375a9b 100644
---- a/src/modules/module-flatpak.c
-+++ b/src/modules/module-flatpak.c
-@@ -510,7 +510,6 @@ static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata
- pa_client *cl;
- uint32_t policy;
-
--pa_log("client put\n");
- pa_assert(c);
- pa_object_assert_ref(o);
-
-@@ -523,6 +522,8 @@ pa_log("client put\n");
-
- client_data_new(u, cl->index, policy, cl->creds.pid);
-
-+ pa_log("client put: policy %d, pid %u\n", policy, cl->creds.pid);
-+
- return PA_HOOK_OK;
- }
-
-@@ -543,6 +544,9 @@ static pa_hook_result_t client_auth_cb(pa_core *c, pa_object *o, struct userdata
-
- policy = find_policy_for_client(u, cl);
- cd->policy = policy;
-+ cd->pid = cl->creds.pid;
-+
-+ pa_log("auth cb: policy %d, pid %u\n", cd->policy, cd->pid);
-
- return PA_HOOK_OK;
- }
---
-2.9.3
-
diff --git a/0018-Use-permissive-policy-by-default.patch b/0018-Use-permissive-policy-by-default.patch
deleted file mode 100644
index 41948ae..0000000
--- a/0018-Use-permissive-policy-by-default.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From e323416499a5c6c5b5261eabb59c5e6a7ffdc300 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans(a)redhat.com>
-Date: Mon, 13 Feb 2017 10:42:36 +0100
-Subject: [PATCH 18/18] Use permissive policy by default
-
-Make a default permissive policy that allows everything when not
-sandboxed.
-Improve debug log
----
- src/modules/module-flatpak.c | 69 ++++++++++++++++++++++----------------------
- 1 file changed, 35 insertions(+), 34 deletions(-)
-
-diff --git a/src/modules/module-flatpak.c b/src/modules/module-flatpak.c
-index 9375a9b..b223279 100644
---- a/src/modules/module-flatpak.c
-+++ b/src/modules/module-flatpak.c
-@@ -87,8 +87,10 @@ struct userdata {
- pa_hook_slot *hook[PA_ACCESS_HOOK_MAX];
-
- pa_idxset *policies;
-- uint32_t default_policy;
-+ uint32_t permissive_policy;
-+ uint32_t restricted_policy;
- uint32_t portal_policy;
-+ uint32_t default_policy;
-
- pa_dbus_connection *connection;
- pa_hashmap *clients;
-@@ -152,7 +154,7 @@ static client_data * client_data_new(struct userdata *u, uint32_t index, uint32_
- cd->policy = policy;
- cd->pid = pid;
- pa_hashmap_put(u->clients, PA_UINT32_TO_PTR(index), cd);
-- pa_log("new client %d with pid %d, policy %d", index, pid, policy);
-+ pa_log_debug("new client %d with pid %d, policy %d", index, pid, policy);
-
- return cd;
- }
-@@ -164,7 +166,7 @@ static void client_data_free(client_data *cd) {
- PA_LLIST_REMOVE(event_item, cd->events, e);
- pa_xfree(e);
- }
-- pa_log("removed client %d", cd->index);
-+ pa_log_debug("removed client %d", cd->index);
- pa_xfree(cd);
- }
-
-@@ -207,23 +209,23 @@ static pa_hook_result_t rule_check_owner (pa_core *c, pa_access_data *d, struct
- break;
- }
- if (idx == d->client_index) {
-- pa_log("allow operation %d/%d of same client %d", d->hook, d->object_index, idx);
-+ pa_log_debug("allow operation %d/%d of same client %d", d->hook, d->object_index, idx);
- result = PA_HOOK_OK;
- } else
-- pa_log("blocked operation %d/%d of client %d to client %d", d->hook, d->object_index, idx, d->client_index);
-+ pa_log_debug("blocked operation %d/%d of client %d to client %d", d->hook, d->object_index, idx, d->client_index);
-
- return result;
- }
-
- /* rule allows the operation */
- static pa_hook_result_t rule_allow (pa_core *c, pa_access_data *d, struct userdata *u) {
-- pa_log("allow operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ pa_log_debug("allow operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
- return PA_HOOK_OK;
- }
-
- /* rule blocks the operation */
- static pa_hook_result_t rule_block (pa_core *c, pa_access_data *d, struct userdata *u) {
-- pa_log("blocked operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ pa_log_debug("blocked operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
- return PA_HOOK_STOP;
- }
-
-@@ -241,14 +243,14 @@ static DBusHandlerResult portal_response(DBusConnection *connection, DBusMessage
- dbus_connection_remove_filter (connection, portal_response, cd);
-
- if (!dbus_message_get_args(msg, &error, DBUS_TYPE_UINT32, &response, DBUS_TYPE_INVALID)) {
-- pa_log("failed to parse Response: %s\n", error.message);
-+ pa_log_error("failed to parse Response: %s\n", error.message);
- dbus_error_free(&error);
- }
-
- cd->cached[d->hook].checked = true;
- cd->cached[d->hook].granted = response == 0 ? true : false;
-
-- pa_log("portal check result: %d\n", cd->cached[d->hook].granted);
-+ pa_log_debug("portal check result: %d\n", cd->cached[d->hook].granted);
-
- d->complete_cb (d, cd->cached[d->hook].granted);
-
-@@ -269,11 +271,11 @@ static pa_hook_result_t rule_check_portal (pa_core *c, pa_access_data *d, struct
- const char *device;
-
- if (cd->cached[d->hook].checked) {
-- pa_log("returned cached answer for portal check: %d\n", cd->cached[d->hook].granted);
-+ pa_log_debug("returned cached answer for portal check: %d\n", cd->cached[d->hook].granted);
- return cd->cached[d->hook].granted ? PA_HOOK_OK : PA_HOOK_STOP;
- }
-
-- pa_log("ask portal for operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-+ pa_log_info("ask portal for operation %d/%d for client %d", d->hook, d->object_index, d->client_index);
-
- cd->access_data = d;
-
-@@ -311,7 +313,7 @@ static pa_hook_result_t rule_check_portal (pa_core *c, pa_access_data *d, struct
- dbus_message_iter_close_container (&msg_iter, &dict_iter);
-
- if (!(r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(u->connection), m, -1, &error))) {
-- pa_log("Failed to call portal: %s\n", error.message);
-+ pa_log_error("Failed to call portal: %s\n", error.message);
- dbus_error_free(&error);
- dbus_message_unref(m);
- return PA_HOOK_STOP;
-@@ -320,7 +322,7 @@ static pa_hook_result_t rule_check_portal (pa_core *c, pa_access_data *d, struct
- dbus_message_unref(m);
-
- if (!dbus_message_get_args(r, &error, DBUS_TYPE_OBJECT_PATH, &handle, DBUS_TYPE_INVALID)) {
-- pa_log("Failed to parse AccessDevice result: %s\n", error.message);
-+ pa_log_error("Failed to parse AccessDevice result: %s\n", error.message);
- dbus_error_free(&error);
- dbus_message_unref(r);
- return PA_HOOK_STOP;
-@@ -333,7 +335,7 @@ static pa_hook_result_t rule_check_portal (pa_core *c, pa_access_data *d, struct
- &error);
- dbus_connection_flush(pa_dbus_connection_get(u->connection));
- if (dbus_error_is_set(&error)) {
-- pa_log("Failed to subscribe to Request signal: %s\n", error.message);
-+ pa_log_error("Failed to subscribe to Request signal: %s\n", error.message);
- dbus_error_free(&error);
- return PA_HOOK_STOP;
- }
-@@ -407,7 +409,7 @@ static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct user
- case PA_SUBSCRIPTION_EVENT_REMOVE:
- /* if the client saw this object before, let the event go through */
- if (remove_event(cd, facility, d->object_index)) {
-- pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ pa_log_debug("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
- return PA_HOOK_OK;
- }
- break;
-@@ -415,7 +417,7 @@ static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct user
- case PA_SUBSCRIPTION_EVENT_CHANGE:
- /* if the client saw this object before, let it go through */
- if (find_event(cd, facility, d->object_index)) {
-- pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ pa_log_debug("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
- return PA_HOOK_OK;
- }
-
-@@ -428,7 +430,7 @@ static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct user
- if (data.hook && pa_hook_fire(&c->access[data.hook], &data) == PA_HOOK_OK) {
- /* client can inspect the object, remember for later */
- add_event(cd, facility, d->object_index);
-- pa_log("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
-+ pa_log_debug("pass event %02x/%d to client %d", d->event, d->object_index, d->client_index);
- return PA_HOOK_OK;
- }
- break;
-@@ -438,7 +440,7 @@ static pa_hook_result_t filter_event (pa_core *c, pa_access_data *d, struct user
- }
-
- block:
-- pa_log("blocked event %02x/%d for client %d", d->event, d->object_index, d->client_index);
-+ pa_log_debug("blocked event %02x/%d for client %d", d->event, d->object_index, d->client_index);
- return PA_HOOK_STOP;
- }
-
-@@ -455,10 +457,10 @@ client_is_sandboxed (pa_client *cl)
- pid_t pid;
-
- if (cl->creds_valid) {
-- pa_log ("client has trusted pid %d", cl->creds.pid);
-+ pa_log_info ("client has trusted pid %d", cl->creds.pid);
- }
- else {
-- pa_log ("no trusted pid found, assuming not sandboxed\n");
-+ pa_log_info ("no trusted pid found, assuming not sandboxed\n");
- return false;
- }
-
-@@ -479,7 +481,7 @@ client_is_sandboxed (pa_client *cl)
- if (strncmp(current, "1:name=systemd:", strlen("1:name=systemd:")) == 0) {
- const char *p = strstr(current, "flatpak-");
- if (p && p - current < n) {
-- pa_log("found a flatpak cgroup, assuming sandboxed\n");
-+ pa_log_info("found a flatpak cgroup, assuming sandboxed\n");
- result = true;
- break;
- }
-@@ -490,18 +492,12 @@ client_is_sandboxed (pa_client *cl)
- }
-
- static uint32_t find_policy_for_client (struct userdata *u, pa_client *cl) {
-- char *s;
--
-- s = pa_proplist_to_string(cl->proplist);
-- pa_log ("client proplist %s", s);
-- pa_xfree(s);
--
- if (client_is_sandboxed (cl)) {
-- pa_log("client is sandboxed, choosing portal policy\n");
-+ pa_log_info("client is sandboxed, choosing portal policy\n");
- return u->portal_policy;
- }
- else {
-- pa_log("client not sandboxed, choosing default policy\n");
-+ pa_log_info("client not sandboxed, choosing default policy\n");
- return u->default_policy;
- }
- }
-@@ -522,7 +518,7 @@ static pa_hook_result_t client_put_cb(pa_core *c, pa_object *o, struct userdata
-
- client_data_new(u, cl->index, policy, cl->creds.pid);
-
-- pa_log("client put: policy %d, pid %u\n", policy, cl->creds.pid);
-+ pa_log_debug("client put: policy %d, pid %u\n", policy, cl->creds.pid);
-
- return PA_HOOK_OK;
- }
-@@ -546,7 +542,7 @@ static pa_hook_result_t client_auth_cb(pa_core *c, pa_object *o, struct userdata
- cd->policy = policy;
- cd->pid = cl->creds.pid;
-
-- pa_log("auth cb: policy %d, pid %u\n", cd->policy, cd->pid);
-+ pa_log_debug("auth cb: policy %d, pid %u\n", cd->policy, cd->pid);
-
- return PA_HOOK_OK;
- }
-@@ -598,7 +594,7 @@ int pa__init(pa_module*m) {
- pa_assert(m);
-
- if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-- pa_log("Failed to parse module arguments");
-+ pa_log_error("Failed to parse module arguments");
- goto fail;
- }
-
-@@ -609,7 +605,7 @@ int pa__init(pa_module*m) {
- dbus_error_init(&error);
-
- if (!(u->connection = pa_dbus_bus_get (u->core, DBUS_BUS_SESSION, &error))) {
-- pa_log("Failed to connect to session bus: %s\n", error.message);
-+ pa_log_error("Failed to connect to session bus: %s\n", error.message);
- dbus_error_free(&error);
- }
-
-@@ -633,6 +629,9 @@ int pa__init(pa_module*m) {
- u->hook[i] = pa_hook_connect(&u->core->access[i], PA_HOOK_EARLY - 1, cb, u);
- }
-
-+ ap = access_policy_new(u, true);
-+ u->permissive_policy = ap->index;
-+
- ap = access_policy_new(u, false);
-
- ap->rule[PA_ACCESS_HOOK_VIEW_SINK] = rule_allow;
-@@ -662,7 +661,7 @@ int pa__init(pa_module*m) {
- ap->rule[PA_ACCESS_HOOK_SET_SOURCE_OUTPUT_VOLUME] = rule_check_owner;
- ap->rule[PA_ACCESS_HOOK_KILL_SOURCE_OUTPUT] = rule_check_owner;
-
-- u->default_policy = ap->index;
-+ u->restricted_policy = ap->index;
-
- ap = access_policy_new(u, false);
-
-@@ -695,6 +694,8 @@ int pa__init(pa_module*m) {
-
- u->portal_policy = ap->index;
-
-+ u->default_policy = u->permissive_policy;
-+
- pa_modargs_free(ma);
- return 0;
-
---
-2.9.3
-
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 013457b..14dd871 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,5 +1,5 @@
-%global pa_major 10.0
-#global pa_minor 0
+%global pa_major 10.99
+%global pa_minor 1
#global snap 20141103
#global gitrel 327
@@ -25,7 +25,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}
@@ -56,24 +56,6 @@ Patch3: pulseaudio-8.99.2-getaffinity.patch
## upstream patches
## upstreamable patches
-Patch101: 0001-tagstruct-add-copy-method.patch
-Patch102: 0002-tagstruct-don-t-forget-to-copy-the-length.patch
-Patch103: 0003-subscribe-fix-typo.patch
-Patch104: 0004-creds-add-pid-to-pa_creds-and-use-store-it-in-pa_cli.patch
-Patch105: 0005-access-Add-access-control-hooks.patch
-Patch106: 0006-module-access-add-example-access-module.patch
-Patch107: 0007-module-access-add-async-handler-for-record.patch
-Patch108: 0008-module-access-use-the-auth-hook-and-pid.patch
-Patch109: 0009-pulsecore-Move-pa_core-structure-into-its-own-header.patch
-Patch110: 0010-Don-t-access-pa_core-structures-directly.patch
-Patch111: 0011-Add-access-checks.patch
-Patch112: 0012-protocol-native-add-async-access-checks.patch
-Patch113: 0013-core-add-current_client.patch
-Patch114: 0014-core-ensure-maincontext-for-current-client.patch
-Patch115: 0015-Add-flatpak-access-control.patch
-Patch116: 0016-Make-flatpak-module-load.patch
-Patch117: 0017-Make-sure-to-set-the-pid-in-auth_cb.patch
-Patch118: 0018-Use-permissive-policy-by-default.patch
BuildRequires: automake libtool
BuildRequires: pkgconfig(bash-completion)
@@ -261,25 +243,6 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch2 -p1 -b .disable_flat_volumes
%patch3 -p1 -b .affinity
-%patch101 -p1 -b .101
-%patch102 -p1 -b .102
-%patch103 -p1 -b .103
-%patch104 -p1 -b .104
-%patch105 -p1 -b .105
-%patch106 -p1 -b .106
-%patch107 -p1 -b .107
-%patch108 -p1 -b .108
-%patch109 -p1 -b .109
-%patch110 -p1 -b .110
-%patch111 -p1 -b .111
-%patch112 -p1 -b .112
-%patch113 -p1 -b .113
-%patch114 -p1 -b .114
-%patch115 -p1 -b .115
-%patch116 -p1 -b .116
-%patch117 -p1 -b .117
-%patch118 -p1 -b .118
-
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
src/daemon/default.pa.in
@@ -622,6 +585,9 @@ exit 0
%changelog
+* Tue Jul 25 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 10.99.1-1
+- pulseaudio-10.99.1 (#1474559)
+
* Mon Feb 13 2017 Wim Taymans <wtaymans(a)redhat.com> - 10.0-4
- Add flatpak access control
diff --git a/sources b/sources
index d3eeb5d..4c3db15 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (pulseaudio-10.0.tar.xz) = 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481
-SHA512 (pulseaudio-10.0.tar.xz.md5) = 6bacd8e56b8821eb839f3885535a0335f511a4ef4a9562c58a6d4c3db9ce474c1858bdadd099dc439c403f7697c795fccb9399fe87917291a251723796c8df6d
-SHA512 (pulseaudio-10.0.tar.xz.sha1) = c8ddc213c9d932da435caeef056dedf43d66e09ec8ffd7afc545c3a47a5c95c5888c03282870f6195cbad2bc07e49bdb106669f3af80e3e64f1fec53962ba3e5
+SHA512 (pulseaudio-10.99.1.tar.xz) = 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006
+SHA512 (pulseaudio-10.99.1.tar.xz.md5) = ef645038fd76874b6f5841ef3d7559cf09f4b1d12834ac7520e09112e6c629a4955da321fd73dd3097c438915e191cf047bb2b141e61a886e1c9e7ca1393166b
+SHA512 (pulseaudio-10.99.1.tar.xz.sha1) = 9cfec7fd0a3ae13d2f1d61ae80485e48e4bf4d7d06169abc062063c289e155b2646fa0e14766e0d1145a58933b4310436e09959689ddf4a01d0739759282c52d
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/qemu.git
by githook-noreply＠fedoraproject.org
The package rpms/qemu.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qemu.git/commit/?id=ac5e33cbfeacb....
Change:
+%ifnarch s390 s390x ppc ppc64
Thanks.
Full change:
============
commit 8699737f6dfd3eb60b89b72a122c110d8e7d9248
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Thu Oct 12 09:27:07 2017 +0100
Fix inverted check for ignoring test suite failures
An inverted conditional meant that test suite failures were previously
being ignored on all architectures by default, instead of only on the
blacklisted arches (currently none)
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index fc98df5..d7bd739 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1424,9 +1424,9 @@ b="./x86_64-softmmu/qemu-system-x86_64"
if [ -x "$b" ]; then "$b" -help; fi
%ifarch %{archs_ignore_test_failures}
-make check V=1
-%else
make check V=1 || :
+%else
+make check V=1
%endif
%if 0%{?hostqemu:1}
commit ac5e33cbfeacb5024a7659d81bf4c3be3021246c
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Thu Oct 12 09:33:37 2017 +0100
Remove iasl dep on big endian arches
iasl is still broken for QEMU usage on big endian
https://bugzilla.redhat.com/show_bug.cgi?id=1332449
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
diff --git a/qemu.spec b/qemu.spec
index ab5f7b6..fc98df5 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -169,7 +169,15 @@ BuildRequires: perl-podlators
BuildRequires: qemu-sanity-check-nodeps
BuildRequires: kernel
# For acpi compilation
+#
+# Upstream disables iasl for big endian and QEMU checks
+# for this. Fedora has re-enabled it on BE circumventing
+# the QEMU checks, but it fails none the less:
+#
+# https://bugzilla.redhat.com/show_bug.cgi?id=1332449
+%ifnarch s390 s390x ppc ppc64
BuildRequires: iasl
+%endif
# For chrpath calls in specfile
BuildRequires: chrpath
commit a8c6008b7d5b49c0f9c4654bed9d3836184aeed0
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Thu Oct 12 09:26:40 2017 +0100
Add patches from git master to fix TLS test suite with new GNUTLS
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
diff --git a/1016-crypto-fix-test-cert-generation-to-not-use-SHA1-algo.patch b/1016-crypto-fix-test-cert-generation-to-not-use-SHA1-algo.patch
new file mode 100644
index 0000000..7815618
--- /dev/null
+++ b/1016-crypto-fix-test-cert-generation-to-not-use-SHA1-algo.patch
@@ -0,0 +1,34 @@
+From 23c1595b0297e6ca8f37559af6f0b8533aa1fd99 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange(a)redhat.com>
+Date: Tue, 29 Aug 2017 17:03:30 +0100
+Subject: [PATCH] crypto: fix test cert generation to not use SHA1 algorithm
+
+GNUTLS 3.6.0 marked SHA1 as untrusted for certificates.
+Unfortunately the gnutls_x509_crt_sign() method we are
+using to create certificates in the test suite is fixed
+to always use SHA1. We must switch to a different method
+and explicitly ask for SHA256.
+
+Reviewed-by: Eric Blake <eblake(a)redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
+---
+ tests/crypto-tls-x509-helpers.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
+index 64073d3bd3..173d4e28fb 100644
+--- a/tests/crypto-tls-x509-helpers.c
++++ b/tests/crypto-tls-x509-helpers.c
+@@ -406,7 +406,8 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
+ * If no 'ca' is set then we are self signing
+ * the cert. This is done for the root CA certs
+ */
+- err = gnutls_x509_crt_sign(crt, ca ? ca : crt, privkey);
++ err = gnutls_x509_crt_sign2(crt, ca ? ca : crt, privkey,
++ GNUTLS_DIG_SHA256, 0);
+ if (err < 0) {
+ g_critical("Failed to sign certificate %s",
+ gnutls_strerror(err));
+--
+2.13.5
+
diff --git a/1017-io-fix-check-for-handshake-completion-in-TLS-test.patch b/1017-io-fix-check-for-handshake-completion-in-TLS-test.patch
new file mode 100644
index 0000000..536119d
--- /dev/null
+++ b/1017-io-fix-check-for-handshake-completion-in-TLS-test.patch
@@ -0,0 +1,34 @@
+From 689ed13e73bdb5a5ca3366524475e3065fae854a Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange(a)redhat.com>
+Date: Tue, 29 Aug 2017 17:04:52 +0100
+Subject: [PATCH] io: fix check for handshake completion in TLS test
+
+The TLS I/O channel test had mistakenly used && instead
+of || when checking for handshake completion. As a
+result it could terminate the handshake process before
+it had actually completed. This was harmless before but
+changes in GNUTLS 3.6.0 exposed this bug and caused the
+test suite to fail.
+
+Reviewed-by: Eric Blake <eblake(a)redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
+---
+ tests/test-io-channel-tls.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
+index ff96877323..a210d01ba5 100644
+--- a/tests/test-io-channel-tls.c
++++ b/tests/test-io-channel-tls.c
+@@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque)
+ mainloop = g_main_context_default();
+ do {
+ g_main_context_iteration(mainloop, TRUE);
+- } while (!clientHandshake.finished &&
++ } while (!clientHandshake.finished ||
+ !serverHandshake.finished);
+
+ g_assert(clientHandshake.failed == data->expectClientFail);
+--
+2.13.5
+
diff --git a/1018-io-fix-temp-directory-used-by-test-io-channel-tls-te.patch b/1018-io-fix-temp-directory-used-by-test-io-channel-tls-te.patch
new file mode 100644
index 0000000..d4718ea
--- /dev/null
+++ b/1018-io-fix-temp-directory-used-by-test-io-channel-tls-te.patch
@@ -0,0 +1,34 @@
+From d4adf9675801cd90e66ecfcd6a54ca1abc5a6698 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange(a)redhat.com>
+Date: Fri, 21 Jul 2017 12:47:39 +0100
+Subject: [PATCH] io: fix temp directory used by test-io-channel-tls test
+
+The test-io-channel-tls test was mistakenly using two of the
+same directories as test-crypto-tlssession. This causes a
+sporadic failure when using make -j$BIGNUM.
+
+Reported-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com>
+Reviewed-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
+---
+ tests/test-io-channel-tls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
+index 8eaa208e1b..ff96877323 100644
+--- a/tests/test-io-channel-tls.c
++++ b/tests/test-io-channel-tls.c
+@@ -127,8 +127,8 @@ static void test_io_channel_tls(const void *opaque)
+ /* We'll use this for our fake client-server connection */
+ g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
+
+-#define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/"
+-#define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/"
++#define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/"
++#define SERVER_CERT_DIR "tests/test-io-channel-tls-server/"
+ mkdir(CLIENT_CERT_DIR, 0700);
+ mkdir(SERVER_CERT_DIR, 0700);
+
+--
+2.13.5
+
diff --git a/qemu.spec b/qemu.spec
index f2bdef4..ab5f7b6 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -157,6 +157,9 @@ Patch1012: 1012-scsi-file-posix-add-support-for-persistent-reservati.patch
Patch1013: 1013-scsi-build-qemu-pr-helper.patch
Patch1014: 1014-scsi-add-multipath-support-to-qemu-pr-helper.patch
Patch1015: 1015-scsi-add-persistent-reservation-manager-using-qemu-p.patch
+Patch1016: 1016-crypto-fix-test-cert-generation-to-not-use-SHA1-algo.patch
+Patch1017: 1017-io-fix-check-for-handshake-completion-in-TLS-test.patch
+Patch1018: 1018-io-fix-temp-directory-used-by-test-io-channel-tls-te.patch
# documentation deps
BuildRequires: texinfo
6 years, 6 months
- 1
- 0
[Report] Packages Restricting Arches
by root
Package no longer excluding arches (1)
==================================
- prewikka
List of packages currently excluding arches (1882)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- GtkAda
ExclusiveArch: %{GNAT_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- LuxRender
ExclusiveArch: x86_64
- OpenTK
ExclusiveArch: %mono_arches
- PragmARC
ExclusiveArch: %{GNAT_arches}
- R-DynDoc
ExclusiveArch: armv7, ppc, go_arch
- RdRand
ExclusiveArch: %{ix86} x86_64
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GNAT_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GNAT_arches}
- apmd
ExclusiveArch: %{ix86}
- apmud
ExclusiveArch: ppc
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-boot-config
ExclusiveArch: %{arm}
- arm-trusted-firmware
ExclusiveArch: aarch64
- atomic
ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl aarch64 ppc64le s390x mips mipsel mipsr6 mipsr6el mips64 mips64el mips64r6 mips64r6el
ExclusiveArch: x86_64 ppc64le
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- banshee
ExclusiveArch: %{mono_arches}
- banshee-community-extensions
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
- bareftp
ExclusiveArch: %{mono_arches}
- bcc
ExclusiveArch: x86_64
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- beignet
ExclusiveArch: x86_64 %{ix86}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64 ia64
- bless
ExclusiveArch: %mono_arches
- boo
ExclusiveArch: %{mono_arches}
- buildah
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- bwa
ExclusiveArch: x86_64
- cadvisor
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64
- cargo
ExclusiveArch: %{rust_arches}
- carto
ExclusiveArch: %{nodejs_arches} noarch
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- chromium-native_client
ExclusiveArch: x86_64
- cjdns
ExclusiveArch: %{nodejs_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- compat-gcc-296
ExclusiveArch: %{ix86} ia64 ppc
- consul
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- corosync
ExclusiveArch: i686 x86_64
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- derelict
ExclusiveArch: %{ldc_arches}
- direnv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: %ix86 x86_64 aarch64
- docco
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- docker
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-anaconda-addon
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- docker-latest
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- dolphin-emu
ExclusiveArch: x86_64 armv7l aarch64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dustmite
ExclusiveArch: %{ldc_arches}
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc ppc64
- e3
ExclusiveArch: %{ix86} x86_64
- edac-utils
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- edb
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- efibootmgr
ExclusiveArch: %{ix86} x86_64 aarch64 arm
- efivar
ExclusiveArch: %{ix86} x86_64 aarch64
- elasticdump
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- embree
ExclusiveArch: x86_64
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- etcd
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- exciting
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- expresso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fedora-gnat-project-common
ExclusiveArch: noarch %{GNAT_arches}
- fence-virt
ExclusiveArch: i686 x86_64
- fes
ExclusiveArch: x86_64
- ffcall
ExclusiveArch: %{ffcall_arches}
- firmware-addon-dell
ExclusiveArch: x86_64 ia64 %{ix86}
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %GPRbuild_arches
- fpc
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
- freshmaker
ExclusiveArch: %{ix86} x86_64
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fst
ExclusiveArch: i686
- fwupdate
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gela-asis
ExclusiveArch: %{GNAT_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gl3n
ExclusiveArch: %{ldc_arches}
- glibc32
ExclusiveArch: x86_64 ppc64 s390x
- glide
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %GPRbuild_arches
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- gnu-smalltalk
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-i18n
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gofed
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- golang
ExclusiveArch: %{golang_arches}
- golang-bitbucket-kardianos-osext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-bitbucket-ww-goautoneg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-10gen-openssl
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- golang-github-3rf-mongo-lint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-AdRoll-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-AudriusButkevicius-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-go-nat-pmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-pfilter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-Azure-azure-sdk-for-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-toml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-BurntSushi-toml-test
ExclusiveArch: %{go_arches}
- golang-github-DATA-DOG-go-sqlmock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-DataDog-datadog-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-MakeNowJust-heredoc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Masterminds-semver
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Masterminds-vcs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-PuerkitoBio-purell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-urlesc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-RangelReale-osin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-RangelReale-osincli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-SeanDolphin-bqschema
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-Shopify-sarama
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Shopify-toxiproxy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Sirupsen-logrus
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-abbot-go-http-auth
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-agl-ed25519
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-akrennmair-gopcap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-appc-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-circbuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-radix
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-gomdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-asaskevich-govalidator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-auth0-go-jwt-middleware
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-aws-aws-sdk-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-beorn7-perks
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-gitmap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bgentry-speakeasy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bkaradzic-go-lz4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-blang-semver
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bmizerany-assert
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bmizerany-pat
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bmizerany-perks
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-boltdb-bolt
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bradfitz-http2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bugsnag-bugsnag-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bugsnag-panicwrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-du
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-luhn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ccding-go-stun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cenkalti-backoff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-chaseadamsio-goorgeous
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cheggaaa-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chmduquesne-rollinghash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-circonus-labs-circonus-gometrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-circonus-labs-circonusllhist
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cloudfoundry-incubator-candiedyaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cockroachdb-cmux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codegangsta-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-codegangsta-negroni
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-collectd-go-collectd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-gexpect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-etcd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-iptables
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-coreos-go-log
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-oidc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-semver
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-coreos-go-systemd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-coreos-pkg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cpuguy83-go-md2man
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cznic-b
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-fileutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-golex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lexer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-mathutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-ql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-sortutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-strutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-zappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d2g-dhcp4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d2g-dhcp4client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d4l3k-messagediff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-davecgh-go-spew
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-daviddengcn-go-colortext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dchest-cssmin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-denverdino-aliyungo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dgnorton-goback
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dgrijalva-jwt-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-digitalocean-godo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-go-connections
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-go-units
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-libcontainer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-libkv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-libtrust
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docker-spdystream
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docopt-docopt-go
ExclusiveArch: %{go_arches}
- golang-github-dustin-go-humanize
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dvsekhvalnov-jose2go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-eapache-go-resiliency
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-eapache-queue
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-edsrzf-mmap-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-eknkc-amber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-elazarl-go-bindata-assetfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-emicklei-go-restful
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-endophage-gotuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-evanphx-json-patch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-pool
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fortytw2-leaktest
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsouza-go-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-garyburd-redigo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gengo-grpc-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-getsentry-raven-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ghodss-yaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-glacjay-goini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-asn1-ber-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-errors-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-ini-ini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-ldap-ldap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-macaron-inject
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-mgo-mgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-sql-driver-mysql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-tomb-tomb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gobwas-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-godbus-dbus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-appengine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-glog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-groupcache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-golang-sys
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-time
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-blas
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-floats
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-graph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-lapack
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gonum-matrix
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-google-btree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-genproto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-github
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-querystring
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-google-gofuzz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-goraft-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-context
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-handlers
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-mux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-securecookie
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-sessions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-websocket
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gosexy-gettext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-grpc-ecosystem-go-grpc-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-grpc-ecosystem-grpc-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-grpc-grpc-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-consul-migrate
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-errwrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-checkpoint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-cleanhttp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-immutable-radix
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-memdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-msgpack
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-multierror
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-retryablehttp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-sockaddr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-syslog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-go-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-golang-lru
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-hcl
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-hil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-logutils
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-mdns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-memberlist
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-net-rpc-msgpackrpc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-raft-boltdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-raft-mdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-scada-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-serf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hashicorp-yamux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hawkular-hawkular-client-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-howeyc-gopass
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-imdario-mergo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-mousetrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-muxado
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-influxdb-hyperleveldb-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-influxdb-influxdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-influxdb-rocksdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jackpal-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jacobsa-oglematchers
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jessevdk-go-flags
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jfrazelle-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jinzhu-gorm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jmespath-go-jmespath
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jmhodges-levigo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-jonboulle-clockwork
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jtolds-gls
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-juju-ratelimit
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-julienschmidt-httprouter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-karlseguin-ccache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-karlseguin-expect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-kballard-go-shellquote
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kdar-factorlog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kimor79-gollectd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-klauspost-cpuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-crc32
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-klauspost-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-knieriem-markdown
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kr-fs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-kr-pretty
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kr-pty
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kr-text
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-kyokomi-emoji
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-lib-pq
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lpabon-godbc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lsegal-gucumber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-magiconair-properties
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-isatty
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-runewidth
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-sqlite3
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-matttproud-golang_protobuf_extensions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mesos-mesos-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-miekg-dns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-miekg-mmark
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-pkcs11
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-axis2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-lua
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-minio-sha256-simd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mistifyio-go-zfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-copystructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-homedir
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-go-wordwrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-mapstructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-reflectwalk
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mreiferson-go-httpclient
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-mvo5-goconfigparser
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mvo5-uboot-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mxk-go-flowrate
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ncw-swift
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-noahdesu-go-ceph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ojii-gettext.go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-tablewriter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-ts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olivere-elastic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-onsi-ginkgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-onsi-gomega
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-opencontainers-runtime-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-opencontainers-specs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-openshift-go-json-rest
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-go-systemd
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-openshift-sdn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-oschwald-geoip2-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-oschwald-maxminddb-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pelletier-go-buffruneio
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pelletier-go-toml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-petar-GoLLRB
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-peterh-liner
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-petermattis-goid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pkg-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pkg-profile
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pkg-sftp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pmezard-go-difflib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-client_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-client_model
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-common
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-procfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-racker-perigee
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rackspace-gophercloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rakyll-globalconf
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rakyll-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-rakyll-statik
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rcrowley-go-metrics
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-remyoudompheng-bigfft
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-russross-blackfriday
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ryanuber-columnize
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-samalba-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-samuel-go-zookeeper
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-sasha-s-go-deadlock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-seccomp-libseccomp-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-shiena-ansicolor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shurcooL-sanitized_anchor_name
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-skarademir-naturalsort
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skratchdot-open-golang
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skynetservices-skydns
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-assertions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-smartystreets-go-aws-auth
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-goconvey
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spacejam-loghisto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spacemonkeygo-flagfile
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-spacemonkeygo-spacelog
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-spf13-afero
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-cast
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-cobra
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spf13-fsync
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-jWalterWeatherman
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-nitro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spf13-pflag
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-viper
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stathat-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-stevvooe-resumable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-stretchr-objx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-testify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-syndtr-gocapability
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-goleveldb
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-gosnappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-tent-http-link-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-thejerf-suture
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tonnerre-golang-pretty
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ugorji-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-urfave-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vaughan0-go-ini
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-vbatts-tar-split
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vishvananda-netlink
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}}
- golang-github-vishvananda-netns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vitrun-qart
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vjeantet-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vmware-govcloudair
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-wsxiaoys-terminal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonpointer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonreference
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonschema
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xiang90-probing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-xtaci-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-smux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-ace
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-gohtml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yvasiyarov-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-gorelic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-newrelic_platform_go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-zillode-notify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-google-golangorg-cloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gcfg
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-go-crypto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-decimal-inf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-exp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-googlecode-goauth2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gogoprotobuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gomock
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-google-api-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-goprotobuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-log4go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-net
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-sqlite
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-text
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-go-check-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-go-macaroon-macaroon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-retry-v1
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-yaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotags
ExclusiveArch: %{go_arches}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- gsf-sharp
ExclusiveArch: %mono_arches
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- heketi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- hub
ExclusiveArch: %{go_arches}
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- icaro
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
- ikarus
ExclusiveArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- ioport
ExclusiveArch: %{ix86} x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: %{arm} %{ix86} x86_64
- iwyu
ExclusiveArch: %{ix86} x86_64
- ixpdimm_sw
ExclusiveArch: x86_64
- jake
ExclusiveArch: %{nodejs_arches} noarch
- jasmine-node
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- julia
ExclusiveArch: %{ix86} x86_64
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
- knot-resolver
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kosmtik
ExclusiveArch: %{nodejs_arches} noarch
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- latrace
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- lazarus
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libflatarray
ExclusiveArch: %{ix86} x86_64
- libhfi1
ExclusiveArch: x86_64
- libica
ExclusiveArch: s390 s390x
- libinvm-cim
ExclusiveArch: x86_64
- libinvm-cli
ExclusiveArch: x86_64
- libinvm-i18n
ExclusiveArch: x86_64
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libjingle
ExclusiveArch: %{ix86} x86_64 %{arm}
- libmfx
ExclusiveArch: %{ix86} x86_64
- libpsm2
ExclusiveArch: x86_64
- librtas
ExclusiveArch: ppc %{power64}
- libseccomp
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 ia64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: ppc %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lldb
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- lodash
ExclusiveArch: %{nodejs_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: ppc %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maven-eclipse-plugin
ExclusiveArch: %{ix86} x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} %{ix86} x86_64
- mine_detector
ExclusiveArch: %{GNAT_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mnemosyne
ExclusiveArch: noarch %{qt5_qtwebengine_arches}
- mocha
ExclusiveArch: %{nodejs_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mongo-tools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-debugger
ExclusiveArch: %ix86 x86_64
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nacl-arm-binutils
ExclusiveArch: x86_64
- nacl-arm-gcc
ExclusiveArch: x86_64
- nacl-arm-newlib
ExclusiveArch: x86_64
- nacl-binutils
ExclusiveArch: x86_64
- nacl-gcc
ExclusiveArch: x86_64
- nacl-newlib
ExclusiveArch: x86_64
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nini
ExclusiveArch: %{mono_arches}
- node-gyp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-abbrev
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-accepts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-after
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-agent-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-agentkeepalive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ain2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-alter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-cyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-font
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-green
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-magenta
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-styles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-wrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-yellow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansicolors
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansidiff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansistyles
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aproba
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-are-we-there-yet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-argparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-argsparser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-union
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-differ
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-find-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-foreach
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-uniq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-unique
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arrify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-as-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ascii-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ascli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-asn1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assert-plus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assertion-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assume
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ast-traverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ast-types
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-astral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-angular-annotate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-pass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-async-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-queue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-some
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-runtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-balanced-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-batch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bcrypt
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-beeper
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-benchmark
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bignumber-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bindings
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-block-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bluebird
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-body-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boolbase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-brace-expansion
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-breakable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-browser-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buf-compare
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-crc32
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-shims
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffer-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffertools
ExclusiveArch: %{nodejs_arches}
- nodejs-bufferutil
ExclusiveArch: %{nodejs_arches}
- nodejs-builtin-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-builtins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bundle-dependencies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-burrito
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-caching-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-call-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-caller-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsites
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camel-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caniuse-db
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-capture-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-carrier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caseless
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-connect-middleware
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainsaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chalk
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-change-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-char-spinner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-character-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-child-process-close
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chmodr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chownr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chrono
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjson
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-yaml-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-spinner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cliui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-stats
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-closure-compiler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-code-point-at
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-collections
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colour
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-columnify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-combined-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commander
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commondir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commoner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commonmark
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-component-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compress-commons
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compressible
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compression
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-map
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-config-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-livereload
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-console-dot-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-constant-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constantinople
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-disposition
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-jar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookiejar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-core-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-util-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-couch-login
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coveralls
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-crc32-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-create-error-class
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cross-spawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cross-spawn-async
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cryptiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-select
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-what
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csscomb-core
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cssom
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csurf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-generate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-spectrum
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ctype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-currently-unhandled
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cycle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-d
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dashdash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-data-uri-to-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-date-now
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dateformat
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-debuglog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-decamelize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decompress-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-eql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deep-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-default-require-extensions
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defaults
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defence
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defence-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-properties
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defined
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-degenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-del
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delayed-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-delegates
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dep-graph
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-depd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dependency-lister
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deprecated
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detective
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dezalgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-docopt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-doctrine
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dom-serializer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domelementtype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domutils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dotfile-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dreamopt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dryice
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dtree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-duplexer3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duration
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ebnf-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ecstatic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-editor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ee-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-emojione
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encodeurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encoding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-end-of-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-entities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-ex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errorhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-abstract
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-to-primitive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es5-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es5-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-iterator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-set
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-html
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-regexp-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-string-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escodegen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-fb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-harmony-jscs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esrecurse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse-fb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-etag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-event-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-event-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eventemitter2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-eventemitter3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-exit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-brackets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-tilde
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extsprintf
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eyes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fancy-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-far
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fast-levenshtein
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-faye-websocket
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fd-slicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fg-lodash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-figures
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-file-entry-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-sync-cmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-uri-to-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-filed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filelist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filename-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fileset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fill-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fill-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-finalhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-find-cache-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-find-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-findup-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-first-chunk-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flagged-respawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-dot-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-in
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-for-own
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-foreach
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forever-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-form-data
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-formatio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-formidable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forwarded
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-freetree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fresh
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-from2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fs-ext
ExclusiveArch: %{nodejs_arches}
- nodejs-fs-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-vacuum
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-write-stream-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-ignore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-npm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ftp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-function-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gauge
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gaze
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gdal
ExclusiveArch: %{nodejs_arches}
- nodejs-generate-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generate-object-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-pkg-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stdin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-uri
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-getobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gettext-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-username-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-parent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-prefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globby
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globule
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glogg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gonzales-pe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-got
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-readlink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-growl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-angular-templates
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-banner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-cli
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-compare-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-clean
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-concat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-cssmin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-htmlmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-internal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-less
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-requirejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-uglify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-watch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-git-authors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-html-validation
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-init
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-known-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-lib-contrib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-sed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-simple-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-util-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-process
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gzip-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-handlebars
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-har-validator
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-unicode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hash_file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hawk
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-he
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-heap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-highlight-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hoek
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hooker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hosted-git-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-html-minifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-htmlparser2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-errors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-signature
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-https-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-humanize-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-i18n-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i2c
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv-lite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-iferr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ignore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-imurmurhash
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-indent-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-infinity-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inflight
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-inherits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherits1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ini
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-init-package-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inline-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-install
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-int64-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-interpret
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-into-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-invert-kv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ip
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irc-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irregular-plurals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-arrayish
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-boolean-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-builtin-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-callable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-date-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-dotfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-equal-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extendable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-finite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-fullwidth-code-point
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-generator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-my-json-valid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-number
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-number-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-in-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-inside
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-plain-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-plain-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-primitive
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-redirect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-relative
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-retry-allowed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-text-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-typedarray
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-unc-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-valid-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-windows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-isexe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-iso8601
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isodate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jade
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-growl-reporter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-reporters
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jison
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison-lex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jju
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joose
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-namespace-depended
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-simplerequest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-base64
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-yaml
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jschardet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jscoverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-localizer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-helpfulerror
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stable-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stringify-safe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonselect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jwt-simple
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keypress
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-kind-of
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-klaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-langdetect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-latest-version
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazystream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lcid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lcov-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-leaflet
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-formbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-hash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leche
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-left-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-levn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lex-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-libxmljs
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-line-reader
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linkify-it
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-grunt-tasks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lockfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-log-driver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-symbols
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lolex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loud-rejection
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lower-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lowercase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ltx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-make-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-generator-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik
ExclusiveArch: %{nodejs_arches}
- nodejs-mapnik-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik-vector-tile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-markdown
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-markdown-it-testgen
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-max-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-maxmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mbtiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-md5-hex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-o-matic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mdurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-media-typer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoizee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-meow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-descriptors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-merge-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-metascript
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-method-override
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-millstone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mime-db
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mimeparse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minimatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minstache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkfiletree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-module-not-found-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-moment
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mongodb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb-core
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-monocle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-morgan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-muffin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-multimatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiparty
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mustache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mute-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mysql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mz
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nan0
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nano
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-native-or-bluebird
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ncp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-needle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-negotiator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nested-error-stacks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-net-browserify-alt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-netmask
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-next-tick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-node-expat
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-int64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-print
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-static
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-status-codes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-stringprep
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-uuid
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nomnom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt-usage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-noptify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-normalize-git-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-package-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-cache-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-install-checks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-package-arg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-run-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-stats
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-user-validate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npmlog
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-api
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-audit-shrinkwrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nth-check
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-number-is-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-numeral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-assign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-dot-entries
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-omit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-finished
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-headers
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-once
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-onetime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-only-shallow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opener
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opn
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optionator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-orchestrator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ordered-read-streams
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-os-homedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-locale
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-tmpdir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-osenv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-output-file-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-p-finally
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-locate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pac-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pac-resolver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packet-reader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pad-left
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-paperboy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-param-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-github-repo-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parse-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parserlib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parseurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pascal-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-array
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-exists
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-inside
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-key
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pathval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pause
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pause-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pedding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pegjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pem
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pg-connection-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pgpass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkg-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkginfo
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-platform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-plur
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portfinder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-posix-getopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-bytea
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-date
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-interval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prelude-ls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prepend-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-preserve
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-hrtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-private
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-process-nextick-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promises-aplus-tests
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prompt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promzard
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-propagate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proto-list
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxyquire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pruddy-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pseudomap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pubcontrol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q-io
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qtdatastream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-queue-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qunit-extras
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qunitjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rainbowsocks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-randomatic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-range-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-raw-body
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rc
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-re-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-all-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-dir-files
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-installed
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-tree
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readable-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-readdir-scoped-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdirp
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-realize-package-specifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-recast
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rechoir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-redent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reduce-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-regex-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-registry-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-relateurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repeat-element
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeat-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeating
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-requestretry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-cs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-require-directory
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-inject
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-uncached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-yaml
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requirejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requires-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-pkg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-response-time
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resumer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-retry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-revalidator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rewire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rhea
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rimraf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rndm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ronn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-run-parallel-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-runforcover
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safe-json-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safecb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-samsam
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sauce-tunnel
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sax
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-scmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-secure-random
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-semver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-send
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sentence-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sequencify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serialize-error
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-static
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-getter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-immediate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-immediate-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-setimmediate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sha
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shelljs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-shelljs-nodecli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-format
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-showdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sigmund
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-signal-exit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-silent-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-fmt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-single-line-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon-restore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slide
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-smart-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-snake-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snockets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sntp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socks-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-socks-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sort-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sorted-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-fixtures
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sparkles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-spdx-correct
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-exceptions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-expression-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-license-ids
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-speedometer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sqlite3
ExclusiveArch: %{nodejs_arches}
- nodejs-srs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-st
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-utils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-static-favicon
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-statuses
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-std-mocks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-combiner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-consume
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-counter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-reduce
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-replace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-shift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-spigot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamsink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamtest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-repeat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-trim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string-width
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string_decoder
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringmap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-ansi
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-bom-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-json-comments
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strscanner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stylus
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-success-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent-proxy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-supertest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supports-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-swap-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-symbol-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-mocha-reporter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-temporary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-cordovajs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-liferay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-terst
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-test
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testswarm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-text-extensions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-thenify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thenify-all
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through2-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thunkify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tildify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tilejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive-mapnik
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tiletype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-stamp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-timed-out
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timers-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tiny-lr-fork
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-title-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tlds
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-absolute-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-object-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tough-cookie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tracejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-transformers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-traverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-treeify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-trim-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-try-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tryor
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tsscmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ttembed-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tunnel-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-check
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-type-detect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-name
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-typeahead.js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typedarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uc-dot-micro
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uglify-to-browserify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uid-safe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ultron
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-umask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unc-path-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore-dot-logger
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unicode-7.0.0
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unicode-length
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unique-filename
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-slug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unpipe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unzip-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uri-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-join
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-parse-lax
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utfx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-deprecate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utilities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utils-merge
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vali-date
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-validate-npm-package-license
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-validate-npm-package-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vasync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-verror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vhost
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vinyl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vow-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-w3cjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walkdir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-watchit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wcwidth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-websocket-driver
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-when
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-which
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-win-spawn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-window-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-winston
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-with
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-woothee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wordwrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrap-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wrap-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrappy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-file-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ws
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xml2js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmldom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xregexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-xtend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-y18n
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yallist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yargs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yauzl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zip-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zipfile
ExclusiveArch: %{nodejs_arches}
- nodejs-zlib-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zlibjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: %{ix86} x86_64
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64
- nwchem
ExclusiveArch: x86_64 %{ix86}
- oci-register-machine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- ocitools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- odcs
ExclusiveArch: %{ix86} x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-powerd
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: %{ix86} x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmx
ExclusiveArch: x86_64 %{ix86}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orocos-bfl
ExclusiveArch: %{ix86} x86_64
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- paflib
ExclusiveArch: ppc %{power64}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 arm
- pesign-test-app
ExclusiveArch: i686 x86_64 ia64 aarch64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- polyml
ExclusiveArch: %{ix86} x86_64 sparc sparcv8 sparcv9 sparcv9v ppc %{power64} %{arm} aarch64 ia64 mips mipsel
- poppler-sharp
ExclusiveArch: %mono_arches
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- ppc64-utils
ExclusiveArch: ppc %{power64}
- publican-jboss
ExclusiveArch: i686 x86_64
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- python-afl
ExclusiveArch: %{ix86} x86_64
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-openoffice
ExclusiveArch: noarch x86_64
- python-ovirt-register
ExclusiveArch: %{ix86} x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: %{openblas_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rkt
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches} noarch
- s390utils
ExclusiveArch: s390 s390x
- sagemath
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x
- seamonkey
ExclusiveArch: %{ix86} x86_64
- servicelog
ExclusiveArch: ppc %{power64}
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: x86_64
- shim-signed
ExclusiveArch: x86_64 aarch64
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slapi-nis
ExclusiveArch: x86_64 %{ix86}
- smuxi
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- source-to-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-xpi
ExclusiveArch: i686 x86_64 armv6l armv7l armv7hl aarch64
- spring
ExclusiveArch: %{ix86} x86_64
- springlobby
ExclusiveArch: %{ix86} x86_64
- statsd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supermin
ExclusiveArch: x86_64
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64
- tboot
ExclusiveArch: %{ix86} x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird-enigmail
ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tpm2-tools
ExclusiveArch: %{ix86} x86_64
- tpm2-tss
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- v8
ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdsm
ExclusiveArch: x86_64 %{power64} aarch64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wiredtiger
ExclusiveArch: x86_64 aarch64 ppc64le
- wraplinux
ExclusiveArch: %{ix86} x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x86info
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-geode
ExclusiveArch: %{ix86}
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64 ia64
- xorg-x11-drv-omap
ExclusiveArch: %{arm}
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-opentegra
ExclusiveArch: %{arm}
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xsupplicant
ExclusiveArch: %{ix86} x86_64 ppc %{power64}
- ycssmin
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GNAT_arches}
- zlib-ada
ExclusiveArch: %{GNAT_arches}
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/gperftools.git
by githook-noreply＠fedoraproject.org
The package rpms/gperftools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gperftools.git/commit/?id=269f60e....
Change:
+%ifarch s390x aarch64
Thanks.
Full change:
============
commit 269f60eced4510841b912bc083b873cbd9591c1d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Oct 11 15:26:06 2017 -0400
add configure option to disable generic dynamic tls model, do so for s390x and aarch64, add aligned_alloc support
diff --git a/gperftools-2.6.1-aligned_alloc.patch b/gperftools-2.6.1-aligned_alloc.patch
new file mode 100644
index 0000000..3970167
--- /dev/null
+++ b/gperftools-2.6.1-aligned_alloc.patch
@@ -0,0 +1,33 @@
+diff -up gperftools-2.6.1/Makefile.am.aa gperftools-2.6.1/Makefile.am
+--- gperftools-2.6.1/Makefile.am.aa 2017-10-11 15:17:39.618807653 -0400
++++ gperftools-2.6.1/Makefile.am 2017-10-11 15:17:59.331338671 -0400
+@@ -97,6 +97,7 @@ endif OSX
+ if HAVE_OBJCOPY_WEAKEN
+ WEAKEN = $(OBJCOPY) -W malloc -W free -W realloc -W calloc -W cfree \
+ -W memalign -W posix_memalign -W valloc -W pvalloc \
++ -W aligned_alloc \
+ -W malloc_stats -W mallopt -W mallinfo -W nallocx \
+ -W _Znwm -W _ZnwmRKSt9nothrow_t -W _Znam -W _ZnamRKSt9nothrow_t \
+ -W _ZdlPv -W _ZdaPv \
+diff -up gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa gperftools-2.6.1/src/libc_override_gcc_and_weak.h
+--- gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa 2017-10-11 15:18:32.234555868 -0400
++++ gperftools-2.6.1/src/libc_override_gcc_and_weak.h 2017-10-11 15:18:38.243412911 -0400
+@@ -143,6 +143,7 @@ extern "C" {
+ void* calloc(size_t n, size_t size) __THROW ALIAS(tc_calloc);
+ void cfree(void* ptr) __THROW ALIAS(tc_cfree);
+ void* memalign(size_t align, size_t s) __THROW ALIAS(tc_memalign);
++ void* aligned_alloc(size_t align, size_t s) __THROW ALIAS(tc_memalign);
+ void* valloc(size_t size) __THROW ALIAS(tc_valloc);
+ void* pvalloc(size_t size) __THROW ALIAS(tc_pvalloc);
+ int posix_memalign(void** r, size_t a, size_t s) __THROW
+diff -up gperftools-2.6.1/src/libc_override_redefine.h.aa gperftools-2.6.1/src/libc_override_redefine.h
+--- gperftools-2.6.1/src/libc_override_redefine.h.aa 2017-10-11 15:18:55.012013968 -0400
++++ gperftools-2.6.1/src/libc_override_redefine.h 2017-10-11 15:19:20.528406906 -0400
+@@ -71,6 +71,7 @@ extern "C" {
+ void* calloc(size_t n, size_t s) { return tc_calloc(n, s); }
+ void cfree(void* p) { tc_cfree(p); }
+ void* memalign(size_t a, size_t s) { return tc_memalign(a, s); }
++ void* aligned_alloc(size_t a, size_t s) { return tc_memalign(a, s); }
+ void* valloc(size_t s) { return tc_valloc(s); }
+ void* pvalloc(size_t s) { return tc_pvalloc(s); }
+ int posix_memalign(void** r, size_t a, size_t s) {
diff --git a/gperftools-2.6.1-disable-generic-dynamic-tls.patch b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
new file mode 100644
index 0000000..ae87e5d
--- /dev/null
+++ b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
@@ -0,0 +1,32 @@
+diff -up ./configure.ac.dynload ./configure.ac
+--- ./configure.ac.dynload 2017-08-24 15:23:01.126622099 -0400
++++ ./configure.ac 2017-08-24 15:29:46.332132222 -0400
+@@ -614,6 +614,16 @@ AC_COMPILE_IFELSE(
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+
++default_enable_generic_dynamic_tls=yes
++AC_ARG_ENABLE([general-dynamic-tls],
++ [AS_HELP_STRING([--disable-general-dynamic-tls],
++ [Do not use the general dynamic TLS model])],
++ [],
++ [enable_generic_dynamic_tls="$default_enable_generic_dynamic_tls"])
++AS_IF([test "x$enable_generic_dynamic_tls" = xyes],
++ [AC_DEFINE([ENABLE_GENERIC_DYNAMIC_TLS], 1,
++ [Use the generic dynamic TLS model])])
++
+ # Write generated configuration file
+ AC_CONFIG_FILES([Makefile
+ src/gperftools/tcmalloc.h src/windows/gperftools/tcmalloc.h])
+diff -up ./src/base/basictypes.h.dynload ./src/base/basictypes.h
+--- ./src/base/basictypes.h.dynload 2017-08-24 15:30:30.210996293 -0400
++++ ./src/base/basictypes.h 2017-08-24 15:31:01.889176214 -0400
+@@ -200,7 +200,7 @@ struct CompileAssert {
+ # define ATTRIBUTE_UNUSED
+ #endif
+
+-#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS)
++#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS) && defined(ENABLE_GENERIC_DYNAMIC_TLS)
+ #define ATTR_INITIAL_EXEC __attribute__ ((tls_model ("initial-exec")))
+ #else
+ #define ATTR_INITIAL_EXEC
diff --git a/gperftools.spec b/gperftools.spec
index 9236583..145e973 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -4,7 +4,7 @@
Name: gperftools
Version: 2.6.1
-Release: 3%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
@@ -12,12 +12,18 @@ URL: https://github.com/gperftools/gperftools
Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{vers...
# There is no ucontext typedef on ppc64, at least not in rawhide.
Patch0: gperftools-2.6.1-ppc64-ucontext-fix.patch
+# Conditionalize generic dynamic tls model
+Patch1: gperftools-2.6.1-disable-generic-dynamic-tls.patch
+# Add support for C11 aligned_alloc
+# https://github.com/gperftools/gperftools/commit/d406f228
+Patch2: gperftools-2.6.1-aligned_alloc.patch
ExcludeArch: s390
%ifnarch s390x
BuildRequires: libunwind-devel
%endif
BuildRequires: perl-generators
+BuildRequires: autoconf, automake, libtool
Requires: gperftools-devel = %{version}-%{release}
Requires: pprof = %{version}-%{release}
@@ -61,6 +67,8 @@ Pprof is a heap and CPU profiler tool, part of the gperftools suite.
%prep
%setup -q
%patch0 -p1 -b .ucontextfix
+%patch1 -p1 -b .dynload
+%patch2 -p1 -b .aa
# Fix end-of-line encoding
sed -i 's/\r//' README_windows.txt
@@ -68,10 +76,15 @@ sed -i 's/\r//' README_windows.txt
# No need to have exec permissions on source code
chmod -x src/*.h src/*.cc
+autoreconf -ifv
+
%build
CFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
CXXFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
%configure \
+%ifarch s390x aarch64
+ --disable-general-dynamic-tls \
+%endif
--disable-dynamic-sized-delete-support \
--disable-static
@@ -115,6 +128,13 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Wed Oct 11 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-5
+- add aligned_alloc support
+
+* Thu Aug 24 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-4
+- add configure option to disable generic dynamic tls model
+- disable generic dynamic tls model on s390x and aarch64
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 137b2efb2616f63c1d57a8b720926a42ac9b453b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Aug 2 22:57:22 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/gperftools.spec b/gperftools.spec
index 45f5444..9236583 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -4,7 +4,7 @@
Name: gperftools
Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
@@ -115,6 +115,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 601f58443080090d46125c2f9fd1fa6998983dfd
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 11:55:42 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/gperftools.spec b/gperftools.spec
index be34574..45f5444 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -4,7 +4,7 @@
Name: gperftools
Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
@@ -115,6 +115,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jul 17 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-1
- update to 2.6.1
commit b808a2487631c66e475ec397c32ff91d7dceba67
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jul 17 15:59:35 2017 -0400
there is no ucontext on ppc64 in rawhide, only ucontext_t
diff --git a/gperftools-2.6.1-ppc64-ucontext-fix.patch b/gperftools-2.6.1-ppc64-ucontext-fix.patch
new file mode 100644
index 0000000..4c0d15b
--- /dev/null
+++ b/gperftools-2.6.1-ppc64-ucontext-fix.patch
@@ -0,0 +1,13 @@
+diff -up gperftools-2.6.1/src/stacktrace_powerpc-linux-inl.h.ucontextfix gperftools-2.6.1/src/stacktrace_powerpc-linux-inl.h
+--- gperftools-2.6.1/src/stacktrace_powerpc-linux-inl.h.ucontextfix 2017-07-17 15:57:42.066001611 -0400
++++ gperftools-2.6.1/src/stacktrace_powerpc-linux-inl.h 2017-07-17 15:58:04.610427563 -0400
+@@ -53,7 +53,8 @@
+ #elif defined(HAVE_UCONTEXT_H)
+ #include <ucontext.h> // for ucontext_t
+ #endif
+-typedef ucontext ucontext_t;
++// no ucontext typedef on ppc64
++// typedef ucontext ucontext_t;
+
+ // PowerPC64 Little Endian follows BE wrt. backchain, condition register,
+ // and LR save area, so no need to adjust the reading struct.
diff --git a/gperftools.spec b/gperftools.spec
index 2f502e4..be34574 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -10,6 +10,8 @@ Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
URL: https://github.com/gperftools/gperftools
Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{vers...
+# There is no ucontext typedef on ppc64, at least not in rawhide.
+Patch0: gperftools-2.6.1-ppc64-ucontext-fix.patch
ExcludeArch: s390
%ifnarch s390x
@@ -58,6 +60,7 @@ Pprof is a heap and CPU profiler tool, part of the gperftools suite.
%prep
%setup -q
+%patch0 -p1 -b .ucontextfix
# Fix end-of-line encoding
sed -i 's/\r//' README_windows.txt
commit f12167f3fe58c394dd0566eef6ab320dedf108ad
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jul 17 13:30:48 2017 -0400
2.6.1
diff --git a/gperftools.spec b/gperftools.spec
index b34c6d0..2f502e4 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -3,7 +3,7 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: gperftools
-Version: 2.5.93
+Version: 2.6.1
Release: 1%{?dist}
License: BSD
Group: Development/Tools
@@ -112,6 +112,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Mon Jul 17 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-1
+- update to 2.6.1
+
* Tue May 23 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.5.93-1
- update to 2.5.93
- disable dynamic sized delete (explicitly) always
diff --git a/sources b/sources
index c134bfa..19fba4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gperftools-2.5.93.tar.gz) = fa47e6b3830a0997a035241826fab9d446384809811a4e5b7ddf281e78a27ff79872e993baf01717d8062bfaebcae6f76d322dd38093c9fd86c9723227bcf547
+SHA512 (gperftools-2.6.1.tar.gz) = 6f52c7c9838c3134c971a7277e61d3c8186a6a3dddf7f874b28e1c89d25e44cce497c013c12bf8e99452ea07c551dcfa6b092f550cf8a8c01aacc9158cabcb9b
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/gperftools.git
by githook-noreply＠fedoraproject.org
The package rpms/gperftools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gperftools.git/commit/?id=269f60e....
Change:
+%ifarch s390x aarch64
Thanks.
Full change:
============
commit 269f60eced4510841b912bc083b873cbd9591c1d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Oct 11 15:26:06 2017 -0400
add configure option to disable generic dynamic tls model, do so for s390x and aarch64, add aligned_alloc support
diff --git a/gperftools-2.6.1-aligned_alloc.patch b/gperftools-2.6.1-aligned_alloc.patch
new file mode 100644
index 0000000..3970167
--- /dev/null
+++ b/gperftools-2.6.1-aligned_alloc.patch
@@ -0,0 +1,33 @@
+diff -up gperftools-2.6.1/Makefile.am.aa gperftools-2.6.1/Makefile.am
+--- gperftools-2.6.1/Makefile.am.aa 2017-10-11 15:17:39.618807653 -0400
++++ gperftools-2.6.1/Makefile.am 2017-10-11 15:17:59.331338671 -0400
+@@ -97,6 +97,7 @@ endif OSX
+ if HAVE_OBJCOPY_WEAKEN
+ WEAKEN = $(OBJCOPY) -W malloc -W free -W realloc -W calloc -W cfree \
+ -W memalign -W posix_memalign -W valloc -W pvalloc \
++ -W aligned_alloc \
+ -W malloc_stats -W mallopt -W mallinfo -W nallocx \
+ -W _Znwm -W _ZnwmRKSt9nothrow_t -W _Znam -W _ZnamRKSt9nothrow_t \
+ -W _ZdlPv -W _ZdaPv \
+diff -up gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa gperftools-2.6.1/src/libc_override_gcc_and_weak.h
+--- gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa 2017-10-11 15:18:32.234555868 -0400
++++ gperftools-2.6.1/src/libc_override_gcc_and_weak.h 2017-10-11 15:18:38.243412911 -0400
+@@ -143,6 +143,7 @@ extern "C" {
+ void* calloc(size_t n, size_t size) __THROW ALIAS(tc_calloc);
+ void cfree(void* ptr) __THROW ALIAS(tc_cfree);
+ void* memalign(size_t align, size_t s) __THROW ALIAS(tc_memalign);
++ void* aligned_alloc(size_t align, size_t s) __THROW ALIAS(tc_memalign);
+ void* valloc(size_t size) __THROW ALIAS(tc_valloc);
+ void* pvalloc(size_t size) __THROW ALIAS(tc_pvalloc);
+ int posix_memalign(void** r, size_t a, size_t s) __THROW
+diff -up gperftools-2.6.1/src/libc_override_redefine.h.aa gperftools-2.6.1/src/libc_override_redefine.h
+--- gperftools-2.6.1/src/libc_override_redefine.h.aa 2017-10-11 15:18:55.012013968 -0400
++++ gperftools-2.6.1/src/libc_override_redefine.h 2017-10-11 15:19:20.528406906 -0400
+@@ -71,6 +71,7 @@ extern "C" {
+ void* calloc(size_t n, size_t s) { return tc_calloc(n, s); }
+ void cfree(void* p) { tc_cfree(p); }
+ void* memalign(size_t a, size_t s) { return tc_memalign(a, s); }
++ void* aligned_alloc(size_t a, size_t s) { return tc_memalign(a, s); }
+ void* valloc(size_t s) { return tc_valloc(s); }
+ void* pvalloc(size_t s) { return tc_pvalloc(s); }
+ int posix_memalign(void** r, size_t a, size_t s) {
diff --git a/gperftools-2.6.1-disable-generic-dynamic-tls.patch b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
new file mode 100644
index 0000000..ae87e5d
--- /dev/null
+++ b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
@@ -0,0 +1,32 @@
+diff -up ./configure.ac.dynload ./configure.ac
+--- ./configure.ac.dynload 2017-08-24 15:23:01.126622099 -0400
++++ ./configure.ac 2017-08-24 15:29:46.332132222 -0400
+@@ -614,6 +614,16 @@ AC_COMPILE_IFELSE(
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+
++default_enable_generic_dynamic_tls=yes
++AC_ARG_ENABLE([general-dynamic-tls],
++ [AS_HELP_STRING([--disable-general-dynamic-tls],
++ [Do not use the general dynamic TLS model])],
++ [],
++ [enable_generic_dynamic_tls="$default_enable_generic_dynamic_tls"])
++AS_IF([test "x$enable_generic_dynamic_tls" = xyes],
++ [AC_DEFINE([ENABLE_GENERIC_DYNAMIC_TLS], 1,
++ [Use the generic dynamic TLS model])])
++
+ # Write generated configuration file
+ AC_CONFIG_FILES([Makefile
+ src/gperftools/tcmalloc.h src/windows/gperftools/tcmalloc.h])
+diff -up ./src/base/basictypes.h.dynload ./src/base/basictypes.h
+--- ./src/base/basictypes.h.dynload 2017-08-24 15:30:30.210996293 -0400
++++ ./src/base/basictypes.h 2017-08-24 15:31:01.889176214 -0400
+@@ -200,7 +200,7 @@ struct CompileAssert {
+ # define ATTRIBUTE_UNUSED
+ #endif
+
+-#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS)
++#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS) && defined(ENABLE_GENERIC_DYNAMIC_TLS)
+ #define ATTR_INITIAL_EXEC __attribute__ ((tls_model ("initial-exec")))
+ #else
+ #define ATTR_INITIAL_EXEC
diff --git a/gperftools.spec b/gperftools.spec
index 9236583..145e973 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -4,7 +4,7 @@
Name: gperftools
Version: 2.6.1
-Release: 3%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
@@ -12,12 +12,18 @@ URL: https://github.com/gperftools/gperftools
Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{vers...
# There is no ucontext typedef on ppc64, at least not in rawhide.
Patch0: gperftools-2.6.1-ppc64-ucontext-fix.patch
+# Conditionalize generic dynamic tls model
+Patch1: gperftools-2.6.1-disable-generic-dynamic-tls.patch
+# Add support for C11 aligned_alloc
+# https://github.com/gperftools/gperftools/commit/d406f228
+Patch2: gperftools-2.6.1-aligned_alloc.patch
ExcludeArch: s390
%ifnarch s390x
BuildRequires: libunwind-devel
%endif
BuildRequires: perl-generators
+BuildRequires: autoconf, automake, libtool
Requires: gperftools-devel = %{version}-%{release}
Requires: pprof = %{version}-%{release}
@@ -61,6 +67,8 @@ Pprof is a heap and CPU profiler tool, part of the gperftools suite.
%prep
%setup -q
%patch0 -p1 -b .ucontextfix
+%patch1 -p1 -b .dynload
+%patch2 -p1 -b .aa
# Fix end-of-line encoding
sed -i 's/\r//' README_windows.txt
@@ -68,10 +76,15 @@ sed -i 's/\r//' README_windows.txt
# No need to have exec permissions on source code
chmod -x src/*.h src/*.cc
+autoreconf -ifv
+
%build
CFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
CXXFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
%configure \
+%ifarch s390x aarch64
+ --disable-general-dynamic-tls \
+%endif
--disable-dynamic-sized-delete-support \
--disable-static
@@ -115,6 +128,13 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Wed Oct 11 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-5
+- add aligned_alloc support
+
+* Thu Aug 24 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-4
+- add configure option to disable generic dynamic tls model
+- disable generic dynamic tls model on s390x and aarch64
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/gperftools.git
by githook-noreply＠fedoraproject.org
The package rpms/gperftools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gperftools.git/commit/?id=269f60e....
Change:
+%ifarch s390x aarch64
Thanks.
Full change:
============
commit 269f60eced4510841b912bc083b873cbd9591c1d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Oct 11 15:26:06 2017 -0400
add configure option to disable generic dynamic tls model, do so for s390x and aarch64, add aligned_alloc support
diff --git a/gperftools-2.6.1-aligned_alloc.patch b/gperftools-2.6.1-aligned_alloc.patch
new file mode 100644
index 0000000..3970167
--- /dev/null
+++ b/gperftools-2.6.1-aligned_alloc.patch
@@ -0,0 +1,33 @@
+diff -up gperftools-2.6.1/Makefile.am.aa gperftools-2.6.1/Makefile.am
+--- gperftools-2.6.1/Makefile.am.aa 2017-10-11 15:17:39.618807653 -0400
++++ gperftools-2.6.1/Makefile.am 2017-10-11 15:17:59.331338671 -0400
+@@ -97,6 +97,7 @@ endif OSX
+ if HAVE_OBJCOPY_WEAKEN
+ WEAKEN = $(OBJCOPY) -W malloc -W free -W realloc -W calloc -W cfree \
+ -W memalign -W posix_memalign -W valloc -W pvalloc \
++ -W aligned_alloc \
+ -W malloc_stats -W mallopt -W mallinfo -W nallocx \
+ -W _Znwm -W _ZnwmRKSt9nothrow_t -W _Znam -W _ZnamRKSt9nothrow_t \
+ -W _ZdlPv -W _ZdaPv \
+diff -up gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa gperftools-2.6.1/src/libc_override_gcc_and_weak.h
+--- gperftools-2.6.1/src/libc_override_gcc_and_weak.h.aa 2017-10-11 15:18:32.234555868 -0400
++++ gperftools-2.6.1/src/libc_override_gcc_and_weak.h 2017-10-11 15:18:38.243412911 -0400
+@@ -143,6 +143,7 @@ extern "C" {
+ void* calloc(size_t n, size_t size) __THROW ALIAS(tc_calloc);
+ void cfree(void* ptr) __THROW ALIAS(tc_cfree);
+ void* memalign(size_t align, size_t s) __THROW ALIAS(tc_memalign);
++ void* aligned_alloc(size_t align, size_t s) __THROW ALIAS(tc_memalign);
+ void* valloc(size_t size) __THROW ALIAS(tc_valloc);
+ void* pvalloc(size_t size) __THROW ALIAS(tc_pvalloc);
+ int posix_memalign(void** r, size_t a, size_t s) __THROW
+diff -up gperftools-2.6.1/src/libc_override_redefine.h.aa gperftools-2.6.1/src/libc_override_redefine.h
+--- gperftools-2.6.1/src/libc_override_redefine.h.aa 2017-10-11 15:18:55.012013968 -0400
++++ gperftools-2.6.1/src/libc_override_redefine.h 2017-10-11 15:19:20.528406906 -0400
+@@ -71,6 +71,7 @@ extern "C" {
+ void* calloc(size_t n, size_t s) { return tc_calloc(n, s); }
+ void cfree(void* p) { tc_cfree(p); }
+ void* memalign(size_t a, size_t s) { return tc_memalign(a, s); }
++ void* aligned_alloc(size_t a, size_t s) { return tc_memalign(a, s); }
+ void* valloc(size_t s) { return tc_valloc(s); }
+ void* pvalloc(size_t s) { return tc_pvalloc(s); }
+ int posix_memalign(void** r, size_t a, size_t s) {
diff --git a/gperftools-2.6.1-disable-generic-dynamic-tls.patch b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
new file mode 100644
index 0000000..ae87e5d
--- /dev/null
+++ b/gperftools-2.6.1-disable-generic-dynamic-tls.patch
@@ -0,0 +1,32 @@
+diff -up ./configure.ac.dynload ./configure.ac
+--- ./configure.ac.dynload 2017-08-24 15:23:01.126622099 -0400
++++ ./configure.ac 2017-08-24 15:29:46.332132222 -0400
+@@ -614,6 +614,16 @@ AC_COMPILE_IFELSE(
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+
++default_enable_generic_dynamic_tls=yes
++AC_ARG_ENABLE([general-dynamic-tls],
++ [AS_HELP_STRING([--disable-general-dynamic-tls],
++ [Do not use the general dynamic TLS model])],
++ [],
++ [enable_generic_dynamic_tls="$default_enable_generic_dynamic_tls"])
++AS_IF([test "x$enable_generic_dynamic_tls" = xyes],
++ [AC_DEFINE([ENABLE_GENERIC_DYNAMIC_TLS], 1,
++ [Use the generic dynamic TLS model])])
++
+ # Write generated configuration file
+ AC_CONFIG_FILES([Makefile
+ src/gperftools/tcmalloc.h src/windows/gperftools/tcmalloc.h])
+diff -up ./src/base/basictypes.h.dynload ./src/base/basictypes.h
+--- ./src/base/basictypes.h.dynload 2017-08-24 15:30:30.210996293 -0400
++++ ./src/base/basictypes.h 2017-08-24 15:31:01.889176214 -0400
+@@ -200,7 +200,7 @@ struct CompileAssert {
+ # define ATTRIBUTE_UNUSED
+ #endif
+
+-#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS)
++#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS) && defined(ENABLE_GENERIC_DYNAMIC_TLS)
+ #define ATTR_INITIAL_EXEC __attribute__ ((tls_model ("initial-exec")))
+ #else
+ #define ATTR_INITIAL_EXEC
diff --git a/gperftools.spec b/gperftools.spec
index 9236583..145e973 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -4,7 +4,7 @@
Name: gperftools
Version: 2.6.1
-Release: 3%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Development/Tools
Summary: Very fast malloc and performance analysis tools
@@ -12,12 +12,18 @@ URL: https://github.com/gperftools/gperftools
Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{vers...
# There is no ucontext typedef on ppc64, at least not in rawhide.
Patch0: gperftools-2.6.1-ppc64-ucontext-fix.patch
+# Conditionalize generic dynamic tls model
+Patch1: gperftools-2.6.1-disable-generic-dynamic-tls.patch
+# Add support for C11 aligned_alloc
+# https://github.com/gperftools/gperftools/commit/d406f228
+Patch2: gperftools-2.6.1-aligned_alloc.patch
ExcludeArch: s390
%ifnarch s390x
BuildRequires: libunwind-devel
%endif
BuildRequires: perl-generators
+BuildRequires: autoconf, automake, libtool
Requires: gperftools-devel = %{version}-%{release}
Requires: pprof = %{version}-%{release}
@@ -61,6 +67,8 @@ Pprof is a heap and CPU profiler tool, part of the gperftools suite.
%prep
%setup -q
%patch0 -p1 -b .ucontextfix
+%patch1 -p1 -b .dynload
+%patch2 -p1 -b .aa
# Fix end-of-line encoding
sed -i 's/\r//' README_windows.txt
@@ -68,10 +76,15 @@ sed -i 's/\r//' README_windows.txt
# No need to have exec permissions on source code
chmod -x src/*.h src/*.cc
+autoreconf -ifv
+
%build
CFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
CXXFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
%configure \
+%ifarch s390x aarch64
+ --disable-general-dynamic-tls \
+%endif
--disable-dynamic-sized-delete-support \
--disable-static
@@ -115,6 +128,13 @@ rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
%{_libdir}/*.so.*
%changelog
+* Wed Oct 11 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-5
+- add aligned_alloc support
+
+* Thu Aug 24 2017 Tom Callaway <spot(a)fedoraproject.org> - 2.6.1-4
+- add configure option to disable generic dynamic tls model
+- disable generic dynamic tls model on s390x and aarch64
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/prelude-lml-rules.git
by githook-noreply＠fedoraproject.org
The package rpms/prelude-lml-rules.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prelude-lml-rules.git/commit/?id=....
Change:
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
Thanks.
Full change:
============
commit fab624395b5e6712a234bc2bf36e999547753ade
Author: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: Wed Oct 11 20:53:48 2017 +0200
Bump version 4.0.0
diff --git a/.gitignore b/.gitignore
index a431447..c4ac46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/prelude-lml-rules-3.1.0.tar.gz
+/prelude-lml-rules-4.0.0.tar.gz
diff --git a/prelude-lml-rules.spec b/prelude-lml-rules.spec
index 3745dcf..dc0d331 100644
--- a/prelude-lml-rules.spec
+++ b/prelude-lml-rules.spec
@@ -1,12 +1,11 @@
Name: prelude-lml-rules
-Version: 3.1.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Prelude LML community ruleset
License: GPLv2+
URL: https://www.prelude-siem.org/
-Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Requires: prelude-lml
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
%description
Rules for Prelude LML contributed by the community.
@@ -40,6 +39,9 @@ test -z "`%{buildroot}%{_bindir}/%{name}-check %{buildroot}%{_sysconfdir}/prelud
%changelog
+* Wed Oct 11 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 7cfa884..5312f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (prelude-lml-rules-3.1.0.tar.gz) = 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7
+SHA512 (prelude-lml-rules-4.0.0.tar.gz) = 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/prelude-lml-rules.git
by githook-noreply＠fedoraproject.org
The package rpms/prelude-lml-rules.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prelude-lml-rules.git/commit/?id=....
Change:
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
Thanks.
Full change:
============
commit e178229fcd2588bbd695a171ec5b789b962344df
Author: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: Wed Oct 11 20:52:07 2017 +0200
Bump version 4.0.0
diff --git a/.gitignore b/.gitignore
index a431447..c4ac46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/prelude-lml-rules-3.1.0.tar.gz
+/prelude-lml-rules-4.0.0.tar.gz
diff --git a/prelude-lml-rules.spec b/prelude-lml-rules.spec
index 3745dcf..dc0d331 100644
--- a/prelude-lml-rules.spec
+++ b/prelude-lml-rules.spec
@@ -1,12 +1,11 @@
Name: prelude-lml-rules
-Version: 3.1.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Prelude LML community ruleset
License: GPLv2+
URL: https://www.prelude-siem.org/
-Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Requires: prelude-lml
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
%description
Rules for Prelude LML contributed by the community.
@@ -40,6 +39,9 @@ test -z "`%{buildroot}%{_bindir}/%{name}-check %{buildroot}%{_sysconfdir}/prelud
%changelog
+* Wed Oct 11 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 7cfa884..5312f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (prelude-lml-rules-3.1.0.tar.gz) = 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7
+SHA512 (prelude-lml-rules-4.0.0.tar.gz) = 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/prewikka.git
by githook-noreply＠fedoraproject.org
The package rpms/prewikka.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prewikka.git/commit/?id=cfa3ed08c....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit cfa3ed08c1e36734a7d077e5c070ac23ad6fb5d4
Author: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: Wed Oct 11 20:47:47 2017 +0200
Bump version 4.0.0
diff --git a/.gitignore b/.gitignore
index 7c7977c..5ba8357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/prewikka-3.1.0.tar.gz
+/prewikka-4.0.0.tar.gz
diff --git a/prewikka-4.0.0-fix_python3.patch b/prewikka-4.0.0-fix_python3.patch
new file mode 100644
index 0000000..3428614
--- /dev/null
+++ b/prewikka-4.0.0-fix_python3.patch
@@ -0,0 +1,110 @@
+--- ./prewikka/dataprovider/__init__.py 2017-07-18 13:45:57.000000000 +0200
++++ ./prewikka/dataprovider/__init__.py 2017-10-07 17:10:09.140721871 +0200
+@@ -22,12 +22,15 @@
+ import copy
+ import time
+ import types
++import sys
+ from datetime import datetime
+
+ from prewikka import error, hookmanager, pluginmanager
+ from prewikka.utils import AttrObj, CachingIterator, compat, json
+ from prewikka.utils.timeutil import parser
+
++if sys.version_info >= (3, 0):
++ long = int
+
+ def _str_to_datetime(date):
+ if date.isdigit():
+--- ./prewikka/session/session.py 2017-07-18 13:45:57.000000000 +0200
++++ ./prewikka/session/session.py 2017-10-07 17:13:02.224865916 +0200
+@@ -23,6 +23,7 @@
+ import os
+ import struct
+ import time
++import sys
+
+ from prewikka import database, hookmanager, log, pluginmanager, usergroup, utils
+ from prewikka.error import PrewikkaUserError, RedirectionError
+@@ -137,7 +138,11 @@
+ t = time.time()
+
+ self._db.delete_expired_sessions(t - self._expiration)
+- sessionid = text_type(binascii.hexlify(os.urandom(16) + struct.pack(b">d", t)))
++ sessionid = binascii.hexlify(os.urandom(16) + struct.pack(b">d", t))
++ if sys.version_info >= (3, 0):
++ sessionid = sessionid.decode('ascii')
++
++ sessionid = text_type(sessionid)
+
+ self._db.create_session(sessionid, user, int(t))
+ self.__set_session(request, sessionid)
+--- ./prewikka/utils/json.py 2017-07-18 13:45:57.000000000 +0200
++++ ./prewikka/utils/json.py 2017-10-07 17:14:59.718248149 +0200
+@@ -21,6 +21,7 @@
+
+ import datetime
+ import json
++from six import with_metaclass
+
+ from prewikka.utils import html
+
+@@ -36,8 +37,7 @@
+ return nclass
+
+
+-class JSONObject(object):
+- __metaclass__ = _JSONMetaClass
++class JSONObject(with_metaclass(_JSONMetaClass, object)):
+
+ def __jsonobj__(self):
+ return { "__prewikka_class__": (self.__class__.__name__, self.__json__()) }
+--- ./prewikka/utils/url.py 2017-07-18 13:45:57.000000000 +0200
++++ ./prewikka/utils/url.py 2017-10-07 17:16:41.927970738 +0200
+@@ -56,7 +56,11 @@
+ else:
+ authority = tpl[0].encode('idna') + ":%s" % tpl[1]
+
+- return urlunsplit((scheme.encode(encoding), authority,
++ sc = scheme.encode(encoding)
++ if sys.version_info >= (3, 0):
++ sc = quote(sc, safe)
++
++ return urlunsplit((sc, authority,
+ quote(path.encode(encoding), safe),
+ quote(query.encode(encoding), safe),
+ quote(frag.encode(encoding), safe)))
+--- ./prewikka/web/request.py 2017-07-18 13:45:57.000000000 +0200
++++ ./prewikka/web/request.py 2017-10-07 17:21:21.645737400 +0200
+@@ -40,7 +40,11 @@
+ self._buffersize = buffersize
+
+ def flush(self):
+- self._wcb(''.join(self._dlist))
++ if sys.version_info >= (3, 0):
++ self._wcb(''.join((x.decode('utf-8') for x in self._dlist)).encode('utf-8'))
++ else:
++ self._wcb(''.join(self._dlist))
++
+ self._dlist = []
+ self._len = 0
+
+@@ -97,10 +101,16 @@
+ # Join is used in place of concatenation / formatting, because we
+ # prefer performance over readability in this place
+ if event:
+- self._buffer.write("".join(["event: ", event.encode("utf8"), "\n"]))
++ if sys.version_info >= (3, 0):
++ self._buffer.write("".join(["event: ", text_type(event), "\n"]).encode("utf8"))
++ else:
++ self._buffer.write("".join(["event: ", event.encode('utf-8'), "\n"]))
+
+ if data:
+- self._buffer.write("".join(["data: ", data.encode("utf8"), "\n\n"]))
++ if sys.version_info >= (3, 0):
++ self._buffer.write("".join(["data: ", text_type(data), "\n\n"]).encode("utf8"))
++ else:
++ self._buffer.write("".join(["data: ", data.encode('utf-8'), "\n\n"]))
+
+ if sync:
+ self._buffer.flush()
diff --git a/prewikka.spec b/prewikka.spec
index f150df5..9b814c2 100644
--- a/prewikka.spec
+++ b/prewikka.spec
@@ -1,31 +1,28 @@
Name: prewikka
-Version: 3.1.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Graphical front-end analysis console for IDMEF
License: GPLv2+
URL: https://www.prelude-siem.org/
-Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
+#
+Patch0: prewikka-4.0.0-fix_python3.patch
BuildRequires: gettext
BuildRequires: python2-devel
-# For now, Prewikka works only with python2
+BuildRequires: python3-devel
BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python3)
BuildRequires: python2-configargparse
-BuildRequires: python-cheetah
+BuildRequires: python3-configargparse
+BuildRequires: python2-babel
+BuildRequires: python3-babel
BuildRequires: python-lesscpy
+BuildRequires: python3-lesscpy
BuildRequires: python2-setuptools
+BuildRequires: python3-setuptools
-Requires: python2-babel
-Requires: python-cheetah
-Requires: python2-prelude >= %{version}
-Requires: python2-preludedb >= %{version}
-Requires: pytz
-Requires: python2-dateutil
-
-# Cannot build as noarch until libprelude is ported.
-# Comment out BuildArch: noarch for now.
-# BuildArch: noarch
-ExclusiveArch: %{ix86} x86_64
+Requires: python3-%{name} >= %{version}
# Since mass rebuild, debugpackage wont works for prewikka
%define debug_package %{nil}
@@ -37,25 +34,77 @@ provides alert aggregation and heartbeat views, and has user customization and
configurable filters. Prewikka also provides access to external tools such as
whois and traceroute.
+%package -n python2-%{name}
+Summary: Graphical front-end analysis console for IDMEF
+Requires: %{name} = %{version}-%{release}
+Requires: python2-prelude >= %{version}
+Requires: python2-preludedb >= %{version}
+Requires: python2-babel
+Requires: python-mako
+Requires: PyYAML
+Requires: python-werkzeug
+Requires: python2-dateutil
+Requires: pytz
+%{?python_provide:%python_provide python2-%{name}}
+
+%description -n python2-%{name}
+Prewikka is the backend of the web browser interface of Prelude SIEM. Providing
+numerous features, Prewikka facilitates the work of users and analysts. It
+provides alert aggregation and heartbeat views, and has user customization and
+configurable filters. Prewikka also provides access to external tools such as
+whois and traceroute.
+
+%package -n python3-%{name}
+Summary: Graphical front-end analysis console for IDMEF
+Requires: %{name} = %{version}-%{release}
+Requires: python3-prelude >= %{version}
+Requires: python3-preludedb >= %{version}
+Requires: python3-babel
+Requires: python3-mako
+Requires: python3-PyYAML
+Requires: python3-werkzeug
+Requires: python3-dateutil
+Requires: python3-pytz
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+Prewikka is the backend of the web browser interface of Prelude SIEM. Providing
+numerous features, Prewikka facilitates the work of users and analysts. It
+provides alert aggregation and heartbeat views, and has user customization and
+configurable filters. Prewikka also provides access to external tools such as
+whois and traceroute.
+
%prep
-%setup -q
+%autosetup -p1
%build
%py2_build
+%py3_build
%install
-# We have to use this because py2_install do other things and siteconfig.py
+install -d -m 0755 %{buildroot}%{_sbindir}
+
+# We have to use this because py{2,3}_install do other things and siteconfig.py
# will be not installed
%{__python2} setup.py install --root=%{buildroot}
+mv %{buildroot}%{_bindir}/%{name}-httpd %{buildroot}%{_sbindir}/%{name}-httpd-%{python2_version}
+%{__python3} setup.py install --root=%{buildroot}
+mv %{buildroot}%{_bindir}/%{name}-httpd %{buildroot}%{_sbindir}/%{name}-httpd-%{python3_version}
-install -d -m 0755 %{buildroot}%{_sbindir}
-mv %{buildroot}%{_bindir}/%{name}-httpd %{buildroot}%{_sbindir}/%{name}-httpd
+ln -s ./%{name}-httpd-%{python2_version} %{buildroot}%{_sbindir}/%{name}-httpd-2
+ln -s ./%{name}-httpd-%{python3_version} %{buildroot}%{_sbindir}/%{name}-httpd-3
+ln -s ./%{name}-httpd-3 %{buildroot}%{_sbindir}/%{name}-httpd
+
+rm %{buildroot}%{_sysconfdir}/%{name}/*-dist
## Language files; not under /usr/share/locale, need to move them
install -d -m 0755 %{buildroot}%{_datadir}/locale
cp -r %{buildroot}%{python2_sitelib}/%{name}/locale/* %{buildroot}%{_datadir}/locale/
rm -rf %{buildroot}%{python2_sitelib}/%{name}/locale
ln -s %{_datadir}/locale %{buildroot}%{python2_sitelib}/%{name}/locale
+cp -r %{buildroot}%{python3_sitelib}/%{name}/locale/* %{buildroot}%{_datadir}/locale/
+rm -rf %{buildroot}%{python3_sitelib}/%{name}/locale
+ln -s %{_datadir}/locale %{buildroot}%{python3_sitelib}/%{name}/locale
%find_lang %{name}
@@ -64,12 +113,26 @@ ln -s %{_datadir}/locale %{buildroot}%{python2_sitelib}/%{name}/locale
%doc AUTHORS NEWS README
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%{_sbindir}/%{name}-httpd
+%config(noreplace) %{_sysconfdir}/%{name}/menu.yml
%{_datadir}/%{name}
+
+%files -n python2-%{name}
+%{_sbindir}/%{name}-httpd-2
+%{_sbindir}/%{name}-httpd-%{python2_version}
%{python2_sitelib}/%{name}
%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
+%files -n python3-%{name}
+%{_sbindir}/%{name}-httpd
+%{_sbindir}/%{name}-httpd-3
+%{_sbindir}/%{name}-httpd-%{python3_version}
+%{python3_sitelib}/%{name}
+%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
+
%changelog
+* Wed Oct 11 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
* Thu Aug 10 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 3.1.0-4
- Temporary disable debugsource since Mass rebuild
diff --git a/sources b/sources
index 999d789..92641e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (prewikka-3.1.0.tar.gz) = 7321e7383d6205f18dffd00a23d07e9154dd79e35eb58d04a6af77bc9f70e476b67a953eb5d09685b4a7c386ecdb9111d40c77bf3b570ffc27a1c90b612a4803
+SHA512 (prewikka-4.0.0.tar.gz) = 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6
6 years, 6 months
- 1
- 0
Architecture specific change in rpms/mesa.git
by githook-noreply＠fedoraproject.org
The package rpms/mesa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mesa.git/commit/?id=1a2fde64df834...
https://src.fedoraproject.org/cgit/rpms/mesa.git/commit/?id=650dc1f8a8222....
Change:
+%ifarch %{ix86} x86_64
+%ifarch x86_64
Thanks.
Full change:
============
commit 8c5aa4596e0ac4d861dbbcbf65ff071d4262cbdd
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Oct 11 16:48:21 2017 +0100
Fix for vc4/Raspberry Pi
diff --git a/mesa.spec b/mesa.spec
index 99907f7..7aaa14b 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -59,7 +59,7 @@
Name: mesa
Summary: Mesa graphics libraries
Version: 17.2.2
-Release: 3%{?rctag:.%{rctag}}%{?dist}
+Release: 4%{?rctag:.%{rctag}}%{?dist}
License: MIT
URL: http://www.mesa3d.org
@@ -78,6 +78,7 @@ Patch1: 0001-llvm-SONAME-without-version.patch
Patch2: 0002-hardware-gloat.patch
Patch3: 0003-evergreen-big-endian.patch
Patch4: 0004-bigendian-assert.patch
+Patch5: vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
# glvnd support patches
# non-upstreamed ones
@@ -693,6 +694,9 @@ popd
%endif
%changelog
+* Wed Oct 11 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 17.2.2-4
+- Fix for vc4/Raspberry Pi
+
* Mon Oct 09 2017 Dave Airlie <airlied(a)redhat.com> - 17.2.2-3
- enable vulkan on 32-bit x86
diff --git a/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch b/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
new file mode 100644
index 0000000..ec4e993
--- /dev/null
+++ b/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
@@ -0,0 +1,48 @@
+diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
+index 5743e13045..b39cc744e6 100644
+--- a/src/gallium/drivers/vc4/vc4_screen.c
++++ b/src/gallium/drivers/vc4/vc4_screen.c
+@@ -549,25 +549,30 @@ vc4_screen_query_dmabuf_modifiers(struct pipe_screen *pscreen,
+ unsigned int *external_only,
+ int *count)
+ {
++ int m, i;
++ uint64_t available_modifiers[] = {
++ DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
++ DRM_FORMAT_MOD_LINEAR,
++ };
++ struct vc4_screen *screen = vc4_screen(pscreen);
++ int num_modifiers = screen->has_tiling_ioctl ? 2 : 1;
++
+ if (!modifiers) {
+- *count = 2;
++ *count = num_modifiers;
+ return;
+ }
+
+- *count = MIN2(max, 2);
+-
++ *count = MIN2(max, num_modifiers);
++ m = screen->has_tiling_ioctl ? 0 : 1;
+ /* We support both modifiers (tiled and linear) for all sampler
+- * formats.
++ * formats, but if we don't have the DRM_VC4_GET_TILING ioctl
++ * we shouldn't advertise the tiled formats.
+ */
+- modifiers[0] = DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED;
+- if (external_only)
+- external_only[0] = false;
+- if (max < 2)
+- return;
+-
+- modifiers[1] = DRM_FORMAT_MOD_LINEAR;
+- if (external_only)
+- external_only[1] = false;
++ for (i = 0; i < *count; i++) {
++ modifiers[i] = available_modifiers[m++];
++ if (external_only)
++ external_only[i] = false;
++ }
+ }
+
+ #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
commit 650dc1f8a8222afa7ed1fbd3e87af6a396d2c147
Author: Dave Airlie <airlied(a)redhat.com>
Date: Mon Oct 9 12:48:34 2017 +1000
Fix i686 vulkan packaging
diff --git a/mesa.spec b/mesa.spec
index 939e66a..99907f7 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -680,8 +680,13 @@ popd
%files vulkan-drivers
%{_libdir}/libvulkan_intel.so
%{_libdir}/libvulkan_radeon.so
+%ifarch x86_64
%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
+%else
+%{_datadir}/vulkan/icd.d/intel_icd.i686.json
+%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
+%endif
%files vulkan-devel
%{_includedir}/vulkan/
commit 1a2fde64df83449bbeae33703b4775728f6c02c4
Author: Dave Airlie <airlied(a)redhat.com>
Date: Mon Oct 9 12:30:33 2017 +1000
enable vulkan on 32-bit x86
diff --git a/mesa.spec b/mesa.spec
index d603abd..939e66a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -28,7 +28,7 @@
%define with_omx 1
%endif
-%ifarch x86_64
+%ifarch %{ix86} x86_64
%define with_vulkan 1
%else
%define with_vulkan 0
@@ -59,7 +59,7 @@
Name: mesa
Summary: Mesa graphics libraries
Version: 17.2.2
-Release: 2%{?rctag:.%{rctag}}%{?dist}
+Release: 3%{?rctag:.%{rctag}}%{?dist}
License: MIT
URL: http://www.mesa3d.org
@@ -688,6 +688,9 @@ popd
%endif
%changelog
+* Mon Oct 09 2017 Dave Airlie <airlied(a)redhat.com> - 17.2.2-3
+- enable vulkan on 32-bit x86
+
* Tue Oct 03 2017 Adam Jackson <ajax(a)redhat.com> - 17.2.2-2
- Backport S3TC support from master
6 years, 6 months
- 1
- 0