diff options
| author | wiz <wiz@pkgsrc.org> | 2014-04-24 09:40:08 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-04-24 09:40:08 +0000 |
| commit | 2341be4dd9d61a18aee33715a55396129c154827 (patch) | |
| tree | 0648fe87a2acda2205982a4c2ebe2a0b47e31938 /sysutils | |
| parent | 982e1b0fd76e598e86beaccb676e973fe1233298 (diff) | |
| download | pkgsrc-2341be4dd9d61a18aee33715a55396129c154827.tar.gz | |
Fix poll() wrapper: all negative timeouts are acceptable as infinity on Linux,
but on *BSD, only -1 means infinite.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dbus/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/dbus/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index 3526181a74c..ae1c0f2eb82 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2014/04/03 09:09:06 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2014/04/24 09:40:08 wiz Exp $ DISTNAME= dbus-1.8.0 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo index d3178a96103..e8e09e17179 100644 --- a/sysutils/dbus/distinfo +++ b/sysutils/dbus/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2014/04/03 09:10:44 wiz Exp $ +$NetBSD: distinfo,v 1.50 2014/04/24 09:40:08 wiz Exp $ SHA1 (dbus-1.8.0.tar.gz) = d14ab33e92e29fa732cdff69214913832181e737 RMD160 (dbus-1.8.0.tar.gz) = f0a4e143d7bd9d97cee1e0e59140e17eee92c132 @@ -8,3 +8,4 @@ SHA1 (patch-ak) = 6d05ebde29acb3f6cb6f577dd2f2b734f590e8dd SHA1 (patch-al) = 57d08196e9daf49eb6bda2b30f019ce2cad77c6f SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8 SHA1 (patch-ba) = f9126faf18cd19e897865748ebea1011fe516225 +SHA1 (patch-dbus_dbus-sysdeps-unix.c) = c4c22674285b0b37a476fe5d8f508feec918dc03 diff --git a/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c new file mode 100644 index 00000000000..d6efeaf3877 --- /dev/null +++ b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c @@ -0,0 +1,18 @@ +$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.1 2014/04/24 09:40:08 wiz Exp $ + +On Linux, poll accepts any negative value as infinity. +On at least FreeBSD and NetBSD, only -1 is acceptable. + +--- dbus/dbus-sysdeps-unix.c.orig 2014-01-17 16:59:48.000000000 +0000 ++++ dbus/dbus-sysdeps-unix.c +@@ -2555,6 +2555,10 @@ _dbus_poll (DBusPollFD *fds, + _DBUS_STRUCT_OFFSET (DBusPollFD, revents) == + _DBUS_STRUCT_OFFSET (struct pollfd, revents)) + { ++ if (timeout_milliseconds < -1) ++ { ++ timeout_milliseconds = -1; ++ } + return poll ((struct pollfd*) fds, + n_fds, + timeout_milliseconds); |