ipset: move ipset to ipset-4

2025-09-08 13:44:56 +02:00 · 2011-01-04 03:52:11 +01:00
parent 77027ff8d3
commit 75212f3972
55 changed files with 4 additions and 4 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -86,5 +86,5 @@ AC_SUBST([kbuilddir])
 AC_SUBST([xtlibdir])
 AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile
 	extensions/Makefile extensions/ACCOUNT/Makefile
-	extensions/ipset/Makefile extensions/pknock/Makefile])
+	extensions/ipset-4/Makefile extensions/pknock/Makefile])
 AC_OUTPUT
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -26,7 +26,7 @@ obj-${build_fuzzy}       += xt_fuzzy.o
 obj-${build_geoip}       += xt_geoip.o
 obj-${build_iface}       += xt_iface.o
 obj-${build_ipp2p}       += xt_ipp2p.o
-obj-${build_ipset}       += ipset/
+obj-${build_ipset4}      += ipset-4/
 obj-${build_ipv4options} += xt_ipv4options.o
 obj-${build_length2}     += xt_length2.o
 obj-${build_lscan}       += xt_lscan.o
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -18,7 +18,7 @@ obj-${build_fuzzy}       += libxt_fuzzy.so
 obj-${build_geoip}       += libxt_geoip.so
 obj-${build_iface}       += libxt_iface.so
 obj-${build_ipp2p}       += libxt_ipp2p.so
-obj-${build_ipset}       += ipset/
+obj-${build_ipset4}      += ipset-4/
 obj-${build_ipv4options} += libxt_ipv4options.so
 obj-${build_length2}     += libxt_length2.so
 obj-${build_lscan}       += libxt_lscan.so
--- a/extensions/ipset-4/.gitignore
+++ b/extensions/ipset-4/.gitignore
--- a/extensions/ipset-4/Kbuild
+++ b/extensions/ipset-4/Kbuild
--- a/extensions/ipset-4/Makefile.am
+++ b/extensions/ipset-4/Makefile.am
--- a/extensions/ipset-4/Mbuild
+++ b/extensions/ipset-4/Mbuild
--- a/extensions/ipset-4/ip_set.c
+++ b/extensions/ipset-4/ip_set.c
--- a/extensions/ipset-4/ip_set.h
+++ b/extensions/ipset-4/ip_set.h
--- a/extensions/ipset-4/ip_set_bitmaps.h
+++ b/extensions/ipset-4/ip_set_bitmaps.h
--- a/extensions/ipset-4/ip_set_compat.h
+++ b/extensions/ipset-4/ip_set_compat.h
--- a/extensions/ipset-4/ip_set_getport.h
+++ b/extensions/ipset-4/ip_set_getport.h
--- a/extensions/ipset-4/ip_set_hashes.h
+++ b/extensions/ipset-4/ip_set_hashes.h
--- a/extensions/ipset-4/ip_set_iphash.c
+++ b/extensions/ipset-4/ip_set_iphash.c
--- a/extensions/ipset-4/ip_set_iphash.h
+++ b/extensions/ipset-4/ip_set_iphash.h
--- a/extensions/ipset-4/ip_set_ipmap.c
+++ b/extensions/ipset-4/ip_set_ipmap.c
--- a/extensions/ipset-4/ip_set_ipmap.h
+++ b/extensions/ipset-4/ip_set_ipmap.h
--- a/extensions/ipset-4/ip_set_ipporthash.c
+++ b/extensions/ipset-4/ip_set_ipporthash.c
--- a/extensions/ipset-4/ip_set_ipporthash.h
+++ b/extensions/ipset-4/ip_set_ipporthash.h
--- a/extensions/ipset-4/ip_set_ipportiphash.c
+++ b/extensions/ipset-4/ip_set_ipportiphash.c
--- a/extensions/ipset-4/ip_set_ipportiphash.h
+++ b/extensions/ipset-4/ip_set_ipportiphash.h
--- a/extensions/ipset-4/ip_set_ipportnethash.c
+++ b/extensions/ipset-4/ip_set_ipportnethash.c
--- a/extensions/ipset-4/ip_set_ipportnethash.h
+++ b/extensions/ipset-4/ip_set_ipportnethash.h
--- a/extensions/ipset-4/ip_set_iptree.c
+++ b/extensions/ipset-4/ip_set_iptree.c
--- a/extensions/ipset-4/ip_set_iptree.h
+++ b/extensions/ipset-4/ip_set_iptree.h
--- a/extensions/ipset-4/ip_set_iptreemap.c
+++ b/extensions/ipset-4/ip_set_iptreemap.c
--- a/extensions/ipset-4/ip_set_iptreemap.h
+++ b/extensions/ipset-4/ip_set_iptreemap.h
--- a/extensions/ipset-4/ip_set_jhash.h
+++ b/extensions/ipset-4/ip_set_jhash.h
--- a/extensions/ipset-4/ip_set_macipmap.c
+++ b/extensions/ipset-4/ip_set_macipmap.c
--- a/extensions/ipset-4/ip_set_macipmap.h
+++ b/extensions/ipset-4/ip_set_macipmap.h
--- a/extensions/ipset-4/ip_set_malloc.h
+++ b/extensions/ipset-4/ip_set_malloc.h
--- a/extensions/ipset-4/ip_set_nethash.c
+++ b/extensions/ipset-4/ip_set_nethash.c
--- a/extensions/ipset-4/ip_set_nethash.h
+++ b/extensions/ipset-4/ip_set_nethash.h
--- a/extensions/ipset-4/ip_set_portmap.c
+++ b/extensions/ipset-4/ip_set_portmap.c
--- a/extensions/ipset-4/ip_set_portmap.h
+++ b/extensions/ipset-4/ip_set_portmap.h
--- a/extensions/ipset-4/ip_set_setlist.c
+++ b/extensions/ipset-4/ip_set_setlist.c
--- a/extensions/ipset-4/ip_set_setlist.h
+++ b/extensions/ipset-4/ip_set_setlist.h
--- a/extensions/ipset-4/ipset.8
+++ b/extensions/ipset-4/ipset.8
--- a/extensions/ipset-4/ipset.c
+++ b/extensions/ipset-4/ipset.c
--- a/extensions/ipset-4/ipset.h
+++ b/extensions/ipset-4/ipset.h
--- a/extensions/ipset-4/ipset_iphash.c
+++ b/extensions/ipset-4/ipset_iphash.c
--- a/extensions/ipset-4/ipset_ipmap.c
+++ b/extensions/ipset-4/ipset_ipmap.c
--- a/extensions/ipset-4/ipset_ipporthash.c
+++ b/extensions/ipset-4/ipset_ipporthash.c
--- a/extensions/ipset-4/ipset_ipportiphash.c
+++ b/extensions/ipset-4/ipset_ipportiphash.c
--- a/extensions/ipset-4/ipset_ipportnethash.c
+++ b/extensions/ipset-4/ipset_ipportnethash.c
--- a/extensions/ipset-4/ipset_iptree.c
+++ b/extensions/ipset-4/ipset_iptree.c
--- a/extensions/ipset-4/ipset_iptreemap.c
+++ b/extensions/ipset-4/ipset_iptreemap.c
--- a/extensions/ipset-4/ipset_macipmap.c
+++ b/extensions/ipset-4/ipset_macipmap.c
--- a/extensions/ipset-4/ipset_nethash.c
+++ b/extensions/ipset-4/ipset_nethash.c
--- a/extensions/ipset-4/ipset_portmap.c
+++ b/extensions/ipset-4/ipset_portmap.c
--- a/extensions/ipset-4/ipset_setlist.c
+++ b/extensions/ipset-4/ipset_setlist.c
--- a/extensions/ipset-4/ipt_SET.c
+++ b/extensions/ipset-4/ipt_SET.c
--- a/extensions/ipset-4/ipt_set.c
+++ b/extensions/ipset-4/ipt_set.c
--- a/extensions/ipset-4/ipt_set.h
+++ b/extensions/ipset-4/ipt_set.h
--- a/2
+++ b/2
@@ -19,7 +19,7 @@ build_geoip=m
 build_gradm=m
 build_iface=m
 build_ipp2p=m
-build_ipset=m
+build_ipset4=m
 build_ipv4options=m
 build_length2=m
 build_lscan=m