diff options
Diffstat (limited to 'extra/alsa-utils')
| -rw-r--r-- | extra/alsa-utils/PKGBUILD | 28 | ||||
| -rw-r--r-- | extra/alsa-utils/alsa-restore-1.0.27.service.patch | 10 | ||||
| -rw-r--r-- | extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch | 25 |
3 files changed, 51 insertions, 12 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 5fd8b4e61..e63024bb2 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $ +# $Id: PKGBUILD 182805 2013-04-15 13:03:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.26 -pkgrel=1 +pkgver=1.0.27 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -13,11 +13,17 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - alsa - alsa.conf.d - 90alsa) + 90alsa + alsa-restore-1.0.27.service.patch + alsactl-fix-buffer-overflow-1.0.27.patch) backup=(etc/conf.d/alsa) +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch + patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-alsaconf \ @@ -29,14 +35,12 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa - install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('4dcf1017fafc91603af96705c073eca9' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') +md5sums=('cbfb21a24f63fb052b3392195639ce48' + '529216f6a46e61a546640e08ea7a0879' + '0a27f7b80351d6baa274c32d859bf037' + 'cd577445636542f9f60b420e4ffe3f0f') diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch new file mode 100644 index 000000000..b3a9d48fd --- /dev/null +++ b/extra/alsa-utils/alsa-restore-1.0.27.service.patch @@ -0,0 +1,10 @@ +--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 ++++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 +@@ -12,6 +12,6 @@ + Conflicts=shutdown.target + + [Service] +-Type=oneshop ++Type=oneshot + ExecStart=-@sbindir@/alsactl restore + StandardOutput=syslog diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch new file mode 100644 index 000000000..d4b526614 --- /dev/null +++ b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch @@ -0,0 +1,25 @@ +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) |