diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/libs/libnetfilter-conntrack | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/libs/libnetfilter-conntrack')
| -rw-r--r-- | package/libs/libnetfilter-conntrack/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile index 849927799..43413a713 100644 --- a/package/libs/libnetfilter-conntrack/Makefile +++ b/package/libs/libnetfilter-conntrack/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetfilter_conntrack -PKG_VERSION:=0.9.1 +PKG_VERSION:=1.0.3 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:=b7506cbb7580433859809d8eac53a199 +PKG_MD5SUM:=73394a3d8d0cfecc6abb6027b4792d52 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_FIXUP:=autoreconf @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libnetfilter-conntrack SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libnfnetlink +kmod-nf-conntrack-netlink + DEPENDS:=+libnfnetlink +kmod-nf-conntrack-netlink +libmnl TITLE:=API to the in-kernel connection tracking state table URL:=http://www.netfilter.org/projects/libnetfilter_conntrack/ endef |