From a97290628ffc69fbf8557a7b696866ed29c256c3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering
Date: Thu, 22 Jan 2004 01:03:16 +0000
Subject: preparation von kernel 2.6
git-svn-id: file:///home/lennart/svn/public/seppl/trunk@26 91a2fd9b-5dcb-0310-a70a-d71e310228e6
---
bootstrap.sh | 2 +-
configure.ac | 36 ++++++++++++++++--------------
doc/README.html.in | 12 +++++++---
kernel/Makefile.in | 49 +++++++++++++++++++----------------------
kernel/ipt_CRYPT.c | 62 +++++++++++++++++++++++++++-------------------------
kernel/ipt_DECRYPT.c | 61 +++++++++++++++++++++++++++++++--------------------
kernel/seppl.c | 44 +++++++++++--------------------------
kernel/seppl.h | 2 --
kernel/test.sh | 6 ++---
9 files changed, 137 insertions(+), 137 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index 3fb6593..4ff275c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# $Id$
# This file is part of seppl.
diff --git a/configure.ac b/configure.ac
index fd952e6..fac7a1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,34 +19,36 @@
# along with seppl; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-AC_PREREQ(2.57)
-AC_INIT([seppl], [0.3], [mzfrccy (at) 0pointer (dot) de])
+AC_PREREQ(2.59)
+AC_INIT([seppl],[0.4],[mzfrccy (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([kernel/seppl.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign -Wall])
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/seppl/])
-# If using GCC specifiy some additional parameters
-if test "x$GCC" = "xyes" ; then
- CFLAGS="$CFLAGS -pipe -Wall"
-fi
-
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_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+
+# If using GCC specifiy some additional parameters
+if test "x$GCC" = "xyes" ; then
+ CFLAGS="$CFLAGS -pipe -Wall"
+fi
+
AC_CHECK_FUNCS([memset])
+AC_CHECK_HEADERS([fcntl.h])
+AC_FUNC_MALLOC
+AC_TYPE_OFF_T
AC_C_CONST
# iptables version
@@ -60,7 +62,7 @@ AC_DEFINE_UNQUOTED(IPTABLES_VERSION, ["$IPTABLES_VERSION"], "iptables release nu
AC_MSG_RESULT([$IPTABLES_VERSION])
# Init script location
-AC_ARG_WITH(initdir, AC_HELP_STRING([--with-initdir=DIR], [Install init script in DIR (system dependent default)]))
+AC_ARG_WITH(initdir, AS_HELP_STRING(--with-initdir=DIR,Install init script in DIR (system dependent default)))
test "x$with_initdir" = xyes -o "x$with_initdir" = xno && with_initdir=
@@ -122,7 +124,7 @@ AC_MSG_RESULT([found])
# Check for directory for kernel modules...
AC_MSG_CHECKING(for directory for kernel modules)
AC_ARG_WITH(moddir,
- AC_HELP_STRING([--with-moddir=dir], [Give the directory to install kernel modules to]),
+ AS_HELP_STRING(--with-moddir=dir,Give the directory to install kernel modules to),
KERNELMODDIR="$withval",
if test -d "/lib/modules/`uname -r`/" -o -L "/lib/modules/`uname -r`/"; then
KERNELMODDIR="/lib/modules/`uname -r`/"
@@ -149,7 +151,7 @@ AM_PATH_PYTHON([2.1])
# 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 ;;
@@ -168,7 +170,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 4259611..a5e1971 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -44,6 +44,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Thu Jan 22 2004:
Version 0.4 released; changes
+include: port to Linux 2.6, no other changes. Version 0.4 is no
+longer compatible with kernel 2.4. Use version 0.3 for kernel 2.4, it
+is functionally equivalent.
+
Sat Dec 6 2003:
Version 0.3 released; changes
include: IV are no longer simply increased from packet to packet, a C
@@ -235,7 +241,7 @@ some way. Thus you will not be able to use NAT in conjunction with
seppl. If you use connection tracking in some other way
together with seppl your mileage may vary.
-seppl is tested with Linux 2.4.{22,23}. It is not yet ported to 2.6.
+seppl is tested with Linux 2.6.1. Use version 0.3 for Linux 2.4.
Disclaimer
@@ -253,7 +259,7 @@ Linux distributions and
Unix versions since it uses GNU Autoconf and GNU libtool for source
code configuration and shared library management.
-seppl requires Linux 2.4.{22,23} (configured sources installed) and
+
seppl requires Linux 2.6.{0,1} (configured sources installed) and
iptables 1.2.8 or newer.
The complete userspace tool set requires Python 2.1 or newer. A stripped down set in C is available as well.
@@ -279,7 +285,7 @@ compilation and make install (as root) for installation of
Get seppl's development sources from the Subversion repository.
-Lennart Poettering <@PACKAGE_BUGREPORT@>, December 2003
+Lennart Poettering <@PACKAGE_BUGREPORT@>, January 2004
$Id$