aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-11-23 14:45:04 +0100
committerGitHub <noreply@github.com>2016-11-23 14:45:04 +0100
commit91394735c934e4336bdc61490145342835efe693 (patch)
tree964f6d8dba81dd1e322fdbb4b4a13af04ce8afde
parentcc19f9d7fb09e2c62bec5b42ab5308caae73b96e (diff)
parentf419bd889598a68e8d8d37298a25e8901f3004d4 (diff)
downloadmaster-187ad058-91394735c934e4336bdc61490145342835efe693.tar.gz
master-187ad058-91394735c934e4336bdc61490145342835efe693.tar.bz2
master-187ad058-91394735c934e4336bdc61490145342835efe693.zip
Merge pull request #212 from seragh/owrt-conntrack-tools-1.4.4
conntrack-tools: bump to 1.4.4
-rw-r--r--package/libs/libnetfilter-conntrack/Makefile8
-rw-r--r--package/network/utils/conntrack-tools/Makefile12
2 files changed, 6 insertions, 14 deletions
diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile
index e60b59ab15..6c8b763eac 100644
--- a/package/libs/libnetfilter-conntrack/Makefile
+++ b/package/libs/libnetfilter-conntrack/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009-2013 OpenWrt.org
+# Copyright (C) 2009-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,17 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libnetfilter_conntrack
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \
ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/
-PKG_MD5SUM:=18cf80c4b339a3285e78822dbd4f08d7
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_MD5SUM:=7139c5f408dd9606ffecfd5dcda8175b
-PKG_FIXUP:=autoreconf
PKG_LICENSE:=GPL-2.0+
PKG_INSTALL:=1
diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
index fd13e222a9..868f9604de 100644
--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -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,16 @@ 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:=acd9e0b27cf16ae3092ba900e4d7560e
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
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