aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-08 20:39:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-11-08 20:39:49 +0000
commit4eb55d71de06f344e57f2454c2df05ff89b5c62e (patch)
tree860297dc2ed7b2ab6b89c75ef7310b1cfe0ab4a0
parent1361a863dfbb4b0c15125b459baad5669747838e (diff)
downloadupstream-4eb55d71de06f344e57f2454c2df05ff89b5c62e.tar.gz
upstream-4eb55d71de06f344e57f2454c2df05ff89b5c62e.tar.bz2
upstream-4eb55d71de06f344e57f2454c2df05ff89b5c62e.zip
conntrack-tools: split into conntrack/conntrackd
as conntrack and conntrackd are completely independent programs, serving a different purpose. Also split by other distributions, as Debian and Ubuntu. Signed-off-by: Ulrich Weber <uw@ocedo.com> SVN-Revision: 47424
-rw-r--r--package/network/utils/conntrack-tools/Makefile47
1 files changed, 31 insertions, 16 deletions
diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
index 390cae53a4..7dd64b67a1 100644
--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -30,34 +30,49 @@ PKG_BUILD_DEPENDS:=librpc
include $(INCLUDE_DIR)/package.mk
-define Package/conntrack-tools
+TARGET_CFLAGS += -D_GNU_SOURCE=1
+
+define Package/conntrack-tools/default
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libnetfilter-conntrack +libnetfilter-cttimeout +libnetfilter-cthelper +libnetfilter-queue
SUBMENU:=Firewall
- TITLE:=Connection tracking userspace tools
URL:=http://conntrack-tools.netfilter.org/
endef
-define Package/conntrack-tools/description
- The conntrack-tools are a set of free software userspace tools for Linux
- that allow system administrators interact with the Connection Tracking
- System, which is the module that provides stateful packet inspection for
- iptables. The conntrack-tools are the userspace daemon conntrackd and the
- command line interface conntrack.
+define Package/conntrack
+$(call Package/conntrack-tools/default)
+ TITLE:=Connection tracking tool
endef
-TARGET_CFLAGS += -D_GNU_SOURCE=1
+define Package/conntrack/description
+ Conntrack is a userspace command line program targeted at system
+ administrators. It enables them to view and manage the in-kernel
+ connection tracking state table.
+endef
+
+define Package/conntrack/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/conntrack $(1)/usr/sbin/
+endef
+
+define Package/conntrackd
+$(call Package/conntrack-tools/default)
+ TITLE:=Connection tracking daemon
+endef
+
+define Package/conntrackd/description
+ Conntrackd can replicate the status of the connections that are
+ currently being processed by your stateful firewall based on Linux.
+ Conntrackd can also run as statistics daemon.
+endef
-define Package/conntrack-tools/install
- $(INSTALL_DIR) $(1)/etc/conntrackd
+define Package/conntrackd/install
$(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) \
- $(PKG_INSTALL_DIR)/usr/sbin/conntrack \
- $(PKG_INSTALL_DIR)/usr/sbin/conntrackd \
- $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/conntrackd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/conntrackd.init $(1)/etc/init.d/conntrackd
endef
-$(eval $(call BuildPackage,conntrack-tools))
+$(eval $(call BuildPackage,conntrack))
+$(eval $(call BuildPackage,conntrackd))