From ceeef98da9d7141d36e7e87e5604f30beed8cb98 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 15 Apr 2013 15:02:53 +0200
Subject: [PATCH] fixes for bug#951750

---
 alsa-utils.spec   |  8 +++++++-
 alsa.rules        |  1 +
 alsactl-fix.patch | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 alsactl-fix.patch

diff --git a/alsa-utils.spec b/alsa-utils.spec
index ad710a9..30686da 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -4,7 +4,7 @@
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
 Version: %{baseversion}%{?fixversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -17,6 +17,7 @@ Source11: alsactl.conf
 Source20: alsa-restore.service
 Source21: alsa-store.service
 Source22: alsa-state.service
+Patch1:  alsactl-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{baseversion}
 BuildRequires: libsamplerate-devel
@@ -36,6 +37,7 @@ Architecture (ALSA).
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .alsactl-fix
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \
@@ -115,6 +117,10 @@ if [ -s /etc/asound.state -a ! -s /var/lib/alsa/asound.state ] ; then
 fi
 
 %changelog
+* Mon Apr 15 2013 Jaroslav Kysela <jkysela@redhat.com> - 1.0.27-2
+- Fix the new udev rules (missing GOTO) - bug#951750
+- Fix the string size in alsactl (underflow)
+
 * Fri Apr 12 2013 Jaroslav Kysela <jkysela@redhat.com> - 1.0.27-1
 - Updated to 1.0.27, activated the alsactl daemon mode
 - Updated alsa-info.sh to 0.4.61
diff --git a/alsa.rules b/alsa.rules
index d2ad0b9..6a4a0c3 100644
--- a/alsa.rules
+++ b/alsa.rules
@@ -1,4 +1,5 @@
 ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go"
+GOTO="alsa_restore_end"
 
 LABEL="alsa_restore_go"
 TEST!="/etc/alsa/state-daemon.conf", RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore /dev/$name"
diff --git a/alsactl-fix.patch b/alsactl-fix.patch
new file mode 100644
index 0000000..344255e
--- /dev/null
+++ b/alsactl-fix.patch
@@ -0,0 +1,13 @@
+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)