Hello community, here is the log from the commit of package alsa-utils.3963 for openSUSE:13.2:Update checked in at 2015-08-18 13:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/alsa-utils.3963 (Old) and /work/SRC/openSUSE:13.2:Update/.alsa-utils.3963.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils.3963" Changes: -------- New Changes file: --- /dev/null 2015-07-22 21:25:44.928025004 +0200 +++ /work/SRC/openSUSE:13.2:Update/.alsa-utils.3963.new/alsa-utils.changes 2015-08-18 13:16:47.000000000 +0200 @@ -0,0 +1,727 @@ +------------------------------------------------------------------- +Mon Aug 10 15:04:07 CEST 2015 - [email protected] + +- Suppress alsactl invocation on systems without sound cards + (bsc#940950): + 0008-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch + +------------------------------------------------------------------- +Mon Apr 27 21:43:00 CEST 2015 - [email protected] + +- Fix empty file overwrite of alsa-info.sh without wget + (boo#928394): + 0007-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch + +------------------------------------------------------------------- +Tue Aug 26 12:46:20 CEST 2014 - [email protected] + +- alsa-info.sh updates to 0.4.64: run withall also when --output + is given + 0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch + 0006-alsa-info-Refactor-withall-logic.patch + +------------------------------------------------------------------- +Tue Aug 12 16:07:04 CEST 2014 - [email protected] + +- Move alsa-info.sh to alsa-utils: + 0003-Add-alsa-info.sh-to-alsa-utils-repo.patch + 0004-Add-missing-alsa-info-entry-to-the-root-Makefile.am.patch + +------------------------------------------------------------------- +Tue Jul 1 16:42:31 CEST 2014 - [email protected] + +- Remove obsoleted *.po files +- Backport upstream fixes: + 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch + 0002-alsamixer-include-missing-mixer_controls.h.patch + +------------------------------------------------------------------- +Wed Jun 18 13:10:03 CEST 2014 - [email protected] + +- Updated to alsa-utils 1.0.28: + All pervious fix patches are obsoleted: + 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch + 0002-alsaloop-fix-wrong-alias-for-signal.h.patch + 0003-aplay-fix-two-off-by-one-errors.patch + 0004-alsaloop-add-z-syslog-option-to-use-syslog-for-error.patch + 0005-amixer-actually-print-all-TLVs-in-a-container-TLV.patch + 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch + 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch + 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch + 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch + 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch + 0011-alsaconf-support-newer-m-i-t-and-kmod.patch + 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch + 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch + 0014-alsactl-Add-monitor-command.patch + 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch + 0016-alsactl-monitor-all-cards-as-default.patch + 0017-alsactl-Fix-the-va_list-initialization-in-cerror_-an.patch + 0018-aplay-fix-pcm_read-return-value.patch + 0019-alsa-restore.rules-refer-to-correct-attr.patch + 0020-aplay-fix-timespec-to-msec-conversion.patch + 0021-speaker-test-add-force-frequency-option-to-allow-hz-.patch + 0022-speaker-test-update-man-page-for-new-X-arg-also-cons.patch + +------------------------------------------------------------------- +Tue Mar 11 10:55:31 CET 2014 - [email protected] + +- Upstream backports: Add --force-frequency option to speaker-test + 0021-speaker-test-add-force-frequency-option-to-allow-hz-.patch + 0022-speaker-test-update-man-page-for-new-X-arg-also-cons.patch +- Temporarily add the raw *.po files for properly patching +- Run spec-cleaner + +------------------------------------------------------------------- +Fri Jan 31 12:13:49 CET 2014 - [email protected] + +- Backport minor fix patches for alsactl and aplay from upstream: + 0017-alsactl-Fix-the-va_list-initialization-in-cerror_-an.patch + 0018-aplay-fix-pcm_read-return-value.patch + 0019-alsa-restore.rules-refer-to-correct-attr.patch + 0020-aplay-fix-timespec-to-msec-conversion.patch + +------------------------------------------------------------------- +Wed Nov 27 09:54:23 CET 2013 - [email protected] + +- Backport upstream fixes: a few fixes for chmap support, alsaconf + updates, a new monitor command for alsactl, etc: + 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch + 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch + 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch + 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch + 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch + 0011-alsaconf-support-newer-m-i-t-and-kmod.patch + 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch + 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch + 0014-alsactl-Add-monitor-command.patch + 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch + 0016-alsactl-monitor-all-cards-as-default.patch + +------------------------------------------------------------------- +Tue Oct 1 12:30:28 CEST 2013 - [email protected] + +- Upstream fixes: addition of -z option to alsaloop, and a fix for + amixer TLV parser + 0004-alsaloop-add-z-syslog-option-to-use-syslog-for-error.patch + 0005-amixer-actually-print-all-TLVs-in-a-container-TLV.patch + +------------------------------------------------------------------- +Mon Sep 9 14:16:52 CEST 2013 - [email protected] + +- Upstream fix: + 0003-aplay-fix-two-off-by-one-errors.patch + +------------------------------------------------------------------- +Fri Sep 6 10:02:34 CEST 2013 - [email protected] + +- Upstream fix: + 0002-alsaloop-fix-wrong-alias-for-signal.h.patch + +------------------------------------------------------------------- +Fri Jul 19 15:23:41 CEST 2013 - [email protected] + +- remove superfluous ca0106 file (now included in 1.0.27.2) + +------------------------------------------------------------------- +Fri Jul 19 15:13:27 CEST 2013 - [email protected] + +- updated to version 1.0.27.2 + including all previous fixes +- fix a typo in alsa-state.service: + 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch + +------------------------------------------------------------------- +Mon Jun 17 10:14:18 CEST 2013 - [email protected] + +- Backport upstream fixes wrt chmap handling: + 0006-amixer-Print-TLV-of-channel-map-controls.patch + 0007-speaker-test-Fix-wrong-wave-file-played-back-in-chma.patch + +------------------------------------------------------------------- +Wed May 29 11:03:43 CEST 2013 - [email protected] + +- Backport upstream fixes wrt amixer: + 0004-amixer-Fix-the-hctl-elem-search-bug.patch + 0005-amixer-fix-print_dB-for-0.99-.-0.01-range.patch + +------------------------------------------------------------------- +Mon May 27 09:42:39 CEST 2013 - [email protected] + +- Backport upstream fixes: + 0002-alsactl-init-ca0106-file-was-omitted.patch + 0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch +- Add missing ca0106 alsactl init file +- Revert the udev file drop in the previous commit + +------------------------------------------------------------------- +Thu May 23 15:44:23 CEST 2013 - [email protected] + +- Bump to version 1.0.27.1, including previous fixes +- Removed requirement of libudev-devel, as the superfluous rules + file is dropped in 1.0.27.1. +- Backport upstream fix: + 0001-Release-v1.0.27.1.patch + +------------------------------------------------------------------- +Thu Apr 18 18:39:38 CEST 2013 - [email protected] + +- Upstream fix: arecord: add a missing break to the capture loop + 0003-arecord-add-a-missing-break-to-the-capture-loop.patch + +------------------------------------------------------------------- +Mon Apr 15 18:31:29 UTC 2013 - [email protected] + +- Added patch from upstream, which fixes buffer overflow, + 0002-alsactl-Fix-the-string-size-for-the-lock-file-contents.patch + +------------------------------------------------------------------- +Mon Apr 15 11:26:41 CEST 2013 - [email protected] + +- Replace the previous fix with the upstream patch + +------------------------------------------------------------------- +Sat Apr 13 15:39:49 UTC 2013 - [email protected] + +- Added service_typo.patch, fixes alsa-restore service not starting + +------------------------------------------------------------------- +Fri Apr 12 15:28:31 CEST 2013 - [email protected] + +- Update to version 1.0.27: + including all previous fixes; all 00*-* patches dropped + * Add support for alsactl daemon mode + * Add snd_pcm_abort() support in aplay + +------------------------------------------------------------------- +Fri Feb 1 08:04:39 CET 2013 - [email protected] ++++ 530 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.2:Update/.alsa-utils.3963.new/alsa-utils.changes New: ---- 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch 0002-alsamixer-include-missing-mixer_controls.h.patch 0003-Add-alsa-info.sh-to-alsa-utils-repo.patch 0004-Add-missing-alsa-info-entry-to-the-root-Makefile.am.patch 0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch 0006-alsa-info-Refactor-withall-logic.patch 0007-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch 0008-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch 01beep.conf alsa-utils-1.0.28.tar.bz2 alsa-utils-gettext-version-removal.diff alsa-utils.changes alsa-utils.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ # # spec file for package alsa-utils # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define package_version 1.0.28 # %if 0%{?suse_version} > 1130 %define use_systemd 1 %define use_varlib 1 %if 0%{?suse_version} == 1140 %define _unitdir /lib/systemd/system %endif BuildRequires: systemd %else %define use_systemd 0 %define use_varlib 0 %endif %if 0%{?suse_version} > 1200 %define _udevdir %(pkg-config --variable=udevdir udev) %else %define _udevdir /lib/udev %endif Name: alsa-utils Version: 1.0.28 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2 Source1: 01beep.conf # Patch: alsa-utils-git-fixes.diff # upstream fix patches Patch1: 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch Patch2: 0002-alsamixer-include-missing-mixer_controls.h.patch Patch3: 0003-Add-alsa-info.sh-to-alsa-utils-repo.patch Patch4: 0004-Add-missing-alsa-info-entry-to-the-root-Makefile.am.patch Patch5: 0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch Patch6: 0006-alsa-info-Refactor-withall-logic.patch Patch7: 0007-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch Patch8: 0008-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch # Patch99: alsa-utils-gettext-version-removal.diff BuildRequires: alsa-devel BuildRequires: automake BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: xmlto Requires: alsa Requires: dialog Requires: pciutils Provides: alsa-conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1200 BuildRequires: libudev-devel %endif %description This package contains utility programs supporting ALSA, Advanced Linux Sound Architecture. %prep %setup -q -n %{name}-%{package_version} # fix stupid automake's automatic action sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* # patch -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 # %if 0%{?suse_version} < 1020 %patch99 -p1 %endif %build export AUTOMAKE_JOBS="%{?_smp_mflags}" %if 0%{?suse_version} < 1020 gettextize -f %endif autoreconf -fi opts="" %if %{use_systemd} opts="$opts --with-systemdsystemunitdir=%{_unitdir}" %endif %if ! %{use_varlib} opts="$opts --with-asound-state-dir=/etc" %endif %if 0%{?suse_version} < 1030 opts="$opts --disable-xmlto" %endif opts="$opts --with-udev-rules-dir=%{_udevdir}/rules.d" %configure --with-curses=ncursesw $opts make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}%{_datadir}/alsa/init/preinit mkdir -p %{buildroot}%{_datadir}/alsa/init/postinit for i in %{_sourcedir}/[0-9]*.conf; do install -c -m 0644 $i %{buildroot}%{_datadir}/alsa/init/postinit done %find_lang %{name} --all-name %if %{use_systemd} ln -s alsa-restore.service %{buildroot}%{_unitdir}/alsasound.service %endif %if %{use_varlib} mkdir -p %{buildroot}%{_localstatedir}/lib/alsa %endif %files -f %{name}.lang %defattr(-, root, root) %doc COPYING ChangeLog INSTALL README TODO %doc seq/aconnect/README* %doc seq/aseqnet/README* %doc %{_mandir}/man*/* %doc %{_mandir}/fr %{_bindir}/* %{_sbindir}/* %{_datadir}/sounds/alsa %{_datadir}/alsa %{_udevdir} %if %{use_systemd} %{_unitdir}/*.service %{_unitdir}/basic.target.wants/alsa-state.service %{_unitdir}/basic.target.wants/alsa-restore.service %{_unitdir}/shutdown.target.wants/alsa-store.service %endif %if %{use_varlib} %{_localstatedir}/lib/alsa %endif %changelog ++++++ 0001-alsactl-save-state-do-not-call-rename-for-stdio.patch ++++++ >From 03a652e18ddc2eaad9b6ff3653515d54bd273d75 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <[email protected]> Date: Wed, 25 Jun 2014 10:47:21 +0200 Subject: [PATCH 1/2] alsactl: save state - do not call rename for stdio Signed-off-by: Jaroslav Kysela <[email protected]> --- alsactl/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsactl/state.c b/alsactl/state.c index c33f5017999f..e0c6f2e02e9b 100644 --- a/alsactl/state.c +++ b/alsactl/state.c @@ -1626,7 +1626,7 @@ int save_state(const char *file, const char *cardname) snd_output_close(out); if (err < 0) { error("snd_config_save: %s", snd_strerror(err)); - } else { + } else if (nfile) { err = rename(nfile, file); if (err < 0) error("rename failed: %s (%s)", strerror(-err), file); -- 2.0.0 ++++++ 0002-alsamixer-include-missing-mixer_controls.h.patch ++++++ >From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <[email protected]> Date: Wed, 25 Jun 2014 10:49:23 +0200 Subject: [PATCH 2/2] alsamixer: include missing mixer_controls.h --- alsamixer/mainloop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c index 351f57f8590e..79d81a99cfc1 100644 --- a/alsamixer/mainloop.c +++ b/alsamixer/mainloop.c @@ -29,6 +29,7 @@ #include "widget.h" #include "mixer_widget.h" #include "mixer_display.h" +#include "mixer_controls.h" #include "mainloop.h" static WINDOW *curses_initialized; -- 2.0.0 ++++++ 0003-Add-alsa-info.sh-to-alsa-utils-repo.patch ++++++ ++++ 977 lines (skipped) ++++++ 0004-Add-missing-alsa-info-entry-to-the-root-Makefile.am.patch ++++++ >From 5e5fe9e573efe211dcc3ca9a5bb520bcf00f7950 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Tue, 12 Aug 2014 16:19:06 +0200 Subject: [PATCH] Add missing alsa-info entry to the root Makefile.am Signed-off-by: Takashi Iwai <[email protected]> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f25eee2e38ff..248eb11cb53a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS=-I$(top_srcdir)/include -SUBDIRS = include alsactl alsaucm utils m4 po +SUBDIRS = include alsactl alsaucm utils m4 po alsa-info if ALSAMIXER SUBDIRS += alsamixer endif -- 2.0.4 ++++++ 0005-alsa-info-Make-sure-all-full-script-is-run-even-with.patch ++++++ >From 4f569affc420579a1a6e44cf51d7a1e64d6cd8d3 Mon Sep 17 00:00:00 2001 From: David Henningsson <[email protected]> Date: Fri, 22 Aug 2014 10:31:40 +0200 Subject: [PATCH] alsa-info: Make sure all full script is run even with "output" option For some reason, when the --output option is used, less information is included compared to when no options are used. This is unexpected. Fix this by running "withall" also when the output option is used. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- alsa-info/alsa-info.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh index 859d7bca6b1c..47157f06b159 100755 --- a/alsa-info/alsa-info.sh +++ b/alsa-info/alsa-info.sh @@ -661,6 +661,7 @@ if [ -n "$1" ]; then shift NFILE="$1" KEEP_OUTPUT="yes" + withall ;; --debug) echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted" -- 2.1.0 ++++++ 0006-alsa-info-Refactor-withall-logic.patch ++++++ >From 808af5fdb00be048b485c3ea3f5a5081b99dae30 Mon Sep 17 00:00:00 2001 From: David Henningsson <[email protected]> Date: Fri, 22 Aug 2014 10:31:41 +0200 Subject: [PATCH] alsa-info: Refactor "withall" logic Previously, using --output, --no-upload, --upload and --pastebin switches implied the withall switch. A more intuitive logic would be that --with-all is disabled if you use another --with* switch, such as --withdmesg, and only then. Also update script version to reflect the behaviour change. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- alsa-info/alsa-info.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh index 47157f06b159..acd849588141 100755 --- a/alsa-info/alsa-info.sh +++ b/alsa-info/alsa-info.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.63 +SCRIPT_VERSION=0.4.64 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"; ################################################################################# @@ -260,6 +260,7 @@ withall() { withlsmod withsysfs withdmesg + WITHALL="no" } get_alsa_library_version() { @@ -629,7 +630,6 @@ fi #If no command line options are specified, then run as though --with-all was specified if [ -z "$1" ]; then update - withall pbcheck fi @@ -642,7 +642,6 @@ if [ -n "$1" ]; then case "$1" in --pastebin) update - withall pbcheck ;; --update) @@ -651,43 +650,45 @@ if [ -n "$1" ]; then ;; --upload) UPLOAD="yes" - withall ;; --no-upload) UPLOAD="no" - withall ;; --output) shift NFILE="$1" KEEP_OUTPUT="yes" - withall ;; --debug) echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted" KEEP_FILES="yes" echo "" - withall ;; --with-all) withall ;; --with-aplay) withaplay + WITHALL="no" ;; --with-amixer) withamixer + WITHALL="no" ;; --with-alsactl) withalsactl + WITHALL="no" ;; --with-devices) withdevices + WITHALL="no" ;; --with-dmesg) withdmesg + WITHALL="no" ;; --with-configs) + WITHALL="no" if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]] then echo "!!ALSA configuration files" >> $FILE @@ -717,7 +718,9 @@ if [ -n "$1" ]; then ;; --stdout) UPLOAD="no" - withall + if [ -z "$WITHALL" ]; then + withall + fi cat $FILE rm $FILE ;; @@ -766,6 +769,10 @@ if [ "$PROCEED" = "no" ]; then exit 1 fi +if [ -z "$WITHALL" ]; then + withall +fi + if [ "$UPLOAD" = "ask" ]; then if [ -n "$DIALOG" ]; then dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80 -- 2.1.0 ++++++ 0007-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch ++++++ >From 8188c2466a7d2179aba4e243ff2b85363961f9f1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 27 Apr 2015 21:27:05 +0200 Subject: [PATCH] alsa-info: Don't try update when wget isn't available ... otherwise it overwrites a zero size file. Also add a check of zero size file in the update procedure, too. Signed-off-by: Takashi Iwai <[email protected]> --- alsa-info/alsa-info.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh index acd849588141..0bc4cd0612fb 100755 --- a/alsa-info/alsa-info.sh +++ b/alsa-info/alsa-info.sh @@ -35,6 +35,8 @@ BGTITLE="ALSA-Info v $SCRIPT_VERSION" PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc" #Define some simple functions +WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) + pbcheck(){ [[ $UPLOAD = "no" ]] && return @@ -46,10 +48,12 @@ pbcheck(){ } update() { + test -z "$WGET" -o ! -x "$WGET" && return + SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1 wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh"; >/dev/null 2>&1 REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'` - if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then + if [ -s "$SHFILE" -a "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then if [[ -n $DIALOG ]] then OVERWRITE= @@ -831,8 +835,7 @@ if [ "$UPLOAD" = "no" ]; then fi # UPLOAD #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. -if -WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]] +if [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]] then if [[ -n $DIALOG ]] -- 2.3.5 ++++++ 0008-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch ++++++ >From 0e864e1a3aaf79d451556064eb09052530a0a085 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 10 Aug 2015 14:42:24 +0200 Subject: [PATCH] alsactl: Add path condition to alsa-store and alsa-restore services With alsa-restore.service and alsa-store.service, systemd invokes alsactl at boot and shutdown times. When this is invoked on a system without sound cards, it results in an ugly error message from alsact /usr/sbin/alsactl: save_state:1590: No soundcards found... return code is "19" Add ConditionPathExistsGlob checks of /dev/snd/control* devices for avoiding unnecessary invocations of alsactl on such a system. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=940950 Signed-off-by: Takashi Iwai <[email protected]> --- alsactl/alsa-restore.service.in | 1 + alsactl/alsa-store.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 245a439798fc..d1a74d637457 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -6,6 +6,7 @@ [Unit] Description=Restore Sound Card State ConditionPathExists=!@daemonswitch@ +ConditionPathExistsGlob=/dev/snd/control* DefaultDependencies=no After=alsa-state.service Before=shutdown.target diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in index f1a56bb9dbb5..c89cfff04f35 100644 --- a/alsactl/alsa-store.service.in +++ b/alsactl/alsa-store.service.in @@ -6,6 +6,7 @@ [Unit] Description=Store Sound Card State ConditionPathExists=!@daemonswitch@ +ConditionPathExistsGlob=/dev/snd/control* DefaultDependencies=no Before=shutdown.target -- 2.5.0 ++++++ 01beep.conf ++++++ CTL{reset}="mixer" CTL{name}="PC Speaker Playback Volume",CTL{do_search}=="1", \ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="0" CTL{name}="PC Speaker Playback Switch",CTL{do_search}=="1", \ CTL{values}="off" CTL{reset}="mixer" CTL{name}="PC Beep Playback Volume",CTL{do_search}=="1", \ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="0" CTL{name}="PC Beep Playback Switch",CTL{do_search}=="1", \ CTL{values}="off" CTL{reset}="mixer" CTL{name}="Beep Playback Volume",CTL{do_search}=="1", \ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="0" CTL{name}="Beep Playback Switch",CTL{do_search}=="1", \ CTL{values}="off" ++++++ alsa-utils-gettext-version-removal.diff ++++++ diff -r ff4c1a926a82 configure.in --- a/configure.in Mon Jun 04 15:15:39 2007 +0200 +++ b/configure.in Wed Jun 06 14:25:19 2007 +0200 @@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE(alsa-utils, 1.0.14) AM_INIT_AUTOMAKE(alsa-utils, 1.0.14) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.15]) +dnl AM_GNU_GETTEXT_VERSION([0.15]) dnl Checks for programs.
