diff options
Diffstat (limited to 'debian/patches/06_509015_better_delays.dpatch')
-rw-r--r-- | debian/patches/06_509015_better_delays.dpatch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/06_509015_better_delays.dpatch b/debian/patches/06_509015_better_delays.dpatch new file mode 100644 index 0000000..64ddb6e --- /dev/null +++ b/debian/patches/06_509015_better_delays.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_509015_better_delays.dpatch by Michel Lespinasse <walken@zoy.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't wait for more than specified delays, fix for #509015 + +@DPATCH@ +diff -urNad ifplugd-0.28~/src/ifplugd.c ifplugd-0.28/src/ifplugd.c +--- ifplugd-0.28~/src/ifplugd.c 2008-09-30 17:48:51.000000000 +0530 ++++ ifplugd-0.28/src/ifplugd.c 2009-03-02 12:05:11.000000000 +0530 +@@ -468,6 +468,14 @@ + tv.tv_sec = polltime; + tv.tv_usec = 0; + ++ if (t) { ++ int delay = t - time(NULL); ++ if (delay < 0) ++ tv.tv_sec = 0; ++ else if (delay < tv.tv_sec) ++ tv.tv_sec = delay; ++ } ++ + if (select(FD_SETSIZE, &qfds, NULL, NULL, &tv) < 0) { + if (errno == EINTR) + continue; +@@ -573,7 +581,7 @@ + } + } + +- if (t && t < time(NULL)) { ++ if (t && t <= time(NULL)) { + t = 0; + + if (action(status) < 0) |