I have made the following changes intended for : CE:Utils / alsa-utils Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/3290 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3290: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-30T12:29:16 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:Mer:Utils / alsa-utils -> CE:Utils / alsa-utils changes files: -------------- ++++++ new changes file: --- alsa-utils.changes +++ alsa-utils.changes @@ -0,0 +1,265 @@ +* Wed Nov 16 2011 Marko Saukko <[email protected]> - 1.0.24.2 +- Dropped xmlto build dep and dialog install dep. + +* Fri Sep 2 2011 Jouni Peltonen <[email protected]> - 1.0.24.2 +- Update to 1.0.24.2 +- alsa_version variable added to spec-file. + +* Mon Apr 18 2011 vivian zhang <[email protected]> - 1.0.23 +- Merged the patch to fix double free issue if linesize exceeds 2048 (BMC #14656) + +* Mon Jul 26 2010 Ling Yue <[email protected]> - 1.0.23 +- Upgrade to 1.0.23 +- Upgrade alsa-info.sh to 0.4.59 + +* Thu Jul 15 2010 Anas Nashif <[email protected]> - 1.0.22 +- Install udev rules in /lib/udev (bmc #3424) + +* Fri Dec 25 2009 Bin Gao <[email protected]> - 1.0.22 +- Update to 1.0.22 +- Dropped 3 patches + +* Mon Sep 21 2009 Vivian Zhang <[email protected]> - 1.0.21 +- Update to 1.0.21 +- Update alsa-info.sh to 0.4.58 + +* Wed May 20 2009 Vivian Zhang <[email protected]> - 1.0.20 +- Update to 1.0.20 +- Added LineOut volume in alsactl init to fix #2634 + +* Mon Mar 16 2009 Vivian Zhang <[email protected]> - 1.0.19 +- Fixed error symlink of alsa-info.sh + +* Fri Feb 13 2009 Anas Nashif <[email protected]> - 1.0.19 +- Update to 1.0.19 + +* Mon Jan 12 2009 Anas Nashif <[email protected]> - 1.0.18 +- Source tag cleanup + +* Mon Nov 24 2008 Vivian zhang <[email protected]> - 1.0.18 +- Update to 1.0.18 +- Added alsa-info.sh script to /usr/bin/alsa-info +- Changed alsaunmute to use 'alsactl init' +- Added /etc/alsa/asound.state -> /etc/asound.state shift to %post +- Removed RH specific udev helpers +- Fix building +- Ungenerate man7/alsactl_init.7.gz to remove BR:xmlto + +* Sat Sep 27 2008 Jianfeng Mei <[email protected]> - 1.0.16 +- Initial import for Moblin + +* Tue Feb 19 2008 Fedora Release Engineering <[email protected]> - 1.0.16-2 +- Autorebuild for GCC 4.3 + +* Mon Feb 18 2008 Martin Stransky <[email protected]> - 1.0.16-1 +- updated to 1.0.16 final + +* Tue Jan 15 2008 Mikel Ward <[email protected]> - 1.0.15-2 +- add salsa man page + +* Mon Oct 29 2007 Martin Stransky <[email protected]> - 1.0.15-1 +- updated to 1.0.15 final + +* Mon Oct 1 2007 Martin Stransky <[email protected]> - 1.0.15-0.4.rc1 +- moved saved volume settings back to /etc/alsa + (per discussion at #293301) + +* Mon Sep 24 2007 Martin Stransky <[email protected]> - 1.0.15-0.3.rc1 +- fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules + +* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> - 1.0.15-0.2.rc1 +- Update License field. +- Mark udev rule as config. +- Use find_lang macro again to include translations (why was it removed?). + +* Wed Sep 19 2007 Martin Stransky <[email protected]> - 1.0.15-0.1.rc1 +- new upstream +- moved saved volume settings to /var/lib (#293301) +- patched alsactl for that (#255421) + +* Thu Aug 16 2007 Martin Stransky <[email protected]> - 1.0.14-2 +- added an entry to alsaunmute for HP xw4550 (#252171) + +* Wed Jul 25 2007 Martin Stransky <[email protected]> - 1.0.14-1 +- release bump + +* Thu Jun 7 2007 Martin Stransky <[email protected]> - 1.0.14-0.8 +- new upstream + +* Wed May 30 2007 Martin Stransky <[email protected]> - 1.0.14-0.7.rc2 +- updated alsanumute for Siemens Lifebook S7020 (#241639) +- unmute Master Mono for all drivers + +* Wed May 2 2007 Martin Stransky <[email protected]> - 1.0.14-0.6.rc2 +- added fix for #238442 (unmute Mono channel for w4550, + xw4600, xw6600, and xw8600) + +* Wed Apr 18 2007 Martin Stransky <[email protected]> - 1.0.14-0.5.rc2 +- added more funcionality to salsa (save/load sound settings), + moved volume settings to /etc/alsa/ + +* Thu Apr 10 2007 Martin Stransky <[email protected]> - 1.0.14-0.4.rc2 +- added support for large files +- minor fix in alsaunmute +- fixed #209239 - alsaconf: Stale language-dependent files +- fixed #233765 - alsa-utils : unowned directories + +* Fri Jan 19 2007 Martin Stransky <[email protected]> - 1.0.14-0.3.rc2 +- new upstream + +* Wed Jan 10 2007 Martin Stransky <[email protected]> - 1.0.14-0.2.rc1 +- added a config line for hda-intel driver + +* Mon Dec 11 2006 Martin Stransky <[email protected]> - 1.0.14-0.1.rc1 +- new upstream + +* Mon Oct 2 2006 Martin Stransky <[email protected]> - 1.0.12-3 +- fix for #207384 - Audio test fails during firstboot + +* Fri Aug 25 2006 Martin Stransky <[email protected]> - 1.0.12-2 +- new upstream + +* Mon Aug 07 2006 Martin Stransky <[email protected]> - 1.0.12-1.rc2 +- new upstream + +* Thu Jul 20 2006 Martin Stransky <[email protected]> - 1.0.12-1.rc1 +- new upstream + +* Wed Jul 12 2006 Jesse Keating <[email protected]> - 1.0.11-8 +- rebuild + +* Tue May 30 2006 Martin Stransky <[email protected]> - 1.0.11-7 +- new upstream + +* Wed May 3 2006 Martin Stransky <[email protected]> - 1.0.11-6.rc2 +- removed HW specific switch - it should be set by driver + +* Thu Apr 6 2006 Martin Stransky <[email protected]> - 1.0.11-5.rc2 +- fixed rules file (#186494) +- fixed Audigi mixer switch (#187807) + +* Mon Feb 20 2006 Martin Stransky <[email protected]> - 1.0.11-3.rc2 +- removed autoreconf + +* Fri Feb 10 2006 Jesse Keating <[email protected]> - 1.0.11-2.rc2.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating <[email protected]> - 1.0.11-2.rc2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 25 2006 Martin Stransky <[email protected]> - 1.0.11-2.rc2 +- added volume option to alsaunmute utility (for s-c-s) + +* Thu Jan 12 2006 Martin Stransky <[email protected]> - 1.0.11-1.rc2 +- new upstream + +* Fri Dec 09 2005 Jesse Keating <[email protected]> - 1.0.10rf-1 +- rebuilt + +* Thu Nov 24 2005 Martin Stransky <[email protected]> - 1.0.10rf-1 +- new upstream version +- added alias for snd-azx + +* Wed Nov 9 2005 Martin Stransky <[email protected]> - 1.0.10rc1-2 +- fix for #169292 - RHEL4U2 xw4300 IntelHD internal speakers muted by default + +* Tue Sep 27 2005 Martin Stransky <[email protected]> - 1.0.10rc1-1 +- new upstream version + +* Tue Aug 23 2005 Martin Stransky <[email protected]> - 1.0.9-5 +- unmute External Amplifier by default (#166153) + +* Wed Jul 13 2005 Bill Nottingham <[email protected]> - 1.0.9-4 +- migrate the alsa restore program to a udev rule, not a dev.d program +- conflict with appropriate udev +- move alsaunmute, alsacard to /bin + +* Mon Jul 11 2005 Martin Stransky <[email protected]> - 1.0.9-3 +- New alsaunmute utility +- Add autoconf to BuildRequires (#162483) + +* Thu Jun 16 2005 Martin Stransky <[email protected]> - 1.0.9-2 +- New upstream version + +* Mon May 30 2005 Martin Stransky <[email protected]> - 1.0.9-1 +- New upstream version. +- moved alsacard utility from alsa-lib to alsa-tools + +* Mon May 16 2005 Bill Nottingham <[email protected]> - 1.0.9rc2-2 +- make sure 'Wave' playback channel isn't muted (#157850) + +* Mon Apr 25 2005 Martin Stransky <[email protected]> - 1.0.9rc2-1 +- New upstream version +- add %%find_lang macro (#155719) + +* Fri Apr 1 2005 Bill Nottingham <[email protected]> - 1.0.8-4 +- replace the dev.d script with a program that calls alsactl to + restore the volume if there is a saved config, and just unmutes + the playback channels if there isn't one (#132575) + +* Mon Mar 7 2005 Martin Stransky <[email protected]> - 1.0.8-3 +- rebuilt + +* Wed Feb 16 2005 Martin Stransky <[email protected]> - 1.0.8-2 +- fix #148011 (add gettext-devel to BuildRequires) +- add $RPM_OPT_FLAGS to CFLAGS + +* Wed Jan 26 2005 Martin Stransky <[email protected]> - 1.0.8-1 +- update to 1.0.8 +- temporarily removed alsa-lauch.patch + +* Sat Jan 08 2005 Colin Walters <[email protected]> - 1.0.7-2 +- New patch alsa-utils-1.0.7-alsa-launch.patch, adds the + alsa-launch command. +- New source file xinit-alsa-launch.sh, integrates alsa-launch + into X startup +- BR xorg-x11-devel + +* Thu Jan 06 2005 Colin Walters <[email protected]> - 1.0.7-1 +- New upstream version + +* Tue Oct 19 2004 Bill Nottingham <[email protected]> - 1.0.6-3 +- tweak dev.d sound restore script (#133535, revisited) + +* Thu Oct 14 2004 Bill Nottingham <[email protected]> - 1.0.6-2 +- move alsactl to /sbin +- include a dev.d script for mixer restoring (#133535) + +* Mon Aug 30 2004 Bill Nottingham <[email protected]> - 1.0.6-1 +- update to 1.0.6 + +* Fri Jul 2 2004 Bill Nottingham <[email protected]> - 1.0.5-1 +- update to 1.0.5 + +* Tue Jun 15 2004 Elliot Lee <[email protected]> - 1.0.3-2 +- rebuilt + +* Thu Mar 11 2004 Bill Nottingham <[email protected]> - 1.0.3-1 +- update to 1.0.3 + +* Fri Feb 13 2004 Elliot Lee <[email protected]> - 1.0.2-2 +- rebuilt + +* Wed Jan 28 2004 Bill Nottingham <[email protected]> - 1.0.2-1 +- update to 1.0.2 + +* Wed Dec 17 2003 Bill Nottingham <[email protected]> - 1.0.0-0.rc2 +- import fedora.us RPM, take out save-alsamixer & alsaconf for now + +* Thu Dec 11 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.0-0.fdr.0.4.rc2 +- rename alsamixer-saver save-alsamixer + +* Mon Dec 8 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.0-0.fdr.0.3.rc2 +- Integrate Michael Schwendt's script alsamixer-saver; Still not quite sure if + this script is the right way -- but mine didn't work... + +* Sat Dec 6 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.0-0.fdr.0.2.rc2 +- Update to 1.0.0rc2 +- added alsamixer Script -- stores settings on shutdown, does nothing on startup +- some minor corrections in spec-file style + +* Wed Dec 3 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.0-0.fdr.0.1.rc1 +- Update to 1.0.0rc1 + +* Wed Aug 6 2003 Dams <anvil[AT]livna.org> - 0:utils-0.fdr.1 +- Initial build. new: ---- alsa-info.sh alsa-utils-1.0.24.2.tar.bz2 alsa-utils.changes alsa-utils.spec alsa-utils.yaml alsa.rules alsactl.conf alsaunmute alsaunmute.1 null-pointer-to-avoid-double-free.patch spec files: ----------- ++++++ new spec file: --- alsa-utils.spec +++ alsa-utils.spec @@ -0,0 +1,138 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +%define alsa_version 1.0.24.1 +# << macros + +Name: alsa-utils +Summary: Advanced Linux Sound Architecture (ALSA) utilities +Version: 1.0.24.2 +Release: 1 +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.alsa-project.org/ +Source0: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 +Source1: alsaunmute +Source2: alsaunmute.1 +Source3: alsa-info.sh +Source4: alsa.rules +Source5: alsactl.conf +Source100: alsa-utils.yaml +Patch0: null-pointer-to-avoid-double-free.patch +Requires: alsa-lib >= %{alsa_version} +BuildRequires: pkgconfig(alsa) >= %{alsa_version} +BuildRequires: pkgconfig(ncurses) +BuildRequires: gettext-devel +Conflicts: udev < 062 + + +%description +This package contains command line utilities for the Advanced Linux Sound +Architecture (ALSA). + + + + +%prep +%setup -q -n %{name}-%{version} + +# null-pointer-to-avoid-double-free.patch +%patch0 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%configure --disable-static \ + CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ + --sbindir=/sbin \ + --disable-alsaconf \ + --disable-xmlto + +make %{?jobs:-j%jobs} + +# >> build post +%{__cp} %{SOURCE1} . + +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +#make install DESTDIR=$RPM_BUILD_ROOT + +# Install ALSA udev rules +mkdir -p -m 755 $RPM_BUILD_ROOT/lib/udev/rules.d +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/udev/rules.d/90-alsa.rules + +# Install support utilities +mkdir -p -m755 $RPM_BUILD_ROOT/bin +install -p -m 755 alsaunmute %{buildroot}/bin/ +mkdir -p -m755 $RPM_BUILD_ROOT/%{_mandir}/man1 +gzip -9 -c %{SOURCE2} > $RPM_BUILD_ROOT/alsaunmute.1.gz +install -p -m 644 $RPM_BUILD_ROOT/alsaunmute.1.gz %{buildroot}/%{_mandir}/man1 +rm $RPM_BUILD_ROOT/alsaunmute.1.gz + +# Link alsactl to /usr/sbin +mkdir -p $RPM_BUILD_ROOT/%{_sbindir} +ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl + +# Move /usr/share/alsa/init to /lib/alsa/init +mkdir -p -m 755 %{buildroot}/lib/alsa +mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/lib/alsa + +# Link /lib/alsa/init to /usr/share/alsa/init back +ln -s ../../../lib/alsa/init %{buildroot}%{_datadir}/alsa/init + + +# Create a place for global configuration +mkdir -p -m 755 %{buildroot}/etc/alsa +install -p -m 644 %{SOURCE5} %{buildroot}/etc/alsa +touch %{buildroot}/etc/asound.state + +# Install alsa-info.sh script +install -p -m 755 %{SOURCE3} %{buildroot}/usr/bin/alsa-info +ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh + +# << install post +%find_lang %{name} + + + +%post +# >> post +if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then +mv /etc/alsa/asound.state /etc/asound.state +fi +# << post + + + +%files -f %{name}.lang +%defattr(-,root,root,-) +# >> files +%doc COPYING README +%config /lib/udev/rules.d/* +%config /etc/alsa/* +/bin/* +/sbin/* +/lib/alsa/init/* +%{_bindir}/* +%{_sbindir}/* +%{_datadir}/alsa/ +%{_datadir}/sounds/ +%doc %{_mandir}/man?/* +%dir /etc/alsa/ +%dir /lib/alsa/ +%dir /lib/alsa/init/ +%ghost /etc/asound.state +# << files + + other changes: -------------- ++++++ alsa-info.sh (new) --- alsa-info.sh +++ alsa-info.sh @@ -0,0 +1,925 @@ +#!/bin/bash + +SCRIPT_VERSION=0.4.59 +CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"; + +################################################################################# +#Copyright (C) 2007 Free Software Foundation. + +#This program is free software; you can redistribute it and/or modify +#it under the terms of the GNU General Public License as published by +#the Free Software Foundation; either version 2 of the License, or +#(at your option) any later version. + +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. + +#You should have received a copy of the GNU General Public License +#along with this program; if not, write to the Free Software +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +################################################################################## + +#The script was written for 2 main reasons: +# 1. Remove the need for the devs/helpers to ask several questions before we can easily help the user. +# 2. Allow newer/inexperienced ALSA users to give us all the info we need to help them. + +#Set the locale (this may or may not be a good idea.. let me know) +export LC_ALL=C + +#Change the PATH variable, so we can run lspci (needed for some distros) +PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin +BGTITLE="ALSA-Info v $SCRIPT_VERSION" +PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc" +#Define some simple functions + +pbcheck(){ + [[ $UPLOAD = "no" ]] && return + + if [[ -z $PASTEBIN ]]; then + [[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes" + else + [[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes" + fi +} + +update() { + 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 [[ -n $DIALOG ]] + then + OVERWRITE= + if [ -w $0 ]; then + dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?\nNOTICE: The original file $0 will be overwritten!" 0 0 + DIALOG_EXIT_CODE=$? + if [[ $DIALOG_EXIT_CODE = 0 ]]; then + OVERWRITE=yes + fi + fi + if [ -z "$OVERWRITE" ]; then + dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to download it?" 0 0 + DIALOG_EXIT_CODE=$? + fi + if [[ $DIALOG_EXIT_CODE = 0 ]] + then + echo "Newer version detected: $REMOTE_VERSION" + echo "To view the ChangeLog, please visit $CHANGELOG" + if [ "$OVERWRITE" = "yes" ]; then + cp $SHFILE $0 + echo "ALSA-Info script has been updated to v $REMOTE_VERSION" + echo "Please re-run the script" + rm $SHFILE 2>/dev/null + else + echo "ALSA-Info script has been downloaded as $SHFILE." + echo "Please re-run the script from new location." + fi + exit + else + rm $SHFILE 2>/dev/null + fi + else + echo "Newer version detected: $REMOTE_VERSION" + echo "To view the ChangeLog, please visit $CHANGELOG" + if [ -w $0 ]; then + echo "The original file $0 will be overwritten!" + echo -n "If you do not like to proceed, press Ctrl-C now.." ; read inp + cp $SHFILE $0 + echo "ALSA-Info script has been updated. Please re-run it." + rm $SHFILE 2>/dev/null + else + echo "ALSA-Info script has been downloaded $SHFILE." + echo "Please, re-run it from new location." + fi + exit + fi + else + rm $SHFILE 2>/dev/null + fi +} + +cleanup() { + if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then + rm -rf "$TEMPDIR" 2>/dev/null + fi + test -n "$KEEP_OUTPUT" || rm -f "$NFILE" +} + + +withaplay() { + echo "!!Aplay/Arecord output" >> $FILE + echo "!!------------" >> $FILE + echo "" >> $FILE + echo "APLAY" >> $FILE + echo "" >> $FILE + aplay -l >> $FILE 2>&1 + echo "" >> $FILE + echo "ARECORD" >> $FILE + echo "" >> $FILE + arecord -l >> $FILE 2>&1 + echo "" >> $FILE +} + +withlsmod() { + echo "!!All Loaded Modules" >> $FILE + echo "!!------------------" >> $FILE + echo "" >> $FILE + lsmod |awk {'print $1'} >> $FILE + echo "" >> $FILE + echo "" >> $FILE +} + +withamixer() { + echo "!!Amixer output" >> $FILE + echo "!!-------------" >> $FILE + echo "" >> $FILE + for i in `grep "]: " /proc/asound/cards | awk -F ' ' '{ print $1} '` ; do + CARD_NAME=`grep "^ *$i " $TEMPDIR/alsacards.tmp|awk {'print $2'}` + echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE + echo "" >>$FILE + amixer -c$i info>> $FILE 2>&1 + amixer -c$i>> $FILE 2>&1 + echo "" >> $FILE + done + echo "" >> $FILE +} + +withalsactl() { + echo "!!Alsactl output" >> $FILE + echo "!!-------------" >> $FILE + echo "" >> $FILE + exe="" + if [ -x /usr/sbin/alsactl ]; then + exe="/usr/sbin/alsactl" + fi + if [ -x /usr/local/sbin/alsactl ]; then + exe="/usr/local/sbin/alsactl" + fi + if [ -z "$exe" ]; then + exe=`whereis alsactl | cut -d ' ' -f 2` + fi + $exe -f $TEMPDIR/alsactl.tmp store + echo "--startcollapse--" >> $FILE + cat $TEMPDIR/alsactl.tmp >> $FILE + echo "--endcollapse--" >> $FILE + echo "" >> $FILE + echo "" >> $FILE +} + +withdevices() { + echo "!!ALSA Device nodes" >> $FILE + echo "!!-----------------" >> $FILE + echo "" >> $FILE + ls -la /dev/snd/* >> $FILE + echo "" >> $FILE + echo "" >> $FILE +} + +withconfigs() { +if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]] || [[ -e $HOME/.asoundrc.asoundconf ]] +then + echo "!!ALSA configuration files" >> $FILE + echo "!!------------------------" >> $FILE + echo "" >> $FILE + + #Check for ~/.asoundrc + if [[ -e $HOME/.asoundrc ]] + then + echo "!!User specific config file (~/.asoundrc)" >> $FILE + echo "" >> $FILE + cat $HOME/.asoundrc >> $FILE + echo "" >> $FILE + echo "" >> $FILE + fi + #Check for .asoundrc.asoundconf (seems to be Ubuntu specific) + if [[ -e $HOME/.asoundrc.asoundconf ]] + then (726 more lines skipped) ++++++ alsa-utils-1.0.24.2.tar.bz2 (new) ++++++ alsa-utils.yaml (new) --- alsa-utils.yaml +++ alsa-utils.yaml @@ -0,0 +1,37 @@ +Name: alsa-utils +Summary: Advanced Linux Sound Architecture (ALSA) utilities +Version: 1.0.24.2 +Release: 1 +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.alsa-project.org/ +Sources: + - ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 + - alsaunmute + - alsaunmute.1 + - alsa-info.sh + - alsa.rules + - alsactl.conf +Patches: + - null-pointer-to-avoid-double-free.patch +Description: | + This package contains command line utilities for the Advanced Linux Sound + Architecture (ALSA). + +Requires: + - alsa-lib >= %{alsa_version} +PkgConfigBR: + - alsa >= %{alsa_version} + - ncurses +PkgBR: + - gettext-devel +Conflicts: + - udev < 062 +Configure: configure +ConfigOptions: + - CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + - --sbindir=/sbin + - --disable-alsaconf + - --disable-xmlto +Builder: make +LocaleName: "%{name}" ++++++ alsa.rules (new) --- alsa.rules +++ alsa.rules @@ -0,0 +1,4 @@ +ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", \ + RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore /dev/$name" +ACTION=="remove", SUBSYSTEM=="sound", KERNEL=="controlC*", \ + RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store /dev/$name" ++++++ alsactl.conf (new) --- alsactl.conf +++ alsactl.conf @@ -0,0 +1,14 @@ +# +# ALSA library configuration file for alsactl tool +# (/usr/share/alsa tree is not necessary for alsactl) +# + +ctl.hw { + @args [ CARD ] + @args.CARD { + type string + default "0" + } + type hw + card $CARD +} ++++++ alsaunmute (new) --- alsaunmute +++ alsaunmute @@ -0,0 +1,7 @@ +#!/bin/sh + +exec /sbin/alsactl \ + -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf \ + --initfile=/lib/alsa/init/00main \ + init + ++++++ alsaunmute.1 (new) --- alsaunmute.1 +++ alsaunmute.1 @@ -0,0 +1,28 @@ +.TH ALSAUNMUTE 1 "21 April 2010" +.SH NAME +alsaunmute \- a simple script to initialize ALSA sound devices + +.SH DESCRIPTION +\fBalsaunmute\fP is a shell script which runs the \fBalsactl(1)\fP +utility with \fIinit\fP argument (see the script for details). + +.SH OPTIONS +None + +.SS +Example: +\fBalsaunmute\fR + +.SH SEE ALSO +\fB +alsactl(1), +alsamixer(1), +amixer(1) +\fP + +.SH BUGS +None known. + +.SH AUTHOR +\fBalsaunmute\fP is by Jaroslav Kysela <[email protected]> + ++++++ null-pointer-to-avoid-double-free.patch (new) --- null-pointer-to-avoid-double-free.patch +++ null-pointer-to-avoid-double-free.patch @@ -0,0 +1,11 @@ +diff -Nur alsa-utils-1.0.23/alsactl/init_parse.c alsa-utils-1.0.23-new/alsactl/init_parse.c +--- alsa-utils-1.0.23/alsactl/init_parse.c 2010-04-16 19:11:06.000000000 +0800 ++++ alsa-utils-1.0.23-new/alsactl/init_parse.c 2011-04-18 21:28:50.337280657 +0800 +@@ -1686,6 +1686,7 @@ + free(line); + linesize = (count + 127 + 1) & ~127; + if (linesize > 2048) { ++ line = NULL; + error("file %s, line %i too long", filename, linenum); + err = -EINVAL; + break;
