From patchwork Wed Nov 4 16:56:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weber X-Patchwork-Id: 540071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 92208140770 for ; Thu, 5 Nov 2015 04:01:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ipkNySZI; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 335AE28BF85; Wed, 4 Nov 2015 17:57:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id DE35328BE45 for ; Wed, 4 Nov 2015 17:56:02 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 4 Nov 2015 17:56:01 +0100 (CET) Received: by wmeg8 with SMTP id g8so115836724wme.0 for ; Wed, 04 Nov 2015 08:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w/NLyqfYhIPRZiaXqOBKOlLwj5JSf9ZFJ62vsI8BOOI=; b=ipkNySZICHZk58yTN29x0IIeeL3Wqy+WBg02FBijM+pB0QW9E3yVXFqL+rwIR62YxO qc3KLcIeFPzlZO0LJ2cxTkKBqH6SJhAK9CIkQVQP658Xb24gx6m/rjVmEKWWy528jwm5 QyfdG9QonoDSVfL3jQKJFVHVAFKdWh1b4nb4Shb6cfgtMvgaMHi36Vnq93VBCBZxOpO6 8vuBhS9Dk5CQkrdEPNyEP7uTj/f45MQ0vdUH+WijnppK3Qg3Vha0JMBdLygmV2o3ya/J P/Q7w5S/O9D3di2SFVMoZr03duCI73v4m4qfz+Ev/ztY8L3L0TmKCyHtvfPIjvJPWrK4 TZ8g== X-Received: by 10.28.173.76 with SMTP id w73mr4983008wme.62.1446656268852; Wed, 04 Nov 2015 08:57:48 -0800 (PST) Received: from localhost.localdomain ([5.158.136.57]) by smtp.googlemail.com with ESMTPSA id gd10sm2453443wjb.47.2015.11.04.08.57.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 08:57:48 -0800 (PST) From: Ulrich Weber X-Google-Original-From: Ulrich Weber To: openwrt-devel@lists.openwrt.org Date: Wed, 4 Nov 2015 17:56:52 +0100 Message-Id: <1446656212-20082-3-git-send-email-uw@ocedo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446656212-20082-1-git-send-email-uw@ocedo.com> References: <1446656212-20082-1-git-send-email-uw@ocedo.com> Cc: Ulrich Weber Subject: [OpenWrt-Devel] [PATCH 3/3] conntrack-tools: split into conntrack/conntrackd X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- package/network/utils/conntrack-tools/Makefile | 47 +++++++++++++++++--------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 390cae5..7dd64b6 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))