diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-28 10:19:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-28 10:19:26 +0000 |
| commit | 2d13d8dc767142e4b75aabd9264e2749518b1d28 (patch) | |
| tree | 0097293029d564894f98ef72d7b8e910a3371df6 /package/network | |
| parent | 5441f566859a350f970d5aad510b950ee6d9f502 (diff) | |
| download | upstream-2d13d8dc767142e4b75aabd9264e2749518b1d28.tar.gz upstream-2d13d8dc767142e4b75aabd9264e2749518b1d28.tar.bz2 upstream-2d13d8dc767142e4b75aabd9264e2749518b1d28.zip | |
conntrack-tools: update package (along with associated libraries) to the latest version, fix musl build issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45077
Diffstat (limited to 'package/network')
3 files changed, 15 insertions, 13 deletions
diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index c697d6565c..6a47095a7d 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.0.0 +PKG_VERSION:=1.4.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -16,7 +16,7 @@ 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:=5add24d4761baf17af630d5627a71752 +PKG_MD5SUM:=b1f9d006e7bf000a77395ff7cd3fac16 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_LICENSE:=GPL-2.0 @@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk define Package/conntrack-tools SECTION:=net CATEGORY:=Network - DEPENDS:=+libnetfilter-conntrack + DEPENDS:=+libnetfilter-conntrack +libnetfilter-cttimeout +libnetfilter-cthelper +libnetfilter-queue SUBMENU:=Firewall TITLE:=Connection tracking userspace tools URL:=http://conntrack-tools.netfilter.org/ @@ -49,6 +49,8 @@ define Package/conntrack-tools/conffiles /etc/conntrackd/conntrackd.conf endef +TARGET_CFLAGS += -D_GNU_SOURCE=1 + define Package/conntrack-tools/install $(INSTALL_DIR) $(1)/etc/conntrackd $(INSTALL_CONF) \ diff --git a/package/network/utils/conntrack-tools/patches/100-compile_fix.patch b/package/network/utils/conntrack-tools/patches/100-compile_fix.patch deleted file mode 100644 index 492f88facc..0000000000 --- a/package/network/utils/conntrack-tools/patches/100-compile_fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/parse.c -+++ b/src/parse.c -@@ -16,6 +16,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include <stdlib.h> - #include "network.h" - - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> diff --git a/package/network/utils/conntrack-tools/patches/100-missing_include.patch b/package/network/utils/conntrack-tools/patches/100-missing_include.patch new file mode 100644 index 0000000000..a4c7f9b625 --- /dev/null +++ b/package/network/utils/conntrack-tools/patches/100-missing_include.patch @@ -0,0 +1,10 @@ +--- a/include/mcast.h ++++ b/include/mcast.h +@@ -4,6 +4,7 @@ + #include <stdint.h> + #include <netinet/in.h> + #include <net/if.h> ++#include <sys/select.h> + + struct mcast_conf { + int ipproto; |