ipset: rename ipset-5 directory to ipset-6

diff --git a/INSTALL b/INSTALL
index a1e3a775f43cb92d96725e49847a6b3e9a95f839..ed059933986296d816e92a980de08dd2b84f045f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -28,7 +28,7 @@ Extra notes:
 
        * requires that no vendor backports interfere
 
-For ipset-5 you need:
+For ipset-6 you need:
 
        * libmnl
 

diff --git a/configure.ac b/configure.ac
index 80006a6f72089d758385279ff7a3073788c2ecd4..9709815ce8fabb81a0f5000d206abafb0d679272 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,6 @@ AC_SUBST([kbuilddir])
 AC_SUBST([xtlibdir])
 AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile
        extensions/Makefile extensions/ACCOUNT/Makefile
-       extensions/ipset-4/Makefile extensions/ipset-5/Makefile
+       extensions/ipset-4/Makefile extensions/ipset-6/Makefile
        extensions/pknock/Makefile])
 AC_OUTPUT

diff --git a/extensions/Kbuild b/extensions/Kbuild
index 627462776d78ec3614ecdc1eb6d8435101f4cbfc..7414fe6669155300e0df900d27fbb38ef35c561c 100644 (file)
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -28,7 +28,7 @@ obj-${build_geoip}       += xt_geoip.o
 obj-${build_iface}       += xt_iface.o
 obj-${build_ipp2p}       += xt_ipp2p.o
 obj-${build_ipset4}      += ipset-4/
-obj-${build_ipset5}      += ipset-5/
+obj-${build_ipset6}      += ipset-6/
 obj-${build_ipv4options} += xt_ipv4options.o
 obj-${build_length2}     += xt_length2.o
 obj-${build_lscan}       += xt_lscan.o

diff --git a/extensions/Mbuild b/extensions/Mbuild
index c0e7ca351b8c413c1d119a8a655c347300bac0a7..65be562eae48933fca358a68459556a62d5f399f 100644 (file)
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -20,7 +20,7 @@ obj-${build_geoip}       += libxt_geoip.so
 obj-${build_iface}       += libxt_iface.so
 obj-${build_ipp2p}       += libxt_ipp2p.so
 obj-${build_ipset4}      += ipset-4/
-obj-${build_ipset5}      += ipset-5/
+obj-${build_ipset6}      += ipset-6/
 obj-${build_ipv4options} += libxt_ipv4options.so
 obj-${build_length2}     += libxt_length2.so
 obj-${build_lscan}       += libxt_lscan.so

diff --git a/extensions/ipset-5/.gitignore b/extensions/ipset-6/.gitignore
similarity index 100%
rename from extensions/ipset-5/.gitignore
rename to extensions/ipset-6/.gitignore

diff --git a/extensions/ipset-5/Kbuild b/extensions/ipset-6/Kbuild
similarity index 100%
rename from extensions/ipset-5/Kbuild
rename to extensions/ipset-6/Kbuild

diff --git a/extensions/ipset-5/Makefile.am b/extensions/ipset-6/Makefile.am
similarity index 100%
rename from extensions/ipset-5/Makefile.am
rename to extensions/ipset-6/Makefile.am

diff --git a/extensions/ipset-5/Mbuild b/extensions/ipset-6/Mbuild
similarity index 100%
rename from extensions/ipset-5/Mbuild
rename to extensions/ipset-6/Mbuild

diff --git a/extensions/ipset-5/VERSION.txt b/extensions/ipset-6/VERSION.txt
similarity index 100%
rename from extensions/ipset-5/VERSION.txt
rename to extensions/ipset-6/VERSION.txt

diff --git a/extensions/ipset-5/include/libipset/data.h b/extensions/ipset-6/include/libipset/data.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/data.h
rename to extensions/ipset-6/include/libipset/data.h

diff --git a/extensions/ipset-5/include/libipset/debug.h b/extensions/ipset-6/include/libipset/debug.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/debug.h
rename to extensions/ipset-6/include/libipset/debug.h

diff --git a/extensions/ipset-5/include/libipset/errcode.h b/extensions/ipset-6/include/libipset/errcode.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/errcode.h
rename to extensions/ipset-6/include/libipset/errcode.h

diff --git a/extensions/ipset-5/include/libipset/icmp.h b/extensions/ipset-6/include/libipset/icmp.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/icmp.h
rename to extensions/ipset-6/include/libipset/icmp.h

diff --git a/extensions/ipset-5/include/libipset/icmpv6.h b/extensions/ipset-6/include/libipset/icmpv6.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/icmpv6.h
rename to extensions/ipset-6/include/libipset/icmpv6.h

diff --git a/extensions/ipset-5/include/libipset/linux_ip_set.h b/extensions/ipset-6/include/libipset/linux_ip_set.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/linux_ip_set.h
rename to extensions/ipset-6/include/libipset/linux_ip_set.h

diff --git a/extensions/ipset-5/include/libipset/linux_ip_set_bitmap.h b/extensions/ipset-6/include/libipset/linux_ip_set_bitmap.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/linux_ip_set_bitmap.h
rename to extensions/ipset-6/include/libipset/linux_ip_set_bitmap.h

diff --git a/extensions/ipset-5/include/libipset/linux_ip_set_hash.h b/extensions/ipset-6/include/libipset/linux_ip_set_hash.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/linux_ip_set_hash.h
rename to extensions/ipset-6/include/libipset/linux_ip_set_hash.h

diff --git a/extensions/ipset-5/include/libipset/linux_ip_set_list.h b/extensions/ipset-6/include/libipset/linux_ip_set_list.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/linux_ip_set_list.h
rename to extensions/ipset-6/include/libipset/linux_ip_set_list.h

diff --git a/extensions/ipset-5/include/libipset/mnl.h b/extensions/ipset-6/include/libipset/mnl.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/mnl.h
rename to extensions/ipset-6/include/libipset/mnl.h

diff --git a/extensions/ipset-5/include/libipset/nf_inet_addr.h b/extensions/ipset-6/include/libipset/nf_inet_addr.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/nf_inet_addr.h
rename to extensions/ipset-6/include/libipset/nf_inet_addr.h

diff --git a/extensions/ipset-5/include/libipset/parse.h b/extensions/ipset-6/include/libipset/parse.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/parse.h
rename to extensions/ipset-6/include/libipset/parse.h

diff --git a/extensions/ipset-5/include/libipset/pfxlen.h b/extensions/ipset-6/include/libipset/pfxlen.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/pfxlen.h
rename to extensions/ipset-6/include/libipset/pfxlen.h

diff --git a/extensions/ipset-5/include/libipset/print.h b/extensions/ipset-6/include/libipset/print.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/print.h
rename to extensions/ipset-6/include/libipset/print.h

diff --git a/extensions/ipset-5/include/libipset/session.h b/extensions/ipset-6/include/libipset/session.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/session.h
rename to extensions/ipset-6/include/libipset/session.h

diff --git a/extensions/ipset-5/include/libipset/transport.h b/extensions/ipset-6/include/libipset/transport.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/transport.h
rename to extensions/ipset-6/include/libipset/transport.h

diff --git a/extensions/ipset-5/include/libipset/types.h b/extensions/ipset-6/include/libipset/types.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/types.h
rename to extensions/ipset-6/include/libipset/types.h

diff --git a/extensions/ipset-5/include/libipset/ui.h b/extensions/ipset-6/include/libipset/ui.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/ui.h
rename to extensions/ipset-6/include/libipset/ui.h

diff --git a/extensions/ipset-5/include/libipset/utils.h b/extensions/ipset-6/include/libipset/utils.h
similarity index 100%
rename from extensions/ipset-5/include/libipset/utils.h
rename to extensions/ipset-6/include/libipset/utils.h

diff --git a/extensions/ipset-5/ip_set.h b/extensions/ipset-6/ip_set.h
similarity index 100%
rename from extensions/ipset-5/ip_set.h
rename to extensions/ipset-6/ip_set.h

diff --git a/extensions/ipset-5/ip_set_ahash.h b/extensions/ipset-6/ip_set_ahash.h
similarity index 100%
rename from extensions/ipset-5/ip_set_ahash.h
rename to extensions/ipset-6/ip_set_ahash.h

diff --git a/extensions/ipset-5/ip_set_bitmap.h b/extensions/ipset-6/ip_set_bitmap.h
similarity index 100%
rename from extensions/ipset-5/ip_set_bitmap.h
rename to extensions/ipset-6/ip_set_bitmap.h

diff --git a/extensions/ipset-5/ip_set_bitmap_ip.c b/extensions/ipset-6/ip_set_bitmap_ip.c
similarity index 100%
rename from extensions/ipset-5/ip_set_bitmap_ip.c
rename to extensions/ipset-6/ip_set_bitmap_ip.c

diff --git a/extensions/ipset-5/ip_set_bitmap_ipmac.c b/extensions/ipset-6/ip_set_bitmap_ipmac.c
similarity index 100%
rename from extensions/ipset-5/ip_set_bitmap_ipmac.c
rename to extensions/ipset-6/ip_set_bitmap_ipmac.c

diff --git a/extensions/ipset-5/ip_set_bitmap_port.c b/extensions/ipset-6/ip_set_bitmap_port.c
similarity index 100%
rename from extensions/ipset-5/ip_set_bitmap_port.c
rename to extensions/ipset-6/ip_set_bitmap_port.c

diff --git a/extensions/ipset-5/ip_set_chash.h b/extensions/ipset-6/ip_set_chash.h
similarity index 100%
rename from extensions/ipset-5/ip_set_chash.h
rename to extensions/ipset-6/ip_set_chash.h

diff --git a/extensions/ipset-5/ip_set_core.c b/extensions/ipset-6/ip_set_core.c
similarity index 100%
rename from extensions/ipset-5/ip_set_core.c
rename to extensions/ipset-6/ip_set_core.c

diff --git a/extensions/ipset-5/ip_set_getport.c b/extensions/ipset-6/ip_set_getport.c
similarity index 100%
rename from extensions/ipset-5/ip_set_getport.c
rename to extensions/ipset-6/ip_set_getport.c

diff --git a/extensions/ipset-5/ip_set_getport.h b/extensions/ipset-6/ip_set_getport.h
similarity index 100%
rename from extensions/ipset-5/ip_set_getport.h
rename to extensions/ipset-6/ip_set_getport.h

diff --git a/extensions/ipset-5/ip_set_hash.h b/extensions/ipset-6/ip_set_hash.h
similarity index 100%
rename from extensions/ipset-5/ip_set_hash.h
rename to extensions/ipset-6/ip_set_hash.h

diff --git a/extensions/ipset-5/ip_set_hash_ip.c b/extensions/ipset-6/ip_set_hash_ip.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_ip.c
rename to extensions/ipset-6/ip_set_hash_ip.c

diff --git a/extensions/ipset-5/ip_set_hash_ipport.c b/extensions/ipset-6/ip_set_hash_ipport.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_ipport.c
rename to extensions/ipset-6/ip_set_hash_ipport.c

diff --git a/extensions/ipset-5/ip_set_hash_ipportip.c b/extensions/ipset-6/ip_set_hash_ipportip.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_ipportip.c
rename to extensions/ipset-6/ip_set_hash_ipportip.c

diff --git a/extensions/ipset-5/ip_set_hash_ipportnet.c b/extensions/ipset-6/ip_set_hash_ipportnet.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_ipportnet.c
rename to extensions/ipset-6/ip_set_hash_ipportnet.c

diff --git a/extensions/ipset-5/ip_set_hash_net.c b/extensions/ipset-6/ip_set_hash_net.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_net.c
rename to extensions/ipset-6/ip_set_hash_net.c

diff --git a/extensions/ipset-5/ip_set_hash_netport.c b/extensions/ipset-6/ip_set_hash_netport.c
similarity index 100%
rename from extensions/ipset-5/ip_set_hash_netport.c
rename to extensions/ipset-6/ip_set_hash_netport.c

diff --git a/extensions/ipset-5/ip_set_list.h b/extensions/ipset-6/ip_set_list.h
similarity index 100%
rename from extensions/ipset-5/ip_set_list.h
rename to extensions/ipset-6/ip_set_list.h

diff --git a/extensions/ipset-5/ip_set_list_set.c b/extensions/ipset-6/ip_set_list_set.c
similarity index 100%
rename from extensions/ipset-5/ip_set_list_set.c
rename to extensions/ipset-6/ip_set_list_set.c

diff --git a/extensions/ipset-5/ip_set_timeout.h b/extensions/ipset-6/ip_set_timeout.h
similarity index 100%
rename from extensions/ipset-5/ip_set_timeout.h
rename to extensions/ipset-6/ip_set_timeout.h

diff --git a/extensions/ipset-5/ipset.8 b/extensions/ipset-6/ipset.8
similarity index 100%
rename from extensions/ipset-5/ipset.8
rename to extensions/ipset-6/ipset.8

diff --git a/extensions/ipset-5/jhash.h b/extensions/ipset-6/jhash.h
similarity index 100%
rename from extensions/ipset-5/jhash.h
rename to extensions/ipset-6/jhash.h

diff --git a/extensions/ipset-5/libipset/data.c b/extensions/ipset-6/libipset/data.c
similarity index 100%
rename from extensions/ipset-5/libipset/data.c
rename to extensions/ipset-6/libipset/data.c

diff --git a/extensions/ipset-5/libipset/icmp.c b/extensions/ipset-6/libipset/icmp.c
similarity index 100%
rename from extensions/ipset-5/libipset/icmp.c
rename to extensions/ipset-6/libipset/icmp.c

diff --git a/extensions/ipset-5/libipset/icmpv6.c b/extensions/ipset-6/libipset/icmpv6.c
similarity index 100%
rename from extensions/ipset-5/libipset/icmpv6.c
rename to extensions/ipset-6/libipset/icmpv6.c

diff --git a/extensions/ipset-5/libipset/mnl.c b/extensions/ipset-6/libipset/mnl.c
similarity index 100%
rename from extensions/ipset-5/libipset/mnl.c
rename to extensions/ipset-6/libipset/mnl.c

diff --git a/extensions/ipset-5/libipset/parse.c b/extensions/ipset-6/libipset/parse.c
similarity index 100%
rename from extensions/ipset-5/libipset/parse.c
rename to extensions/ipset-6/libipset/parse.c

diff --git a/extensions/ipset-5/libipset/print.c b/extensions/ipset-6/libipset/print.c
similarity index 100%
rename from extensions/ipset-5/libipset/print.c
rename to extensions/ipset-6/libipset/print.c

diff --git a/extensions/ipset-5/libipset/session.c b/extensions/ipset-6/libipset/session.c
similarity index 100%
rename from extensions/ipset-5/libipset/session.c
rename to extensions/ipset-6/libipset/session.c

diff --git a/extensions/ipset-5/libipset/types.c b/extensions/ipset-6/libipset/types.c
similarity index 100%
rename from extensions/ipset-5/libipset/types.c
rename to extensions/ipset-6/libipset/types.c

diff --git a/extensions/ipset-5/pfxlen.c b/extensions/ipset-6/pfxlen.c
similarity index 100%
rename from extensions/ipset-5/pfxlen.c
rename to extensions/ipset-6/pfxlen.c

diff --git a/extensions/ipset-5/pfxlen.h b/extensions/ipset-6/pfxlen.h
similarity index 100%
rename from extensions/ipset-5/pfxlen.h
rename to extensions/ipset-6/pfxlen.h

diff --git a/extensions/ipset-5/slist.h b/extensions/ipset-6/slist.h
similarity index 100%
rename from extensions/ipset-5/slist.h
rename to extensions/ipset-6/slist.h

diff --git a/extensions/ipset-5/src/errcode.c b/extensions/ipset-6/src/errcode.c
similarity index 100%
rename from extensions/ipset-5/src/errcode.c
rename to extensions/ipset-6/src/errcode.c

diff --git a/extensions/ipset-5/src/ipset.c b/extensions/ipset-6/src/ipset.c
similarity index 100%
rename from extensions/ipset-5/src/ipset.c
rename to extensions/ipset-6/src/ipset.c

diff --git a/extensions/ipset-5/src/ipset_bitmap_ip.c b/extensions/ipset-6/src/ipset_bitmap_ip.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_bitmap_ip.c
rename to extensions/ipset-6/src/ipset_bitmap_ip.c

diff --git a/extensions/ipset-5/src/ipset_bitmap_ipmac.c b/extensions/ipset-6/src/ipset_bitmap_ipmac.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_bitmap_ipmac.c
rename to extensions/ipset-6/src/ipset_bitmap_ipmac.c

diff --git a/extensions/ipset-5/src/ipset_bitmap_port.c b/extensions/ipset-6/src/ipset_bitmap_port.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_bitmap_port.c
rename to extensions/ipset-6/src/ipset_bitmap_port.c

diff --git a/extensions/ipset-5/src/ipset_hash_ip.c b/extensions/ipset-6/src/ipset_hash_ip.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_ip.c
rename to extensions/ipset-6/src/ipset_hash_ip.c

diff --git a/extensions/ipset-5/src/ipset_hash_ipport.c b/extensions/ipset-6/src/ipset_hash_ipport.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_ipport.c
rename to extensions/ipset-6/src/ipset_hash_ipport.c

diff --git a/extensions/ipset-5/src/ipset_hash_ipportip.c b/extensions/ipset-6/src/ipset_hash_ipportip.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_ipportip.c
rename to extensions/ipset-6/src/ipset_hash_ipportip.c

diff --git a/extensions/ipset-5/src/ipset_hash_ipportnet.c b/extensions/ipset-6/src/ipset_hash_ipportnet.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_ipportnet.c
rename to extensions/ipset-6/src/ipset_hash_ipportnet.c

diff --git a/extensions/ipset-5/src/ipset_hash_net.c b/extensions/ipset-6/src/ipset_hash_net.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_net.c
rename to extensions/ipset-6/src/ipset_hash_net.c

diff --git a/extensions/ipset-5/src/ipset_hash_netport.c b/extensions/ipset-6/src/ipset_hash_netport.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_hash_netport.c
rename to extensions/ipset-6/src/ipset_hash_netport.c

diff --git a/extensions/ipset-5/src/ipset_list_set.c b/extensions/ipset-6/src/ipset_list_set.c
similarity index 100%
rename from extensions/ipset-5/src/ipset_list_set.c
rename to extensions/ipset-6/src/ipset_list_set.c

diff --git a/extensions/ipset-5/src/ui.c b/extensions/ipset-6/src/ui.c
similarity index 100%
rename from extensions/ipset-5/src/ui.c
rename to extensions/ipset-6/src/ui.c

diff --git a/extensions/ipset-5/xt_set.c b/extensions/ipset-6/xt_set.c
similarity index 100%
rename from extensions/ipset-5/xt_set.c
rename to extensions/ipset-6/xt_set.c

diff --git a/extensions/ipset-5/xt_set.h b/extensions/ipset-6/xt_set.h
similarity index 100%
rename from extensions/ipset-5/xt_set.h
rename to extensions/ipset-6/xt_set.h

diff --git a/mconfig b/mconfig
index 0d33d7d9dea9f310ae3458867146029c6a2da6e4..03c87190fdd03dfc4a12f47ade92f3ab2cf66cc4 100644 (file)
--- a/mconfig
+++ b/mconfig
@@ -21,7 +21,7 @@ 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