diff options
| author | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/conntrack-tools/conntrack-tools.mk | |
| parent | Kickoff 2012.08 cycle (diff) | |
| parent | nfs-utils: bump to version 1.2.6 (diff) | |
| download | buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.xz buildroot-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/conntrack-tools/conntrack-tools.mk')
| -rw-r--r-- | package/conntrack-tools/conntrack-tools.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 8b411279b..6b9ba52b1 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,9 +4,10 @@ # ############################################################# -CONNTRACK_TOOLS_VERSION = 1.0.1 +CONNTRACK_TOOLS_VERSION = 1.2.1 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files -CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config libnetfilter_conntrack +CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \ + libnetfilter_conntrack libnetfilter_cttimeout $(eval $(call AUTOTARGETS)) |