From 8dbe81f1cca01ba056056e09fe3253465131fea4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering
Date: Thu, 11 Dec 2003 18:53:48 +0000
Subject: may changes
git-svn-id: file:///home/lennart/svn/public/aeswepd/trunk@37 022f378f-78c4-0310-b860-d162c87e6274
---
Makefile.am | 2 +-
bootstrap.sh | 19 +++++++++++++------
configure.ac | 13 ++++++++-----
doc/README.html.in | 10 +++++++---
doc/style.css | 4 ++++
man/Makefile.am | 2 +-
man/aeswepd.8.xml.in | 2 +-
src/Makefile.am | 5 +++--
src/aes.c | 4 ++++
src/aeswepd.c | 29 ++++++++++++++++++++++++-----
src/interface.c | 4 ++++
src/iwkey.c | 4 ++++
src/keyapi.c | 4 ++++
src/util.c | 4 ++++
src/wireless.h | 6 +++---
15 files changed, 85 insertions(+), 27 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 93cee46..b45c91a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,5 +31,5 @@ homepage:
test -d $$HOME/homepage/lennart
mkdir -p $$HOME/homepage/lennart/projects/aeswepd
cp *.tar.gz $$HOME/homepage/lennart/projects/aeswepd
- cp man/aeswepd.8.xml man/xmltoman.css man/xmltoman.xsl doc/style.css doc/README.html $$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
diff --git a/bootstrap.sh b/bootstrap.sh
index c03a0bb..e3d11d2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,22 +17,29 @@
# along with aeswepd; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+run_versioned() {
+ local P
+ type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+
+ shift 2
+ "$P" "$@"
+}
+
if [ "x$1" = "xam" ] ; then
set -ex
- automake -a -c
+ run_versioned automake 1.7 -a -c
./config.status
else
set -ex
-
- make maintainer-clean || true
-
rm -rf autom4te.cache
rm -f config.cache
- aclocal
+ run_versioned aclocal 1.7
autoheader
- automake -a -c
+ run_versioned automake 1.7 -a -c
autoconf -Wall
./configure --sysconfdir=/etc "$@"
+
+ make clean
fi
diff --git a/configure.ac b/configure.ac
index d5e0795..f416382 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.57)
-AC_INIT([aeswepd], [0.3b], [mznrfjrcq (at) 0pointer (dot) de])
+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])
@@ -37,9 +37,9 @@ if test "x$GCC" = "xyes" ; then
CFLAGS="$CFLAGS -pipe -Wall"
fi
-if test -d /usr/local/stow && type -p stow > /dev/null ; then
- AC_MSG_NOTICE([*** Found /usr/local/stow: installing to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
- AC_PREFIX_DEFAULT([/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}])
+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 libraries.
@@ -47,7 +47,10 @@ 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])
-AC_CHECK_LIB([daemon], [daemon_fork],, [AC_MSG_ERROR([*** Sorry, you have to install libdaemon ***])])
+PKG_CHECK_MODULES(LIBDAEMON, libdaemon >= 0.4)
+AC_SUBST(LIBDAEMON_CFLAGS)
+AC_SUBST(LIBDAEMON_LIBS)
+
AC_CHECK_LIB([mcrypt], [mcrypt_module_open], [AC_DEFINE(HAVE_MCRYPT, 1, [libmcrypt available])], [AC_MSG_ERROR([*** Sorry, you have to install libmcrypt or use --disable-aeswepd ***])])
AC_C_CONST
diff --git a/doc/README.html.in b/doc/README.html.in
index a79e0b9..daa005e 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -42,6 +42,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Sat Dec 6 2003:
+
+Version 0.4 released, changed default rekeying time to 24h, updated wireless extension header, small fixes.
+
Fri Oct 17 2003:
Version 0.3b released, small bugfixes.
@@ -75,7 +79,7 @@ it.
-Version 0.3 is more or less stable. It features only a single WEP
+
Version @PACKAGE_VERSION@ is more or less stable. It features only a single WEP
key driver for local NICs supporting the Linux wireless extensions
v15. Support for changing WEP keys of remote APs via HTTP is planned
for the next version.
@@ -124,9 +128,9 @@ compilation and make install (as root) for installation of
Get aeswepd's development sources from the Subversion repository.
-Lennart Poettering <@PACKAGE_BUGREPORT@>, October 2003
+Lennart Poettering <@PACKAGE_BUGREPORT@>, December 2003
-$Id$
+$Id$