From c68a3d02d161ccb6358620fb6442bc5c194f20f1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai
Date: Thu, 14 Jun 2012 13:14:48 +0200 Subject: [PATCH 14/15] alsactl: Read only *.conf files when a directory is
Hello community,
here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2012-06-25 12:20:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old)
and /work/SRC/openSUSE:Factory/.alsa-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils", Maintainer is "tiwai@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2012-06-01 07:19:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes 2012-06-25 12:20:47.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Jun 20 18:19:21 CEST 2012 - tiwai@suse.de
+
+- Fix the installation of postinit rules
+- Add (empty) preinit directory for alsactl init as a placeholder
+
+-------------------------------------------------------------------
+Fri Jun 15 15:41:10 CEST 2012 - tiwai@suse.de
+
+- Make beep silent as default (bnc#767270)
+- Backport fixes for alsactl init
+- Fix invalid .LO entry in man page
+
+-------------------------------------------------------------------
New:
----
0014-alsactl-Read-only-.conf-files-when-a-directory-is-pa.patch
0015-alsactl-Add-reference-to-alsactl_init-7-in-alsactl-m.patch
0016-aseqnet-Remove-obsoleted-.LO-entry-from-man-page.patch
01beep.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.LWnGVd/_old 2012-06-25 12:20:48.000000000 +0200
+++ /var/tmp/diff_new_pack.LWnGVd/_new 2012-06-25 12:20:48.000000000 +0200
@@ -42,6 +42,7 @@
Version: 1.0.25
Release: 0
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
+Source1: 01beep.conf
# Patch: alsa-utils-git-fixes.diff
Patch1: 0001-Fix-the-examples-in-aplay.1.patch
Patch2: 0002-Trivial-fixes-in-INSTALL-file.patch
@@ -55,6 +56,9 @@
Patch11: 0011-alsactl-Do-not-access-other-cards-than-specified-for.patch
Patch12: 0012-aplay-print-vu-meter-to-stderr-not-stdout.patch
Patch13: 0013-alsaloop-fix-the-avail_min-setup.patch
+Patch14: 0014-alsactl-Read-only-.conf-files-when-a-directory-is-pa.patch
+Patch15: 0015-alsactl-Add-reference-to-alsactl_init-7-in-alsactl-m.patch
+Patch16: 0016-aseqnet-Remove-obsoleted-.LO-entry-from-man-page.patch
Patch99: alsa-utils-gettext-version-removal.diff
Url: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,6 +85,9 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
%if %suse_version < 1020
%patch99 -p1
%endif
@@ -106,6 +113,11 @@
%install
%makeinstall
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/alsa/init/preinit
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/alsa/init/postinit
+for i in %{_sourcedir}/[0-9]*.conf; do
+ install -c -m 0644 $i $RPM_BUILD_ROOT%{_datadir}/alsa/init/postinit
+done
%find_lang %{name} --all-name
%if %use_systemd
ln -s alsa-restore.service $RPM_BUILD_ROOT/lib/systemd/system/alsasound.service
++++++ 0014-alsactl-Read-only-.conf-files-when-a-directory-is-pa.patch ++++++
passed via INCLUDE
When alsactl init is invoked and a directory path is passed to INCLUDE
command in the config file, read only *.conf files in that directory.
This will avoid reading backup files or invalid files that have been
created accidentally.
Also by using scandir() with alphasort(), alsactl reads the files in
alphabetical order. Thus it's highly recommended to use some number
prefix to the file name for assuring the order.
Signed-off-by: Takashi Iwai
From c3111571dc6a45e20c79a2c4fa590101d35db822 Mon Sep 17 00:00:00 2001 From: Takashi Iwai
Date: Thu, 14 Jun 2012 16:14:29 +0200 Subject: [PATCH 15/15] alsactl: Add reference to alsactl_init(7) in alsactl man page
Signed-off-by: Takashi Iwai
From 2b31992c799488c5a93bfe0b17d64b5196b122b4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai
Date: Fri, 15 Jun 2012 16:34:55 +0200 Subject: [PATCH] aseqnet: Remove obsoleted .LO entry from man page
Signed-off-by: Takashi Iwai