diff options
-rw-r--r-- | package/libs/libnftnl/Makefile | 14 | ||||
-rw-r--r-- | package/network/utils/nftables/Makefile | 16 | ||||
-rw-r--r-- | package/network/utils/nftables/patches/100-disable-doc-generation.patch | 8 |
3 files changed, 11 insertions, 27 deletions
diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 6919788e49..9af418d0e1 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2014-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,18 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl -PKG_VERSION:=1.0.3 +PKG_VERSION:=1.0.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=git://git.netfilter.org/libnftnl -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=libnftnl-1.0.3 -PKG_MAINTAINER:=Steven Barth <steven@midlink.org> -PKG_LICENSE:=GPL-2.0+ +PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnftnl/ +PKG_MD5SUM:=6d7f9f161538ca7efd535dcc70caf964 -PKG_FIXUP:=autoreconf +PKG_LICENSE:=GPL-2.0+ PKG_INSTALL:=1 diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 96db6fff70..b98e9fb8b5 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,18 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables -PKG_VERSION:=0.4+2015-04-09 +PKG_VERSION:=0.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=git://git.netfilter.org/nftables -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=3ed296118a065caff5600e60d4f7ef18e137f9a0 -PKG_MAINTAINER:=Steven Barth <steven@midlink.org> -PKG_LICENSE:=GPL-2.0 +PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/nftables +PKG_MD5SUM:=fd320e35fdf14b7be795492189b13dae -PKG_FIXUP:=autoreconf +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk @@ -31,7 +27,7 @@ define Package/nftables CATEGORY:=Network SUBMENU:=Firewall TITLE:=nftables packet filtering userspace utility - DEPENDS:=+kmod-nft-core +kmod-nft-nat +libnftnl + DEPENDS:=+kmod-nft-core +kmod-nft-nat +libnftnl +libmnl URL:=http://netfilter.org/projects/nftables/ endef diff --git a/package/network/utils/nftables/patches/100-disable-doc-generation.patch b/package/network/utils/nftables/patches/100-disable-doc-generation.patch deleted file mode 100644 index bcbffe25c7..0000000000 --- a/package/network/utils/nftables/patches/100-disable-doc-generation.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,5 +2,4 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = src \ - include \ -- doc \ - files |