Merge branch 'geoip'

This commit is contained in:
Jan Engelhardt
2011-02-02 04:48:40 +01:00
10 changed files with 438 additions and 130 deletions

View File

@@ -6,6 +6,7 @@ Fixes:
- build: fix objdir builds for ipset-5 (xt-a specific)
- xt_LOGMARK: fix detection of untracked connection for Linux >= 2.6.36
Enhancements:
- IPv6 support for xt_geoip
- Update to ipset 5.3
* make IPv4 and IPv6 address handling similar
* show correct line numbers in restore output for parser errors