summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-05-01 16:18:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-05-01 16:18:32 +0000
commit37e9e6dc720a01cc1e707cd6eb86c35de87470db (patch)
tree696a25a23998f16da2e1bdb1dea72b94e20695b9 /media-sound/alsa-utils/files
parentInline src_test and allow passing arguments. (diff)
downloadhistorical-37e9e6dc720a01cc1e707cd6eb86c35de87470db.tar.gz
historical-37e9e6dc720a01cc1e707cd6eb86c35de87470db.tar.bz2
historical-37e9e6dc720a01cc1e707cd6eb86c35de87470db.zip
Fix typing error in alsa-restore.service systemd file. Fix missing break to the capture loop in arecord. Fix buffer overflow in alsactl wrt #468160 by "John"
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-sound/alsa-utils/files')
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch27
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch24
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch12
3 files changed, 63 insertions, 0 deletions
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch
new file mode 100644
index 000000000000..3b5a761db492
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch
@@ -0,0 +1,27 @@
+http://bugs.gentoo.org/468160
+
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
+Subject: alsactl: Fix the string size for the lock file contents
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
+
+alsactl: Fix the string size for the lock file contents
+
+The string length is 10 characters + LF + '\0' = 12 characters.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/alsactl/lock.c b/alsactl/lock.c
+index d34d013..fce208b 100644
+--- a/alsactl/lock.c
++++ b/alsactl/lock.c
+@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
+ int fd = -1, err = 0;
+ struct flock lck;
+ struct stat st;
+- char lcktxt[11];
++ char lcktxt[12];
+ char *nfile;
+
+ if (!do_lock)
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch
new file mode 100644
index 000000000000..f9edb2d21363
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch
@@ -0,0 +1,24 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
+Subject: arecord: add a missing break to the capture loop
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
+
+arecord: add a missing break to the capture loop
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 5bdc39c..000d25b 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
+ fd = -1;
+ }
+
++ if (in_aborting)
++ break;
++
+ /* repeat the loop when format is raw without timelimit or
+ * requested counts of data are recorded
+ */
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch
new file mode 100644
index 000000000000..dfe83e011ddc
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch
@@ -0,0 +1,12 @@
+http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=3616b1fe3ca603832b2f88abeb722cba2f0dde7e
+
+--- alsactl/alsa-restore.service.in
++++ alsactl/alsa-restore.service.in
+@@ -12,6 +12,6 @@
+ Conflicts=shutdown.target
+
+ [Service]
+-Type=oneshop
++Type=oneshot
+ ExecStart=-@sbindir@/alsactl restore
+ StandardOutput=syslog