release-diff for 1.2.1

- added libipulog / libiptc to devel target
- added changelog for 1.2.1
- updated index.html for 1.2.1
- added reference to Oskar Andreasson's tutorial

diff --git a/Makefile b/Makefile
index 72726f633e9655fb8bfd56f073059048d2207b02..b10561a5e94cc8dffc9526c31e2bb05c85c65ec5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 NETFILTER_VERSION:=1.2.1
-OLD_NETFILTER_VERSION:=1.1.2
+OLD_NETFILTER_VERSION:=1.2
 
 # Waiting for inclusions in the kernel tree.
 PENDING_PATCHES:=tos-fix.patch dropped-table.patch seqoffset.patch irc-conntrack-nat.patch

diff --git a/TODO b/TODO
index a5108096f1aa8cd88c2df7c1eee53a44faf66e54..0cac0848a2d54068bd4c962f8ebe99df83dfc680 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,12 +4,12 @@ Currently maintained by Harald Welte <laforge@gnumonks.org>
 Please inform me, if you want to work on any of the TODO items, so I
 can update this list and thus prevent two people doing the same work.
 
-CVS ID: $Id: TODO,v 1.23 2001/02/22 12:01:55 laforge Exp $
+CVS ID: $Id: TODO,v 1.24 2001/02/28 11:15:01 laforge Exp $
 
 IMPORTANT before iptables-1.2.1 release:
 X generic tcp sequence number offset support for nat helpers [HW]
 X prerelease make target (for applying certain p-o-m stuff) [RR]
-- header files in seperate directory, build all extensions, even
+X header files in seperate directory, build all extensions, even
   when current kernel not patched [RR]
 X restore counters for individual rules (iptables / iptables-restore) [HW]
 - add libipulog / libiptc to DEVEL target [RR]
@@ -42,6 +42,7 @@ X integrate PSD target / port it as match [HW]
 - ip_nat_ident module
 - provide daily CVS snapshots via fto [HW]
 - 10.1.2.3.4 is accepted as a valid IP address by iptables -s / -d ?
+- make iptables / ip6tables use the same codebase (as libiptc)
 
 ======================================================================
 [RR]   Paul 'Rusty' Russel <rusty@linuxcare.com.au>

diff --git a/libiptc/Makefile b/libiptc/Makefile
index a37fa99d27d89abd98554ba17560e49f8ae8dd94..b8a36c585b31ae1231542191c08e61fba590ac37 100644 (file)
--- a/libiptc/Makefile
+++ b/libiptc/Makefile
@@ -2,6 +2,8 @@
 
 EXTRAS+=libiptc/libiptc.a
 
+DEVEL_LIBS+=libiptc/libiptc.a
+
 ifndef TOPLEVEL_INCLUDED
 local:
        cd .. && $(MAKE) $(KERN_TARGETS) $(SHARED_LIBS) $(EXTRAS)