Merge branch 'ipset-6'

Conflicts:
	INSTALL
	mconfig

diff --cc INSTALL
index 924889c09ebc7f7b807115a760652dbbc7c94a86,ed059933986296d816e92a980de08dd2b84f045f..60d671e9372bf5e1db2673f247274801576bc6c0
--- 1/INSTALL
--- 2/INSTALL
+++ b/INSTALL
@@@ -22,7 -22,13 +22,7 @@@ Supported configurations for this relea
          - CONFIG_CONNECTOR y/m if you wish to receive userspace
            notifications from pknock through netlink/connector
  
- For ipset-5 you need:
 -Extra notes:
 -
 -      * in the kernel 2.6.18.x series, >= 2.6.18.5 is required
 -
 -      * requires that no vendor backports interfere
 -
+ For ipset-6 you need:
  
        * libmnl
  

diff --cc configure.ac
Simple merge

diff --cc doc/changelog.txt
index b60c4d22c52aa3f90b172d46e1799b1d70df32a5,8fedf2c49502109d26a29d6028be9e914fe4c849..5657ec6701a8cf010f3fe2b2ec2e535f4c484c79
--- 1/doc/changelog.txt
--- 2/doc/changelog.txt
+++ b/doc/changelog.txt
@@@ -1,21 -1,32 +1,45 @@@
  
  HEAD
  ====
+ Enhancements:
+ - update to ipset 6.0
+   * allow "new" as a commad alias to "create"
+   * ipset: improve command argument parsing
+   * ipset: avoid the unnecessary argv[] loop
+   * ipset: pass ipset_arg argument pointer
+   * separate ipset errnos completely from system ones and bump protocol version
+   * resolving IP addresses did not work at listing/saving sets, fixed
+   * ipset: fix spelling error
+   * ipset: fix the Netlink sequence number
+   * ipset: turn Set name[] into a const pointer
+   * check ICMP and ICMPv6 with the set match and target in the testsuite
+   * avoid possible syntax clashing at saving hostnames
+   * fix linking with CONFIG_IPV6=n
+ - update to ipset 6.1
+   * sctp, udplite support for the hash:*port* types
+   * fix hash:*port* types ignoring the address range for non-{tcp,udp}
+   * revision reporting fixes
+ - update to ipset 6.2
+   * list:set timeout variant fixes
+ - update to ipset 6.3
+   * bitmap:ip,mac type requires "src" for MAC, enforce it
+ - ipset-genl: handle EAGAIN return value emitted from autoloader
+ - ipset-genl: resolve nfgenmsg remains and fix spurious protocol abort
  
  
 +v1.34 (2011-04-07)
 +==================
 +Fixes:
 +- xt_pknock: avoid crash when hash TFM could not be allocated
 +- xt_pknock: avoid inversion of rule lookup that led to warnings
 +- xt_DNETMAP: add missing module alias
 +- xt_DNETMAP: support for kernels below 2.6.34
 +Changes:
 +- Linux kernel versions below 2.6.29 are no longer officially
 +  supported, and will not be part of compilation testing.
 +  Expect that compat code will be removed shortly.
 +
 +
  v1.33 (2011-02-02)
  ==================
  Fixes:

diff --cc mconfig
index 164df5a1c2befceb3f04705280674bf6d8720d07,221fcfb0b47cb01012ee876a3db9f3d8fddfc3bf..1c6b046dce3238120e3f9d315aeb358c1b1e0966
--- 1/mconfig
--- 2/mconfig
+++ b/mconfig
@@@ -1,30 -1,3 +1,30 @@@
  # -*- Makefile -*-
  #
 -build_ipset6=m
 +build_ACCOUNT=m
 +build_CHAOS=m
 +build_CHECKSUM=
 +build_DELUDE=m
 +build_DHCPMAC=m
 +build_DNETMAP=m
 +build_ECHO=
 +build_IPMARK=m
 +build_LOGMARK=m
 +build_RAWNAT=m
 +build_STEAL=m
 +build_SYSRQ=m
 +build_TARPIT=m
 +build_TEE=
 +build_condition=m
 +build_fuzzy=m
 +build_geoip=m
 +build_gradm=m
 +build_iface=m
 +build_ipp2p=m
 +build_ipset4=m
- build_ipset5=
++build_ipset6=
 +build_ipv4options=m
 +build_length2=m
 +build_lscan=m
 +build_pknock=m
 +build_psd=m
 +build_quota2=m