diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/kernel/linux/modules/crypto.mk | 9 | ||||
-rw-r--r-- | package/libs/libnftnl/Makefile | 14 | ||||
-rw-r--r-- | package/network/config/firewall/Makefile | 7 | ||||
-rw-r--r-- | package/network/utils/iptables/patches/500-add-xt_id-match.patch | 69 | ||||
-rw-r--r-- | package/network/utils/nftables/Makefile | 16 | ||||
-rw-r--r-- | package/network/utils/nftables/patches/100-disable-doc-generation.patch | 8 | ||||
-rw-r--r-- | package/system/ca-certificates/Makefile | 4 |
7 files changed, 20 insertions, 107 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index cc62f2cc27..f11ebd931a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -123,12 +123,11 @@ $(eval $(call KernelPackage,crypto-rng)) define KernelPackage/crypto-iv TITLE:=CryptoAPI initialization vectors DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq - KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 CONFIG_CRYPTO_ECHAINIV + KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 FILES:= \ - $(LINUX_DIR)/crypto/eseqiv.ko \ - $(LINUX_DIR)/crypto/chainiv.ko \ - $(LINUX_DIR)/crypto/echainiv.ko@ge4.3 - AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv echainiv@ge4.3) + $(LINUX_DIR)/crypto/eseqiv.ko@lt4.8 \ + $(LINUX_DIR)/crypto/chainiv.ko@lt4.8 + AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv) $(call AddDepends/crypto) endef 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/config/firewall/Makefile b/package/network/config/firewall/Makefile index 73dae29468..f9fa9116b6 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -8,15 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_VERSION:=2016-01-29 -PKG_RELEASE:=$(PKG_SOURCE_VERSION) +PKG_VERSION:=2016-11-06 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/firewall3.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=8957be6c026858fe414aef69281d8aa06f7ea122 +PKG_SOURCE_VERSION:=bd40ba4584141ce34f3d5c42841abafccad06bdd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_LICENSE:=ISC PKG_CONFIG_DEPENDS := CONFIG_IPV6 diff --git a/package/network/utils/iptables/patches/500-add-xt_id-match.patch b/package/network/utils/iptables/patches/500-add-xt_id-match.patch deleted file mode 100644 index 0964f0175f..0000000000 --- a/package/network/utils/iptables/patches/500-add-xt_id-match.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- /dev/null -+++ b/extensions/libxt_id.c -@@ -0,0 +1,55 @@ -+/* Shared library add-on to iptables to add id match support. */ -+ -+#include <stdio.h> -+#include <xtables.h> -+#include <linux/netfilter/xt_id.h> -+ -+enum { -+ O_ID = 0, -+}; -+ -+static const struct xt_option_entry id_opts[] = { -+ { -+ .name = "id", -+ .id = O_ID, -+ .type = XTTYPE_UINT32, -+ .flags = XTOPT_MAND | XTOPT_PUT, -+ XTOPT_POINTER(struct xt_id_info, id) -+ }, -+ XTOPT_TABLEEND, -+}; -+ -+static void -+id_print(const void *ip, const struct xt_entry_match *match, int numeric) -+{ -+ struct xt_id_info *idinfo = (void *)match->data; -+ -+ printf(" ID:%08lx", idinfo->id); -+} -+ -+ -+/* Saves the union ipt_matchinfo in parsable form to stdout. */ -+static void -+id_save(const void *ip, const struct xt_entry_match *match) -+{ -+ struct xt_id_info *idinfo = (void *)match->data; -+ -+ printf(" --id 0x%lx", idinfo->id); -+} -+ -+static struct xtables_match id_match = { -+ .family = NFPROTO_UNSPEC, -+ .name = "id", -+ .version = XTABLES_VERSION, -+ .size = XT_ALIGN(sizeof(struct xt_id_info)), -+ .userspacesize = XT_ALIGN(sizeof(struct xt_id_info)), -+ .print = id_print, -+ .save = id_save, -+ .x6_parse = xtables_option_parse, -+ .x6_options = id_opts, -+}; -+ -+void _init(void) -+{ -+ xtables_register_match(&id_match); -+} ---- /dev/null -+++ b/include/linux/netfilter/xt_id.h -@@ -0,0 +1,8 @@ -+#ifndef _XT_ID_H -+#define _XT_ID_H -+ -+struct xt_id_info { -+ __u32 id; -+}; -+ -+#endif /* XT_ID_H */ 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 diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index 8590952154..980f61a4c1 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20160104 +PKG_VERSION:=20161102 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates -PKG_MD5SUM:=d9665a83d0d3ef8176a38e6aa20458e9 +PKG_MD5SUM:=74642bd9b9e0a449fa55e6632070745f PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_INSTALL:=1 |