From fe31c031596b34d452632fa1f0138306f5d68cd5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 17 Apr 2013 19:23:30 +0000 Subject: main/alsa-utils: fix stacksmash error and remove .swp fixes #1787 --- main/alsa-utils/.APKBUILD.swp | Bin 4096 -> 0 bytes main/alsa-utils/APKBUILD | 6 +++++- main/alsa-utils/alsactl.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) delete mode 100644 main/alsa-utils/.APKBUILD.swp create mode 100644 main/alsa-utils/alsactl.patch (limited to 'main/alsa-utils') diff --git a/main/alsa-utils/.APKBUILD.swp b/main/alsa-utils/.APKBUILD.swp deleted file mode 100644 index 336dad161..000000000 Binary files a/main/alsa-utils/.APKBUILD.swp and /dev/null differ diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD index 62344a7eb..91f4e1fe9 100644 --- a/main/alsa-utils/APKBUILD +++ b/main/alsa-utils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=alsa-utils pkgver=1.0.27 -pkgrel=0 +pkgrel=1 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" url="http://www.alsa-project.org" arch="all" @@ -12,6 +12,7 @@ depends="dialog" subpackages="$pkgname-doc alsaconf" source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 alsaconf.patch + alsactl.patch alsa.initd alsa.confd " @@ -53,13 +54,16 @@ alsaconf() { md5sums="cbfb21a24f63fb052b3392195639ce48 alsa-utils-1.0.27.tar.bz2 5e65f278b5a77e3ee2821ad955c4cd91 alsaconf.patch +9f00f1cdcd117170fabce5674e98a708 alsactl.patch b1b7eca57f5ddf64db5527193d62f268 alsa.initd 85b1f1e759fe5953eca329237f4ac256 alsa.confd" sha256sums="6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef alsa-utils-1.0.27.tar.bz2 b99468473fe20de4fac3aeae833612837ff1cb576e68674463fe1efd0aed6d19 alsaconf.patch +c69b9cc98346a3d9fceaf0436ad19ec9be311be42081056cf8907be7ed9488d6 alsactl.patch 765cda11c23003f81ae61d30a5db78d10f4de1dd2ba273a46715b0fc292d4391 alsa.initd e5d26a6ea993540ca2d67aee4b40f1351b13f2c8023d53cb67c22cb3707e72de alsa.confd" sha512sums="1bcfcce0cee2c9e72458525f8424abab4a0be93bceda0a90f0113be315ff0f1d956309b535bfd0cc9ce70f031718718301e8dc91f2d16cd91b34ebeb95693625 alsa-utils-1.0.27.tar.bz2 bc9f1297574fe4d5bd9baa3f299d68684182f1e6eeb51c862cd6236563516f57a160a00d6607540830aebbb8c4352faf416a981edc878e8a256cbbcc95648614 alsaconf.patch +253422929a914a7569e1e1f59b7b3cd664f4ca9aee12fbb1cad74ff4628538b886d3336959415e0b82263300b3df944fff51ea248171d6553d1a3fa12395494a alsactl.patch 4b6da76ae190679f39056303f2fb67d6f9ea344a350d381abfaf1abc52e6ec373554326655da79ffc5f2eda2437ffd79ed6d0f10d9737d16b1bcd064430e8ca0 alsa.initd a2ae4d3f7e7bbd799d69ede7e1f052147ebbf2763d8ef6c061832208e330aebe72b112cd36f227645b4543c5388a45db8c0a534a9ec4b6351cfad6584ad6922c alsa.confd" diff --git a/main/alsa-utils/alsactl.patch b/main/alsa-utils/alsactl.patch new file mode 100644 index 000000000..159d9b434 --- /dev/null +++ b/main/alsa-utils/alsactl.patch @@ -0,0 +1,28 @@ +From 95788fea25c1a59985828d4b91af0772d077600b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 15 Apr 2013 14:44:13 +0200 +Subject: [PATCH 1/1] 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 +--- + alsactl/lock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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) +-- +1.7.11.4 + -- cgit v1.2.3