summaryrefslogtreecommitdiff
path: root/audio/mserv
diff options
context:
space:
mode:
authorabs <abs>2003-04-17 15:09:18 +0000
committerabs <abs>2003-04-17 15:09:18 +0000
commit99a083062bb4a989b7b10a9ab964ce814d1d6dc6 (patch)
tree48289fc5c3a269564c8c9a0756e45588e2a4754b /audio/mserv
parent0cafe90933cf2d4c6f5f86471380a17264d62dbd (diff)
downloadpkgsrc-99a083062bb4a989b7b10a9ab964ce814d1d6dc6.tar.gz
Update mserv to 0.33nb6:
Avoid leaking a filedescriptor when checking volume level
Diffstat (limited to 'audio/mserv')
-rw-r--r--audio/mserv/Makefile4
-rw-r--r--audio/mserv/distinfo4
-rw-r--r--audio/mserv/patches/patch-ak16
3 files changed, 18 insertions, 6 deletions
diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile
index 6320adf7568..a994c8ccbfb 100644
--- a/audio/mserv/Makefile
+++ b/audio/mserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/10/03 15:46:55 abs Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/17 15:09:18 abs Exp $
#
DISTNAME= mserv-0.33
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://www.mserv.org/download/
diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo
index 47e1bae0b42..9ebbd8412e9 100644
--- a/audio/mserv/distinfo
+++ b/audio/mserv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/10/03 15:46:55 abs Exp $
+$NetBSD: distinfo,v 1.7 2003/04/17 15:09:19 abs Exp $
SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785
Size (mserv-0.33.tar.gz) = 136456 bytes
@@ -12,6 +12,6 @@ SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc
SHA1 (patch-ah) = ca0dc3be3c02f82d033cab93aaa454d6918d45de
SHA1 (patch-ai) = 62709c796913aae2e5866a94b22f929189b57d9a
SHA1 (patch-aj) = 6638a7d9422332aaf9b435337c316cc882f51e9e
-SHA1 (patch-ak) = f83430d69e2a87d045a7d42642053744cc33c8e1
+SHA1 (patch-ak) = 73efa5d417a99fbeda36a6de80912631af9f4423
SHA1 (patch-al) = eed5668942fdc801685aeda8aa2c31ec24d03729
SHA1 (patch-am) = 91080a55922bbd46a4ba55dc4641dfa0171a553e
diff --git a/audio/mserv/patches/patch-ak b/audio/mserv/patches/patch-ak
index 5db691ee103..c449b0f5195 100644
--- a/audio/mserv/patches/patch-ak
+++ b/audio/mserv/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2002/10/03 15:46:58 abs Exp $
+$NetBSD: patch-ak,v 1.3 2003/04/17 15:09:19 abs Exp $
--- mserv/mserv.c.orig Sat Jul 15 18:01:15 2000
+++ mserv/mserv.c
@@ -22,7 +22,19 @@ $NetBSD: patch-ak,v 1.2 2002/10/03 15:46:58 abs Exp $
mserv_strtoprintable(author);
mserv_strtoprintable(name);
mserv_strtoprintable(genres);
-@@ -3370,7 +3370,13 @@ int mserv_setmixer(t_client *cl, int wha
+@@ -3328,8 +3328,10 @@ int mserv_setmixer(t_client *cl, int wha
+ return -1;
+ }
+ curval = curval & 0xff;
+- if (!*line)
++ if (!*line) {
++ close(mixer_fd);
+ return curval;
++ }
+ if (*line == '+' || *line == '-') {
+ type = *line == '+' ? 1 : -1;
+ param = 1;
+@@ -3370,7 +3372,13 @@ int mserv_setmixer(t_client *cl, int wha
mserv_response(cl, "IOCTLWR", NULL);
return -1;
}