From f3f3a6b41b93a6714f40d9e234a643da9eabb523 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 4 Jun 2005 16:07:11 +0000
Subject: * Apply build fixes by Stefan Seyfried * Bump version number

git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@123 2bf48fe7-cfc1-0310-909f-d9042e1e0fef
---
 configure.ac       |  6 +++---
 doc/README.html.in | 10 +++++++---
 src/ifplugd.c      |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c85efa0..3799413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.59)
-AC_INIT([ifplugd],[0.27],[mzvscyhtq (at) 0pointer (dot) de])
+AC_INIT([ifplugd],[0.28],[mzvscyhtq (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/ifplugd.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
@@ -42,10 +42,10 @@ AC_PROG_MAKE_SET
 
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
-   CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
+   CFLAGS="$CFLAGS -pipe -W -Wall"
 
    AC_LANG_CONFTEST([int main() {}])
-   $CC -c conftest.c -std=c99 -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter"
+   $CC -c conftest.c -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -Wno-unused-parameter"
    rm -f conftest.o
 fi
 
diff --git a/doc/README.html.in b/doc/README.html.in
index dc486dd..da1a6c1 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -42,6 +42,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
 
 <h2><a name="news">News</a></h2>
 
+<div class="news-date">Sat Jun 4 2005: </div> <p class="news-text"><a 
+href="@PACKAGE_URL@ifplugd-0.27.tar.gz">Version 0.28</a> released,
+changes include: build fixes from Stefan Seyfried.</p>
+
 <div class="news-date">Wed Mar 30 2005: </div> <p class="news-text"><a
 href="@PACKAGE_URL@ifplugd-0.27.tar.gz">Version 0.27</a> released,
 changes include: new option <tt>--no-startup</tt>.</p>
@@ -322,7 +326,7 @@ on their source codes for learning how to use the link beat ioctls.</p>
 <p>Oliver Kurth for packaging <tt>ifplugd</tt> for Debian and <tt>ifplugd</tt>'s
 manpage</p>
 
-<p>Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p>
+<p>Stefan Seyfried, Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p>
 
 <p>Frederic Lepied for integrating <tt>ifplugd</tt> into Mandrake Linux</p>
 
@@ -338,14 +342,14 @@ manpage</p>
 
 <p>You may find an up to date Debian package of <tt>ifplugd</tt> on the <a href="http://packages.debian.org/ifplugd">Debian package repository</a>.</p>
 
-<p>Packages for Mandrake Linux may be found in the Cooker distribution; Gentoo packages are available as well; <a href="http://packman.links2linux.de/">SuSE packages</a> are available courtesy of Herbert Graeber; <a href="http://www.linuxdicas.com.ar/caleb/rpm">Conectiva packages</a> are available courtesy of Gonzalo Nemmi.</p>
+<p><tt>ifplugd</tt> is nowadays included in many popular distributions (Mandrake, Gentoo, Suse, Debian, Ubuntu); <a href="http://www.linuxdicas.com.ar/caleb/rpm">Conectiva packages</a> are available courtesy of Gonzalo Nemmi. Fedora Core packages are available from <a href="http://dag.wieers.com/packages/ifplugd/">Dag Wieers</a>.</p>
 
 <p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/ifplugd/">Freshmeat</a>.</p>
 
 <p><b>New!</b> There is a joint <tt>ifplugd</tt> and <tt>waproamd</tt> <a href="https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss">mailing list</a> available.</p>
 
 <hr/>
-<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, March 2005</address>
+<address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, June 2005</address>
 <div class="grey"><i>$Id$</i></div>
 
 </body>
diff --git a/src/ifplugd.c b/src/ifplugd.c
index e1df19c..ddbb024 100644
--- a/src/ifplugd.c
+++ b/src/ifplugd.c
@@ -173,7 +173,8 @@ int action(interface_status_t status) {
 
     FD_ZERO(&rfds);
     FD_SET(_pipe[0], &rfds);
-    FD_SET(sigfd = daemon_signal_fd(), &rfds);    
+    sigfd = daemon_signal_fd();
+    FD_SET(sigfd, &rfds);    
 
     n = 0;
 
@@ -452,7 +453,8 @@ void work(void) {
     }
 
     FD_ZERO(&fds);
-    FD_SET(sigfd = daemon_signal_fd(), &fds);
+    sigfd = daemon_signal_fd();
+    FD_SET(sigfd, &fds);
 
     if (use_ifmonitor)
         FD_SET(nlapi_fd, &fds);
-- 
cgit