Apply patches for dgit.debian/0.28-19.2

6 files changed, 183 insertions, 260 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
new file mode 100644
index 0000000..b953ccb
--- /dev/null
+++ b/doc/ChangeLog
@@ -0,0 +1,116 @@
+   Sat Jun 4 2005:
+
+   [10]Version 0.28 released, changes include: build fixes from Stefan
+   Seyfried.
+
+   Wed Mar 30 2005:
+
+   [11]Version 0.27 released, changes include: new option --no-startup.
+
+   Sun Dec 19 2004:
+
+   [12]Version 0.26 released, changes include: changed MII code for
+   better compatibility with some 3COM Boomerang cards.
+
+   Mon May 10 2004:
+
+   [13]Version 0.25 released, changes include: Revert to more classic
+   link checking support. The new checking order is: ETHTOOL, MII, WLAN,
+   IFF. The obsolete API "PRIV" is no longer checked by the automatic API
+   detection code. However, you may enable it forcibly by passing -m priv
+   on the command line.
+
+   Mon Apr 12 2004:
+
+   [14]Version 0.24 released, changes include: add IFF_RUNNING link check
+   support and make it the default. This might break some setups. You may
+   workaround this by passing -m to the daemon for selecting a different
+   API. Please report breakages!
+
+   Wed Apr 7 2004:
+
+   [15]Version 0.23 released, changes include: don't make /dev/tty1 the
+   controlling TTY when beeping
+
+   Tue Feb 10 2004:
+
+   [16]Version 0.22 released, changes include: rename ifstatus to
+   ifplugstatus due to namespace collision, minor fixes
+
+   Mon Jan 26 2004:
+
+   [17]Version 0.21b released, added missing file.
+
+   Mon Jan 26 2004:
+
+   [18]Version 0.21 released, changes include: better compatibility with
+   wireless devices, compatibility with newer kernels
+
+   Sun Nov 9 2003:
+
+   [19]Version 0.20 released, changes include: fix wrong message, build
+   fix
+
+   Mon Oct 20 2003:
+
+   [20]Version 0.19 released, changes include: New option
+   --wait-for-kill, this requires [21]libdaemon 0.3
+
+   Fri Oct 17 2003:
+
+   [22]Version 0.18 released, changes include: Some bugs fixed
+
+   Fri Sep 13 2003:
+
+   [23]Version 0.17b released, changes include: typo and date fix
+
+   Fri Sep 13 2003:
+
+   [24]Version 0.17 released, changes include: documentation update,
+   better support for multiple interfaces, gcc 2.95 build fix
+
+   Thu Aug 13 2003:
+
+   [25]Version 0.16 released, changes include: RPM spec file added, build
+   fixes, WLAN improvements (including compatibility with the upcoming
+   waproamd, a WLAN roaming daemon), monitor mode for use in conjunction
+   with PCMCIA devices, better support for multiple interface setups,
+   SUPPORTED_DRIVERS returns
+
+   Thu July 10 2003:
+
+   [26]Version 0.15 released, changes include: bad umask fix,
+   documentation update
+
+   Mon July 7 2003:
+
+   [27]Version 0.14 released, changes include: autoconf usage, new
+   dependency [28]libdaemon, wireless LAN support, support for
+   suspending/resuming, many fixes
+
+    Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
+
+   $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
+
+References
+
+   9. README#download
+  10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
+  11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
+  12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz
+  13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz
+  14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz
+  15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz
+  16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz
+  17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz
+  18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz
+  19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz
+  20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz
+  21. http://0pointer.de/lennart/projects/libdaemon/
+  22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz
+  23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz
+  24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz
+  25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz
+  26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz
+  27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz
+  28. http://0pointer.de/lennart/projects/libdaemon/
diff --git a/doc/FAQ b/doc/FAQ
new file mode 100644
index 0000000..96bf250
--- /dev/null
+++ b/doc/FAQ
@@ -0,0 +1,63 @@
+
+  FAQ
+
+    1. Q: I want to use ifplugd with my PCMCIA device, but ifplugd quits
+       when it doesn't find eth0, when I have not inserted the card. What
+       can I do?
+       A: Use the -f switch. This is not very clean however, since
+       modprobe is called on each cable detection query of ifplugd to
+       load a module for the network device. This is suboptimal. You
+       should probably run ifplugd only when the card is really inserted.
+    2. Q: I am using the -f switch, but the kernel logs are getting
+       filled with messages like "modprobe: modprobe: Can't locate module
+       eth0". What can I do?
+       A: Make sure you have a line like alias eth0 off in your
+       /etc/modules.conf
+    3. Q: When the cable is unplugged and the interface shut down it is
+       still available with ifconfig and markes as UP. Why this?
+       A: ifplugd cannot detect the link beat with a shut down interface
+       on certain (most as of kernel 2.4.19) network drivers. Thus
+       ifplugd enables the interface before querying the link status.
+       This may be switched off with -a flag. You might want to use it if
+       you have a sane network driver (e.g. eepro100). The subdirectory
+       patches/ in the ifplugd distribution includes a patch for the
+       8139too 0.9.26 driver, which makes the driver compatible with -a.
+       Don't ask me how to apply this patch. If you don't know, you won't
+       need it.
+    4. Q: Does it work with anything else than plain ethernet or wireless
+       LAN?
+       A: Certainly not, since the MII and ETHTOOL ioctl()s and the
+       wireless extension don't exist on other network device types.
+    5. Q: I have a Realtek 8139 based network card. Everytime ifplugd
+       starts on bootup my machine freezes. What can I do?
+       A: This is a bug in the 8139too driver 0.9.25 (at least) shipped
+       with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20
+       or seperately at
+       [33]http://www.sourceforge.net/projects/gkernel/).
+    6. Q: There are already laptop-net's ifd and miid, why did you write
+       your own daemon?
+       A: laptop-net was too integrated with its profile system and
+       didn't work on my hardware when I had a look on it. It seemed
+       easier to me to write a simple but feature complete replacement
+       than using laptop-net without most of the special features
+       disabled. I didn't know about miid when I wrote ifplugd, but in
+       any case ifplugd is much better than miid. For a comparison of
+       miid and ifplugd, have a look on
+       [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat
+       merged=yes
+    7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both
+       controlled by ifplugd, and want to force the network traffic to go
+       over the faster one of them, in case both are available at the
+       same time. How can I do this?
+       A: A tool I wrote called [35]ifmetric might be exactly what you're
+       looking for.
+
+    Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
+
+   $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
+
+References
+
+  33. http://www.sourceforge.net/projects/gkernel/
+  34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes
+  35. http://0pointer.de/lennart/projects/ifmetric/
diff --git a/doc/NEWS b/doc/NEWS
index f52dd1f..a7e046f 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1,5 +1,5 @@
 
-[[[ newer changes are recorded in the README file only ]]]
+[[[ newer changes are recorded in the ChangeLog file only ]]]
 
 
 0.20 :: 9 Nov 2003 :: SVN 71
diff --git a/doc/README b/doc/README
index 9a143dd..7507439 100644
--- a/doc/README
+++ b/doc/README
@@ -1,126 +1,4 @@
-
                                  ifplugd 0.28
-
-   Copyright 2002-2005 Lennart Poettering <mzvscyhtq (at) 0pointer (dot)
-   de>
-     * [1]License
-     * [2]News
-     * [3]Overview
-     * [4]Current Status
-     * [5]Documentation
-     * [6]Requirements
-     * [7]Installation
-     * [8]Acknowledgements
-     * [9]Download
-
-License
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-News
-
-   Sat Jun 4 2005:
-
-   [10]Version 0.28 released, changes include: build fixes from Stefan
-   Seyfried.
-
-   Wed Mar 30 2005:
-
-   [11]Version 0.27 released, changes include: new option --no-startup.
-
-   Sun Dec 19 2004:
-
-   [12]Version 0.26 released, changes include: changed MII code for
-   better compatibility with some 3COM Boomerang cards.
-
-   Mon May 10 2004:
-
-   [13]Version 0.25 released, changes include: Revert to more classic
-   link checking support. The new checking order is: ETHTOOL, MII, WLAN,
-   IFF. The obsolete API "PRIV" is no longer checked by the automatic API
-   detection code. However, you may enable it forcibly by passing -m priv
-   on the command line.
-
-   Mon Apr 12 2004:
-
-   [14]Version 0.24 released, changes include: add IFF_RUNNING link check
-   support and make it the default. This might break some setups. You may
-   workaround this by passing -m to the daemon for selecting a different
-   API. Please report breakages!
-
-   Wed Apr 7 2004:
-
-   [15]Version 0.23 released, changes include: don't make /dev/tty1 the
-   controlling TTY when beeping
-
-   Tue Feb 10 2004:
-
-   [16]Version 0.22 released, changes include: rename ifstatus to
-   ifplugstatus due to namespace collision, minor fixes
-
-   Mon Jan 26 2004:
-
-   [17]Version 0.21b released, added missing file.
-
-   Mon Jan 26 2004:
-
-   [18]Version 0.21 released, changes include: better compatibility with
-   wireless devices, compatibility with newer kernels
-
-   Sun Nov 9 2003:
-
-   [19]Version 0.20 released, changes include: fix wrong message, build
-   fix
-
-   Mon Oct 20 2003:
-
-   [20]Version 0.19 released, changes include: New option
-   --wait-for-kill, this requires [21]libdaemon 0.3
-
-   Fri Oct 17 2003:
-
-   [22]Version 0.18 released, changes include: Some bugs fixed
-
-   Fri Sep 13 2003:
-
-   [23]Version 0.17b released, changes include: typo and date fix
-
-   Fri Sep 13 2003:
-
-   [24]Version 0.17 released, changes include: documentation update,
-   better support for multiple interfaces, gcc 2.95 build fix
-
-   Thu Aug 13 2003:
-
-   [25]Version 0.16 released, changes include: RPM spec file added, build
-   fixes, WLAN improvements (including compatibility with the upcoming
-   waproamd, a WLAN roaming daemon), monitor mode for use in conjunction
-   with PCMCIA devices, better support for multiple interface setups,
-   SUPPORTED_DRIVERS returns
-
-   Thu July 10 2003:
-
-   [26]Version 0.15 released, changes include: bad umask fix,
-   documentation update
-
-   Mon July 7 2003:
-
-   [27]Version 0.14 released, changes include: autoconf usage, new
-   dependency [28]libdaemon, wireless LAN support, support for
-   suspending/resuming, many fixes
-
 Overview
 
    ifplugd is a Linux daemon which will automatically configure your
@@ -186,7 +64,7 @@ Documentation
 
    When you are using the hotplug subsystem (Debian package hotplug) you
    may notice that the network device is configured even when it is not
-   listed on an auto line in /etc/network/interface. This may be due to
+   listed on an auto line in /etc/network/interfaces. This may be due to
    hotplug being configured to ifup the network interface when it becomes
    available. This was the default behavior in the Debian hotplug package
    prior to release 0.0.20030117-1, for example. To prevent this you
@@ -212,59 +90,6 @@ Documentation
    software for the Linux distributions to add such scripts to their
    packages.
 
-  FAQ
-
-    1. Q: I want to use ifplugd with my PCMCIA device, but ifplugd quits
-       when it doesn't find eth0, when I have not inserted the card. What
-       can I do?
-       A: Use the -f switch. This is not very clean however, since
-       modprobe is called on each cable detection query of ifplugd to
-       load a module for the network device. This is suboptimal. You
-       should probably run ifplugd only when the card is really inserted.
-    2. Q: I am using the -f switch, but the kernel logs are getting
-       filled with messages like "modprobe: modprobe: Can't locate module
-       eth0". What can I do?
-       A: Make sure you have a line like alias eth0 off in your
-       /etc/modules.conf
-    3. Q: When the cable is unplugged and the interface shut down it is
-       still available with ifconfig and markes as UP. Why this?
-       A: ifplugd cannot detect the link beat with a shut down interface
-       on certain (most as of kernel 2.4.19) network drivers. Thus
-       ifplugd enables the interface before querying the link status.
-       This may be switched off with -a flag. You might want to use it if
-       you have a sane network driver (e.g. eepro100). The subdirectory
-       patches/ in the ifplugd distribution includes a patch for the
-       8139too 0.9.26 driver, which makes the driver compatible with -a.
-       Don't ask me how to apply this patch. If you don't know, you won't
-       need it.
-    4. Q: Does it work with anything else than plain ethernet or wireless
-       LAN?
-       A: Certainly not, since the MII and ETHTOOL ioctl()s and the
-       wireless extension don't exist on other network device types.
-    5. Q: I have a Realtek 8139 based network card. Everytime ifplugd
-       starts on bootup my machine freezes. What can I do?
-       A: This is a bug in the 8139too driver 0.9.25 (at least) shipped
-       with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20
-       or seperately at
-       [33]http://www.sourceforge.net/projects/gkernel/).
-    6. Q: There are already laptop-net's ifd and miid, why did you write
-       your own daemon?
-       A: laptop-net was too integrated with its profile system and
-       didn't work on my hardware when I had a look on it. It seemed
-       easier to me to write a simple but feature complete replacement
-       than using laptop-net without most of the special features
-       disabled. I didn't know about miid when I wrote ifplugd, but in
-       any case ifplugd is much better than miid. For a comparison of
-       miid and ifplugd, have a look on
-       [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat
-       merged=yes
-    7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both
-       controlled by ifplugd, and want to force the network traffic to go
-       over the faster one of them, in case both are available at the
-       same time. How can I do this?
-       A: A tool I wrote called [35]ifmetric might be exactly what you're
-       looking for.
-
 Requirements
 
    A newer Linux Kernel (I think 2.2 is good enough, alltough I tested it
@@ -282,20 +107,6 @@ Requirements
 
    ifplugd needs [36]libdaemon.
 
-Installation
-
-   As this package is made with the GNU autotools you should run
-   ./configure inside the distribution directory for configuring the
-   source tree. After that you should run make for compilation and make
-   install (as root) for installation of ifplugd.
-
-   The installation scripts create an init script in
-   ${sysconfdir}/init.d/ifplugd, however no /etc/rc?.d/ links are created
-   for it.
-
-   Extensive installation instructions for installation of ifplugd on
-   Fedora Core 1 are available at [37]Geoff Ericksson's web site.
-
 Acknowledgements
 
    For the developers of mii-diag, ethtool and laptop-net, since I looked
@@ -309,82 +120,15 @@ Acknowledgements
 
    Frederic Lepied for integrating ifplugd into Mandrake Linux
 
-Download
-
-   The newest release is always available from
-   [38]http://0pointer.de/lennart/projects/ifplugd/
-
-   The current release is [39]0.28
-
-   Get ifplugd's development sources from the [40]Subversion
-   [41]repository ([42]viewcvs):
-svn checkout svn://seth.intheinter.net/ifplugd/trunk ifplugd
-
-   You may find an up to date Debian package of ifplugd on the [43]Debian
-   package repository.
-
-   ifplugd is nowadays included in many popular distributions (Mandrake,
-   Gentoo, Suse, Debian, Ubuntu); [44]Conectiva packages are available
-   courtesy of Gonzalo Nemmi. Fedora Core packages are available from
-   [45]Dag Wieers.
-
-   If you want to be notified whenever I release a new version of this
-   software use the subscription feature of [46]Freshmeat.
-
-   New! There is a joint ifplugd and waproamd [47]mailing list available.
-     _________________________________________________________________
-
-
     Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
 
    $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
 
 References
 
-   1. README#license
-   2. README#news
-   3. README#overview
-   4. README#status
-   5. README#documentation
-   6. README#requirements
-   7. README#installation
-   8. README#acks
-   9. README#download
-  10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
-  11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
-  12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz
-  13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz
-  14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz
-  15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz
-  16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz
-  17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz
-  18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz
-  19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz
-  20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz
-  21. http://0pointer.de/lennart/projects/libdaemon/
-  22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz
-  23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz
-  24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz
-  25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz
-  26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz
-  27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz
   28. http://0pointer.de/lennart/projects/libdaemon/
   29. http://0pointer.de/lennart/projects/waproamd/
   30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml
   31. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml
   32. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml
   33. http://www.sourceforge.net/projects/gkernel/
-  34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes
-  35. http://0pointer.de/lennart/projects/ifmetric/
-  36. http://0pointer.de/lennart/projects/libdaemon/
-  37. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html
-  38. http://0pointer.de/lennart/projects/ifplugd/
-  39. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz
-  40. http://subversion.tigris.org/
-  41. svn://seth.intheinter.net/ifplugd
-  42. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd
-  43. http://packages.debian.org/ifplugd
-  44. http://www.linuxdicas.com.ar/caleb/rpm
-  45. http://dag.wieers.com/packages/ifplugd/
-  46. http://freshmeat.net/projects/ifplugd/
-  47. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss
diff --git a/doc/README.html b/doc/README.html
index 3160855..abcd0b7 100644
--- a/doc/README.html
+++ b/doc/README.html
@@ -188,7 +188,7 @@ an "auto" stanza in <tt>/etc/network/interfaces</tt>.</p>
 <p>When you are using the hotplug subsystem (Debian package
 <tt>hotplug</tt>) you may notice that the network device is configured
 even when it is not listed on an <tt>auto</tt> line in
-<tt>/etc/network/interface</tt>. This may be due to <tt>hotplug</tt>
+<tt>/etc/network/interfaces</tt>. This may be due to <tt>hotplug</tt>
 being configured to <tt>ifup</tt> the network interface when it
 becomes available.  This was the default behavior in the Debian
 <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for
diff --git a/doc/README.html.in b/doc/README.html.in
index baf63e0..3d8131a 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -188,7 +188,7 @@ an "auto" stanza in <tt>/etc/network/interfaces</tt>.</p>
 <p>When you are using the hotplug subsystem (Debian package
 <tt>hotplug</tt>) you may notice that the network device is configured
 even when it is not listed on an <tt>auto</tt> line in
-<tt>/etc/network/interface</tt>. This may be due to <tt>hotplug</tt>
+<tt>/etc/network/interfaces</tt>. This may be due to <tt>hotplug</tt>
 being configured to <tt>ifup</tt> the network interface when it
 becomes available.  This was the default behavior in the Debian
 <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for