X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fnetwork%2Futils%2Fconntrack-tools%2FMakefile;h=95257c6c67582836cf0ab7184fdb54af89c9b5aa;hb=dc7c9f590a6295fad83b43e00f9b3301f5f06611;hp=7dd64b67a1eea16dabca4dfb44019ce7f0efd467;hpb=4eb55d71de06f344e57f2454c2df05ff89b5c62e;p=openwrt%2Fopenwrt.git

diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
index 7dd64b67a1..95257c6c67 100644
--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conntrack-tools
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -16,22 +16,18 @@ PKG_SOURCE_URL:= \
 	http://www.netfilter.org/projects/conntrack-tools/files \
 	ftp://ftp.netfilter.org/pub/conntrack-tools \
 	http://mirrors.evolva.ro/netfilter.org/conntrack-tools
-PKG_MD5SUM:=966a5d8f846ddf5304bcd12685c0707f
+PKG_MD5SUM:=b7caf4fcc4c03575df57d25e5216584d597fd916c891f191dac616ce68bdba6c
 
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
-TAR_OPTIONS += --exclude='*.rej'
-
 PKG_BUILD_DEPENDS:=librpc
 
 include $(INCLUDE_DIR)/package.mk
 
-TARGET_CFLAGS += -D_GNU_SOURCE=1
-
 define Package/conntrack-tools/default
   SECTION:=net
   CATEGORY:=Network
@@ -61,6 +57,10 @@ $(call Package/conntrack-tools/default)
   TITLE:=Connection tracking daemon
 endef
 
+define Package/conntrackd/conffiles
+/etc/conntrackd/
+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.
@@ -68,9 +68,11 @@ define Package/conntrackd/description
 endef
 
 define Package/conntrackd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) \
+		$(1)/etc/conntrackd \
+		$(1)/etc/init.d \
+		$(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