diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-01-11 00:03:41 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-01-11 00:03:41 +0000 |
commit | fc30beccf2d2e8cd1174cdcae30da435c75f5a31 (patch) | |
tree | 160c6b2921ee3c2de9da8af3fa3295cab4a142de | |
parent | 4d8390a9506c2b9d862cc7261f040dbd9113a6ef (diff) |
many changes
git-svn-id: file:///home/lennart/svn/public/aeswepd/trunk@39 022f378f-78c4-0310-b860-d162c87e6274
-rw-r--r-- | Makefile.am | 5 | ||||
-rwxr-xr-x | bootstrap.sh | 2 | ||||
-rw-r--r-- | configure.ac | 22 | ||||
-rw-r--r-- | doc/README.html.in | 6 | ||||
-rw-r--r-- | doc/style.css | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/aeswepd.c | 13 | ||||
-rw-r--r-- | src/keyapi.c | 4 | ||||
-rw-r--r-- | src/wireless.h | 1 |
9 files changed, 35 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index b45c91a..a76516e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,8 @@ homepage: cp *.tar.gz $$HOME/homepage/lennart/projects/aeswepd cp man/aeswepd.8.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/style.css doc/README.html $$HOME/homepage/lennart/projects/aeswepd cp $$HOME/homepage/lennart/projects/aeswepd/README.html $$HOME/homepage/lennart/projects/aeswepd/index.html + +distcleancheck: + @: + +.PHONY: homepage distcleancheck diff --git a/bootstrap.sh b/bootstrap.sh index e3d11d2..f47bb8e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # $Id$ # This file is part of aeswepd. diff --git a/configure.ac b/configure.ac index f416382..c67d720 100644 --- a/configure.ac +++ b/configure.ac @@ -19,19 +19,24 @@ # along with aeswepd; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -AC_PREREQ(2.57) +AC_PREREQ(2.59) AC_INIT([aeswepd], [0.4], [mznrfjrcq (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/aeswepd.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) +AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/aeswepd/]) + +if type -p stow > /dev/null && test -d /usr/local/stow ; then + AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) + ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" +fi + # Checks for programs. AC_PROG_CC AC_PROG_LN_S AC_PROG_MAKE_SET -AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/aeswepd/]) - # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then CFLAGS="$CFLAGS -pipe -Wall" @@ -42,12 +47,7 @@ if type -p stow > /dev/null && test -d /usr/local/stow ; then ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" fi -# Checks for libraries. -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([fcntl.h limits.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h]) - -PKG_CHECK_MODULES(LIBDAEMON, libdaemon >= 0.4) +PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.4 ]) AC_SUBST(LIBDAEMON_CFLAGS) AC_SUBST(LIBDAEMON_LIBS) @@ -67,7 +67,7 @@ AC_CHECK_FUNCS([dup2 ftruncate memset select setenv socket strchr strcspn strdup # LYNX documentation generation AC_ARG_ENABLE(lynx, - AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]), + AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation), [case "${enableval}" in yes) lynx=yes ;; no) lynx=no ;; @@ -86,7 +86,7 @@ AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) # XMLTOMAN manpage generation AC_ARG_ENABLE(xmltoman, - AC_HELP_STRING([--disable-xmltoman], [Disable rebuilding of man pages with xmltoman]), + AS_HELP_STRING(--disable-xmltoman,Disable rebuilding of man pages with xmltoman), [case "${enableval}" in yes) xmltoman=yes ;; no) xmltoman=no ;; diff --git a/doc/README.html.in b/doc/README.html.in index daa005e..02caaa8 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -42,9 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p> <h2><a name="news">News</a></h2> -<div class="news-date">Sat Dec 6 2003: </div> +<div class="news-date">Sun Jan 11 2004: </div> -<p class="news-text"><a href="@PACKAGE_URL@aeswepd-0.4.tar.gz">Version 0.4</a> released, changed default rekeying time to 24h, updated wireless extension header, small fixes.</p> +<p class="news-text"><a href="@PACKAGE_URL@aeswepd-0.4.tar.gz">Version 0.4</a> released, update to wireless extensions v26 (for kernel 2.4.23 and newer), changed the default rekeying time to 24h. <b>This will make the default configuration incomptible with earlier versions!</b></p> <div class="news-date">Fri Oct 17 2003: </div> @@ -128,7 +128,7 @@ compilation and <tt>make install</tt> (as root) for installation of <p>Get <tt>aeswepd</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="https://seth.intheinter.net:8081/svn/aeswepd/">repository</a>.</p> <hr/> -<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, December 2003</address> +<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, Janury 2004</address> <div class="grey"><i>$Id$</i></div> diff --git a/doc/style.css b/doc/style.css index 1470559..2f41be1 100644 --- a/doc/style.css +++ b/doc/style.css @@ -23,7 +23,6 @@ a:link, a:visited { color: #900000; } p { margin-left: 0.5cm; margin-right: 0.5cm; } div.news-date { margin-left: 0.5cm; font-size: 80%; color: #4f0000; } p.news-text { margin-left: 1cm; } -ul { margin-left: 0.5cm; } h1 { color: #00009F; } h2 { color: #00009F; } h3 { color: #00004F; margin-left: 0.5cm; } diff --git a/src/Makefile.am b/src/Makefile.am index e5c0928..d8e456e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ aeswepd_SOURCES = aeswepd.c aeswepd.h \ keyapi.c keyapi.h aeswepd_LDADD = -lmcrypt $(LIBDAEMON_LIBS) -aeswepd_CFLAGS = $(LIBDAEMON_CFLAGS) +aeswepd_CFLAGS = $(LIBDAEMON_CFLAGS) $(AM_CFLAGS) install-exec-hook: cd $(DESTDIR)/$(sbindir) && ln -sf aeswepd aeswepls diff --git a/src/aeswepd.c b/src/aeswepd.c index 3c651e1..3cff079 100644 --- a/src/aeswepd.c +++ b/src/aeswepd.c @@ -18,6 +18,10 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #define _GNU_SOURCE #ifdef HAVE_CONFIG_H @@ -54,7 +58,7 @@ int rekey_time = 24*60*60, /* prior to 0.4: 15*60*/ int key_map[MAX_WEP_KEYS]; char *interface_name = NULL; -int daemonize = 1, use_syslog = 1, wait_on_fork = 0, use_status_file = 1, wait_on_kill = 0; +int daemonize = 1, use_syslog = 1, wait_on_fork = 0, use_status_file = 1, wait_on_kill = 0; char log_ident[32], pid_ident[32]; FILE *status_file = NULL; @@ -364,7 +368,7 @@ void parse_args(int argc, char *argv[]) { {0, 0, 0, 0} }; int option_index = 0; - int _help = 0, _kill = 0, _check = 0, _version = 0, r, _list_keys = 0, _key_set = 0; + int _help = 0, _kill = 0, _check = 0, _version = 0, _list_keys = 0, _key_set = 0, r; char ln[64]; char *b; @@ -414,6 +418,9 @@ void parse_args(int argc, char *argv[]) { case 'w': wait_on_fork = !wait_on_fork; break; + case 'W': + wait_on_kill = !wait_on_kill; + break; case 'h': _help = 1; break; @@ -503,7 +510,7 @@ void parse_args(int argc, char *argv[]) { if (_kill) { int rv; - + if (wait_on_kill) rv = daemon_pid_file_kill_wait(SIGINT, 5); else diff --git a/src/keyapi.c b/src/keyapi.c index a5b5351..4654b07 100644 --- a/src/keyapi.c +++ b/src/keyapi.c @@ -24,6 +24,10 @@ #include "iwkey.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + const struct key_api * key_api_get(const char *c) { /* Match for any special driver here ... */ diff --git a/src/wireless.h b/src/wireless.h index 73ff314..ce0f7c7 100644 --- a/src/wireless.h +++ b/src/wireless.h @@ -25,7 +25,6 @@ #include <sys/socket.h> #include <linux/if.h> #include <net/if_arp.h> - #include "wireless.16.h" #endif |