Imported Debian patch 0.28-15

6 files changed, 61 insertions, 7 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5770e53
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+Please read the README.source provided with the documentation of the
+dpatch package
diff --git a/debian/changelog b/debian/changelog
index 04c0b8e..0dce3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ifplugd (0.28-15) unstable; urgency=low
+
+  * Add README.source to be compliant with policy 3.8.0
+  * Update Maintainer to official Debian ID
+  * Remove DM-Upload-Allowed: yes
+  * Add ${misc:Depends} to Depends: instead of explicit debconf
+    dependency.  Fixes lintian W: debhelper-but-no-misc-depends
+  * waproamd is to be removed from the archive, don't suggest it anymore
+    (Closes: #509393)
+  * Patch 06_509015_better_delays: with -u0/-d0, don't wait for an extra
+    polling cycle.  Shorten polling delay when an action is scheduled to
+    happen before the delay expires.  Thanks Michel Lespinasse
+    <walken@zoy.org> (Closes: #509015)
+  * Update Standards-Version to 3.8.1 (no changes required)
+
+ -- Y Giridhar Appaji Nag <appaji@debian.org>  Tue, 24 Mar 2009 12:37:01 +0530
+
 ifplugd (0.28-14) unstable; urgency=low
 
   * Thanks to Kel Modderman <kel@otaku42.de> for all the patches.
diff --git a/debian/control b/debian/control
index f7b38a4..835edc1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,18 @@
 Source: ifplugd
 Section: net
 Priority: optional
-Maintainer: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Maintainer: Y Giridhar Appaji Nag <appaji@debian.org>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdaemon-dev (>= 0.7), pkg-config, po-debconf
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://0pointer.de/lennart/projects/ifplugd/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/ifplugd/unstable
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/ifplugd/unstable/?op=log
-DM-Upload-Allowed: yes
 
 Package: ifplugd
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
 Recommends: ifupdown (>= 0.6.4-4.2)
-Suggests: wpasupplicant, waproamd
+Suggests: wpasupplicant
 Description: configuration daemon for ethernet devices
  ifplugd is a daemon which will automatically configure your ethernet device
  when a cable is plugged in and automatically de-configure it if the cable is
diff --git a/debian/ifplugd.init b/debian/ifplugd.init
index ba9c955..cc36ae0 100644
--- a/debian/ifplugd.init
+++ b/debian/ifplugd.init
@@ -28,9 +28,10 @@
 #                    the cable is removed / inserted
 ### END INIT INFO
 
-CFG=/etc/default/ifplugd
+DAEMON_NAME=ifplugd
+CFG=/etc/default/$DAEMON_NAME
 DESC="Network Interface Plugging Daemon"
-IFPLUGD=/usr/sbin/ifplugd
+IFPLUGD=/usr/sbin/$DAEMON_NAME
 test -x $IFPLUGD || exit 0
 
 if [ `id -u` != "0" ] && [ "$1" = "start" -o "$1" = "stop" ] ; then
diff --git a/debian/patches/00list b/debian/patches/00list
index 8265bd5..fc7fea4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@
 03_split_README_ChangeLog_FAQ
 04_up_down_beep_options
 05_396895_HOTPLUG_conf_man
+06_509015_better_delays
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)