Fix typing error in alsa-restore.service systemd file. Fix missing break to the capture loop in arecord. Fix buffer overflow in alsactl wrt #468160 by "John"

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 163 insertions, 9 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 97543133d939..b7c671465c46 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.345 2013/05/01 12:16:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.346 2013/05/01 16:18:18 ssuominen Exp $
+
+*alsa-utils-1.0.27-r1 (01 May 2013)
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-utils-1.0.27-r1.ebuild, +files/alsa-utils-1.0.27-alsactl.patch,
+  +files/alsa-utils-1.0.27-arecord.patch,
+  +files/alsa-utils-1.0.27-service.patch:
+  Fix typing error in alsa-restore.service systemd file. Fix missing break to
+  the capture loop in arecord. Fix buffer overflow in alsactl wrt #468160 by
+  "John"
 
   01 May 2013; Samuli Suominen <ssuominen@gentoo.org>
   -alsa-utils-1.0.24.2-r1.ebuild, -alsa-utils-1.0.25-r1.ebuild,
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0f25bb3d7a86..34a15fe2f77f 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,23 +5,27 @@ AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788f
 AUX alsa-utils-1.0.23-modprobe.d.patch 504 SHA256 3f6116f467f52eba2e2de46df24a08c99231fdf83ab92dd5f0051aabc5aee077 SHA512 b702b8a9d4a173bcca463c821790294c2b8148271a1f281d1c177c312edd7086b650becaa39b8e078881755e6f006c69e501da347eacfc201746d47648195472 WHIRLPOOL 5138926ec3fd3d1afc1c7c5e6a5df4d6a2e1349021decf97e94f1c903e689dda895852422772080f8af4042fdf0194ecfad700565a4c2631c82e18399385474a
 AUX alsa-utils-1.0.25-separate-usr-var-fs.patch 471 SHA256 2d92453c9427e46702a5624791dc58da8834c457d6eb6f1b96fd6d4eb651544a SHA512 88f2ecb66180bc757c1d4fc43eca10cebaa6e9850b05ecaabc0810ae5b25517d46091176342c307d36cda539a6ee6e601bf969c40f87305077d3b5a7706f0f5e WHIRLPOOL da1a144b518d5db3af19395fee9d7030b679f886dde091ffafb2d11417765d7972ee56dbab35cdf4f900c6e977f1ff91744528ea379613d141fc813cba2d386d
 AUX alsa-utils-1.0.26-kmod.patch 460 SHA256 65c9e14813d3da1fde93cfde1f926df65fa4ffd289586a7aeb8cde5a6c4e188e SHA512 35824e266d6dc58e107418253abb559aaf08ec1efa60d707549cde3007c6a23120475472604362e83fd014dc236710a0a584ca51bafaa4561db067698a308414 WHIRLPOOL 01658c41a77c4aca55a025823a833bf7ca2e261d6e82bf8e28540da1890517d36a05a97b21d912ce60634edbb445e0f6d924841ca3c358e6b6246d7477fd68e2
+AUX alsa-utils-1.0.27-alsactl.patch 808 SHA256 874cb5935b2b03da90af07d52eb4e84b16cc912c64c4182a79e37fa0ab8341dc SHA512 03b7ef375945390a78ff761c5cb5bd84e555af1f3f5a629915accae36308dc9703366c898f9a72176e679e76d9000506d57459c314ba608f1b7a03bb35b16b2a WHIRLPOOL b5fff86b968686ec0eb4583e7ead3b1e61987aa8c1fcfd1663502bac867ebecadbfafef306016f3638f73ca408b31306ebe7fece0962b6337f1c7dc1bb7bf018
+AUX alsa-utils-1.0.27-arecord.patch 704 SHA256 cacd8317c0039fc68feda0159c69ac71a30ad362dca79c8ec584f20a8307cbf9 SHA512 6075f9dbba9365073aa017037e5ebc190cef0a3de6623524d4383e3e50847b93bbd8329a841d0e87097b5ad64c1268db3eee7cc028cf3e110382242af576a0cc WHIRLPOOL d72fc88efbedf521cd1112c4de26adeea6337585146ba02cef3f20bdcf905a3ec0ff36e310eac4b86726cd3d7310a72c2e32b8019607f591aab5ef54c8bbd5f1
+AUX alsa-utils-1.0.27-service.patch 322 SHA256 a5eb871b8a31df65bd2e81fc294859acaba267cfd4fa61f857c272d5770f6caa SHA512 ef83ed8212143658360da27c2e7eaa830f95ac61265dead383e5499f840b72e0b9f4bd58186ca2399fc0afe13e949abe2b916f76ce240a81cb96243de32d8417 WHIRLPOOL 38e64494de1d2944385d3fdb1bf442ef074743fd1f45fcaf86feef00050f27765515f8e3d6c0297961baef4614fb48c03311f0064f3b0f6fdcd55bf3a9060804
 AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
 AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
 DIST alsa-driver-1.0.25.tar.bz2 3861484 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 SHA512 51164c5f1c6e40e188be8e544ddc610b56ffb7d696bc925a0a30e6819d6cbd90a7f9f33c379d411d0e7a172a3ed1cf15b59c27654d63db1a9bad2051331d3017 WHIRLPOOL b70a3614baf72cc2762a2b8a65e07af0204c8550aa140aa01f7d5ee998a8cdf54f43600cfb61c2cb4773d55813afd9aef845f4219d955fbf0f3bc085cf003c7d
 DIST alsa-utils-1.0.26.tar.bz2 1134474 SHA256 f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7 SHA512 4b288ef2874645ecfd48d855f57e16bd20aa9b72ec1d18d17a0a79924a6c4b37c0045cd7f4d2ceb9005716871bf532200820b60c1efa0461b81a7cd714374b22 WHIRLPOOL 5212c07bc27cb4c14db67df313d2a66daed727e676b93f8420dddb1c4fb28365ce49e92e8ef2879e9ffba7f98dd26201f45e4e650ada20227d4647a045ded196
 DIST alsa-utils-1.0.27.tar.bz2 1142833 SHA256 6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef SHA512 1bcfcce0cee2c9e72458525f8424abab4a0be93bceda0a90f0113be315ff0f1d956309b535bfd0cc9ce70f031718718301e8dc91f2d16cd91b34ebeb95693625 WHIRLPOOL e13a7a57d7dcc2f323dfdc1a9f6976adcb4a038d159ae6a5641eebebbfcc44e7ed2b833f2e7d8f324a28f9daa355f55ff4def7d0d820f61790e40733d8bd1cbe
 EBUILD alsa-utils-1.0.26-r2.ebuild 2350 SHA256 6bc96fce2ba3fad5ced306b691201e267e4f7bcb70ba0e11900db219c9e64927 SHA512 2ccba1fc4444d8626b5811de5b2b3f79b4c28a4cafbbc3a83d5466624b765033092e93e7d59b8377e634bcfc54e38090da7e2ea6c850ee0880395ec80c947f39 WHIRLPOOL d438a717250ed7066342bc797fbeca15276ea29de665cc945297cef54c3399bb4194c2fe9cf38cbe95f83807a0fea0a05fb2dfa99fdadc34834425e2a8f61e97
+EBUILD alsa-utils-1.0.27-r1.ebuild 2320 SHA256 a3205448ba488f945c5d7f81a1d114501ffa6574c49423779434aa3fc89f717b SHA512 db490154ff866afcdb31d87eb689770f42108714b3da38dcd6eb619580149cf7baf745b87d354b27e5b8be854fb7b4419f751d4d540a4a040c7f5394102f6a71 WHIRLPOOL 99b39dd9727022ff1e5244a1ce294460331f1889c2464d5128bdb04171564a56be6e3d9e7f1ea36cc37d908c451dae53ce8af30d0036f2ca3472f850502b757a
 EBUILD alsa-utils-1.0.27.ebuild 2202 SHA256 914789445358b384e93820e690a9633603c8885280080f935a8f29887f439bd7 SHA512 bcbe3bc5df353726b71907cb1c6640a64e2836dd0c6dc52af72579babad7e1955c6edd5ec4c6e6db862bc372ff636f8dc8ca3c83b11ecaf2170ae1225eaec818 WHIRLPOOL 8b35933c7b515ad813ed7fc4735c526323a1943e96871d3855d599d7dd1a4fbc99b83cd23a97f69d6b41988ab949b721e34adbaafa20ef988153f613494763dd
-MISC ChangeLog 53227 SHA256 19950e6a5d873eab009ce5b19578583de191996c6511fb9d65601310d95af47c SHA512 64534d18f7d94e07942c9079da1bfc41f89f71cf11546008bdc6b59de249cc3bfeb043b8e24421b5246e3013bf8e321664ebd67cab05c84580af277d1dda1411 WHIRLPOOL 9b7f403a5b71c05e30ff304aa28e6a792ae37c7a7d6959dcc8ab75bc47f34c065b0bd8d14f0fbf19e96432b3276b2ab1380ef873afb12d05296361bff5199751
+MISC ChangeLog 53639 SHA256 e9fc60784bd1af85592c59fce58de54e6c1cbf9dc5f5dcda691a0fd6fc06077d SHA512 0065ee9449495df9b65a7b6ff7e1e691499237d69d2285a7c36446438e4bf69547738f7d9c9d245fcaaebaf14bb42f61e28e52413ae5dafef40181dbfec41e2e WHIRLPOOL f60ac447f8eb0ef1f337587e09f98d3d1cb22bea62cc4f6001fe93e98841df40d789891c8e21487f0fd7d234ca5bc57a53994457a02b7f3285d3cd008e6d25ef
 MISC metadata.xml 519 SHA256 c95261699625faf6df725dc2c7468b8464cfb415125711f893ca27fa9f42631c SHA512 0abb84b0570ecc8eaa7cfc61fbc53dba85a7faeee77c3f5e7761ca53596bdcba24015fe51025b4cf1a0e9c7cdd2f56cb4ecfb2ffa5912c782ac6c0bfc14e2c05 WHIRLPOOL 44ad8f3192836559aebf278528b3315e5e85a02854a97893d3a3b910e3e4e1371254e2caaa2171bb0c304afc77e9cbb04c1f5dbde67f053c9c1b580932cf06ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgQctAAoJEEdUh39IaPFNiFYH/Ah91y8nu3mQMvlyrcSo29yM
-SqmMVVN0L0pzMITJwt/Iskyp6dqARjLuHBJFWtMtu4P6TLLfCUkLWkBfseCqu2e0
-kh1rMIDpRVV9m9dosz4ClaS+1ozgT4iGxRRF0x9sWE5tF+XrCCIkjEDvIspYzTWb
-67oDvraLi39ZD9+51XUR5UG4lWbR76p4QMuKG+92MgY4Kgbpo4hFZiMh4sy/fK3y
-8df7MRmzwN03L9zznSkv2jP/AosOFHz85nxkyraEBkdvZ2/50jsIZtRLug61zz1n
-7w2phYpedmNa2tgo6tW6VcCJ5UiO1nNZuJ57UIlFzBSFB0+aKOdIDhyXqrfk48I=
-=kRVX
+iQEcBAEBCAAGBQJRgT/cAAoJEEdUh39IaPFN4/wIAI9UaDnuWVOHxeZbSPslzffS
+hObA6KyMYNFmncQlzJZZo+lCDuGYgYfgUtD16DVHXIlaoOtAPQRsy48EcBi2jxPu
+ob5mWnWnnHBYkiIqi6I3Qy6FKrcsGTviLQ2qFhXEblzegNC+i3QBlwWnzSOLXBjI
+Gbwf4gypUkiyJf2hbB/TxWyMad7mniciZU8+OEQdG1leRJz/vr0sun8WUBBB9bHD
+eiFh/o4d01edAIdq1onu6FOCc6yJKeVBngDlxDtP6ePJ9cH4xnEeQ9nJ0gpGPaxe
+1y3pAoNpPVEFr7vc+h+23rJb1B4I4e5bdPNJ5Fj6jvHFS9NFf9bAmZDOx6ZlxqI=
+=mxB9
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.27-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.27-r1.ebuild
new file mode 100644
index 000000000000..64722dcfa8da
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.27-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.27-r1.ebuild,v 1.1 2013/05/01 16:18:18 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
+	mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
+	selinux? ( sec-policy/selinux-alsa )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.0.25-separate-usr-var-fs.patch \
+		"${FILESDIR}"/${P}-service.patch \
+		"${FILESDIR}"/${P}-arecord.patch \
+		"${FILESDIR}"/${P}-alsactl.patch
+}
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog README TODO seq/*/README.*
+
+	newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
+
+	newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch
new file mode 100644
index 000000000000..3b5a761db492
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-alsactl.patch
@@ -0,0 +1,27 @@
+http://bugs.gentoo.org/468160
+
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
+Subject: alsactl: Fix the string size for the lock file contents
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
+
+alsactl: Fix the string size for the lock file contents
+
+The string length is 10 characters + LF + '\0' = 12 characters.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+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)
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch
new file mode 100644
index 000000000000..f9edb2d21363
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-arecord.patch
@@ -0,0 +1,24 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
+Subject: arecord: add a missing break to the capture loop
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
+
+arecord: add a missing break to the capture loop
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 5bdc39c..000d25b 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
+ 			fd = -1;
+ 		}
+ 
++		if (in_aborting)
++			break;
++
+ 		/* repeat the loop when format is raw without timelimit or
+ 		 * requested counts of data are recorded
+ 		 */
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch
new file mode 100644
index 000000000000..dfe83e011ddc
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.27-service.patch
@@ -0,0 +1,12 @@
+http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=3616b1fe3ca603832b2f88abeb722cba2f0dde7e
+
+--- alsactl/alsa-restore.service.in
++++ alsactl/alsa-restore.service.in
+@@ -12,6 +12,6 @@
+ Conflicts=shutdown.target
+ 
+ [Service]
+-Type=oneshop
++Type=oneshot
+ ExecStart=-@sbindir@/alsactl restore
+ StandardOutput=syslog