summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2001-04-30 04:21:40 +0000
committerHarald Welte <laforge@gnumonks.org>2001-04-30 04:21:40 +0000
commit2584acf09b607d604d6fdfb437e3f596be0145e9 (patch)
treed1c89878772a0a50ef608acfa18c0abacc518635 /Makefile
parent64bb2a11065e09d5a26fb1b4c690f07a63f67fe0 (diff)
version number bumped to 1.2.2, pending-patches updated
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b7ca0212..060d6f00 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ TOPLEVEL_INCLUDED=YES
ifndef KERNEL_DIR
KERNEL_DIR=/usr/src/linux
endif
-NETFILTER_VERSION:=1.2.1a
-OLD_NETFILTER_VERSION:=1.2
+NETFILTER_VERSION:=1.2.2
+OLD_NETFILTER_VERSION:=1.2.1a
# Waiting for inclusions in the kernel tree.
-PENDING_PATCHES:=dropped-table.patch seqoffset.patch irc-conntrack-nat.patch
+PENDING_PATCHES:=ftp-fixes.patch irc-conntrack-nat.patch
# These went in previous kernels.
PENDING_PATCHES+=ipv6-fixes.patch.ipv6 masquerade+fwmark.patch nat-overlap.patch ppc-sparc-mangle.patch tos-fix.patch masq-dynaddr.patch