rpms/alsa-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixes for bug#951750

Browse Source
This commit is contained in:
Jaroslav Kysela 2013-04-15 15:02:53 +02:00
parent 09e283e543
commit ceeef98da9
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alsa-utils.spec
View File

@ -4,7 +4,7 @@
Summary: Advanced Linux Sound Architecture (ALSA) utilities Summary: Advanced Linux Sound Architecture (ALSA) utilities
Name: alsa-utils Name: alsa-utils
Version: %{baseversion}%{?fixversion} Version: %{baseversion}%{?fixversion}
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.alsa-project.org/ URL: http://www.alsa-project.org/
@ -17,6 +17,7 @@ Source11: alsactl.conf
Source20: alsa-restore.service Source20: alsa-restore.service
Source21: alsa-store.service Source21: alsa-store.service
Source22: alsa-state.service Source22: alsa-state.service
Patch1: alsactl-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: alsa-lib-devel >= %{baseversion}
BuildRequires: libsamplerate-devel BuildRequires: libsamplerate-devel
@ -36,6 +37,7 @@ Architecture (ALSA).
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 -b .alsactl-fix
%build %build
%configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ %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 fi
%changelog %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 * Fri Apr 12 2013 Jaroslav Kysela <jkysela@redhat.com> - 1.0.27-1
- Updated to 1.0.27, activated the alsactl daemon mode - Updated to 1.0.27, activated the alsactl daemon mode
- Updated alsa-info.sh to 0.4.61 - Updated alsa-info.sh to 0.4.61

1
alsa.rules
View File

@ -1,4 +1,5 @@
ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go"
GOTO="alsa_restore_end"
LABEL="alsa_restore_go" 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" 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"

13
alsactl-fix.patch Normal file
View File

@ -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)