summaryrefslogtreecommitdiffstats
path: root/source/l/alsa-plugins
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-10-23 05:11:47 +0000
committer Eric Hameleers <alien@slackware.com>2018-10-23 18:00:36 +0200
commit1c1637ba89cf4c444d82e572fa59ff7756f35ba7 (patch)
treefe9ecfb0bcbd2e1a8d128f71aae99361743d07de /source/l/alsa-plugins
parente942aa8f7c69e5fa07c32af30ee0903b464087dc (diff)
downloadcurrent-1c1637ba89cf4c444d82e572fa59ff7756f35ba7.tar.gz
current-1c1637ba89cf4c444d82e572fa59ff7756f35ba7.tar.xz
Tue Oct 23 05:11:47 UTC 201820181023051147
a/kernel-generic-4.19.0-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.0-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.0-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.0-x86-1.txz: Upgraded. d/parallel-20181022-noarch-1.txz: Upgraded. k/kernel-source-4.19.0-noarch-1.txz: Upgraded. [581 lines of diffconfig output omitted here] l/alsa-plugins-1.1.7-x86_64-3.txz: Rebuilt. Reverted two patches that have been reported to cause crashes with USB audio devices. Thanks to Jean-Philippe Guillemin. l/harfbuzz-1.9.0-x86_64-2.txz: Rebuilt. Reverted (for now) to harfbuzz-1.9.0 to fix build failures with texlive, php, and calligra caused by API changes. Thanks to nobodino. l/libpng-1.6.35-x86_64-1.txz: Upgraded. n/samba-4.9.1-x86_64-1.txz: Upgraded. xap/mozilla-firefox-60.3.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html (* Security fix *) extra/pure-alsa-system/alsa-plugins-1.1.7-x86_64-3_alsa.txz: Rebuilt. Reverted two patches that have been reported to cause crashes with USB audio devices. Thanks to Jean-Philippe Guillemin. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/alsa-plugins')
-rwxr-xr-xsource/l/alsa-plugins/alsa-plugins.SlackBuild6
-rw-r--r--source/l/alsa-plugins/alsa-plugins.revert.fc3f5d51062ff438780e568995792dc809c908cc.6b996865126dd559ef186002e45dc6e1594291e7.patch64
2 files changed, 69 insertions, 1 deletions
diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild
index 77eb210a2..a64db3310 100755
--- a/source/l/alsa-plugins/alsa-plugins.SlackBuild
+++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=alsa-plugins
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -76,6 +76,10 @@ cd $TMP
rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
+
+# Revert two patches that are breaking USB audio:
+zcat $CWD/alsa-plugins.revert.fc3f5d51062ff438780e568995792dc809c908cc.6b996865126dd559ef186002e45dc6e1594291e7.patch.gz | patch -p1 -R --verbose || exit 1
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/l/alsa-plugins/alsa-plugins.revert.fc3f5d51062ff438780e568995792dc809c908cc.6b996865126dd559ef186002e45dc6e1594291e7.patch b/source/l/alsa-plugins/alsa-plugins.revert.fc3f5d51062ff438780e568995792dc809c908cc.6b996865126dd559ef186002e45dc6e1594291e7.patch
new file mode 100644
index 000000000..a138ae3ac
--- /dev/null
+++ b/source/l/alsa-plugins/alsa-plugins.revert.fc3f5d51062ff438780e568995792dc809c908cc.6b996865126dd559ef186002e45dc6e1594291e7.patch
@@ -0,0 +1,64 @@
+From fc3f5d51062ff438780e568995792dc809c908cc Mon Sep 17 00:00:00 2001
+From: Andre Guedes <andre.guedes@intel.com>
+Date: Fri, 28 Sep 2018 14:27:24 -0700
+Subject: [PATCH] a52: Fix leaks when a52_set_hw_constraint() fails
+
+If a52_set_hw_constraint() returns error, we leak 'rec' and
+'rec->slave'. This patch fixes the issue by jumping to 'error' label
+where the proper clean up is already done.
+
+Signed-off-by: Andre Guedes <andre.guedes@intel.com>
+Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ a52/pcm_a52.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index 29ce45f..e431fd0 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -978,7 +978,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
+
+ if ((err = a52_set_hw_constraint(rec)) < 0) {
+ snd_pcm_ioplug_delete(&rec->io);
+- return err;
++ goto error;
+ }
+
+ *pcmp = rec->io.pcm;
+--
+1.7.11.7
+
+From 6b996865126dd559ef186002e45dc6e1594291e7 Mon Sep 17 00:00:00 2001
+From: Andre Guedes <andre.guedes@intel.com>
+Date: Fri, 28 Sep 2018 14:27:27 -0700
+Subject: [PATCH] usb_stream: Fix leaks when us_set_hw_constraint() fails
+
+If us_set_hw_constraint() returns error, we leak the 'us' object and all
+the resources referenced by it. This patch fixes the issue by calling
+us_free() before returning.
+
+Signed-off-by: Andre Guedes <andre.guedes@intel.com>
+Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ usb_stream/pcm_usb_stream.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c
+index 94c83a7..eb4ca98 100644
+--- a/usb_stream/pcm_usb_stream.c
++++ b/usb_stream/pcm_usb_stream.c
+@@ -455,6 +455,7 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name,
+ err = us_set_hw_constraint(us);
+ if (err < 0) {
+ snd_pcm_ioplug_delete(&us->io);
++ us_free(us);
+ return err;
+ }
+
+--
+1.7.11.7
+
+