diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-02-20 23:20:10 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-02-20 23:20:10 +0000 |
| commit | 75f88cf3fe6f292b3bc2adb83747b95e07096be2 (patch) | |
| tree | 6251109b8ed9ca84422a10a551a091c5f9d73318 /package | |
| parent | 873b6c31ed4741c9d5a69ae7f8afa95d7e0d1a21 (diff) | |
| download | upstream-75f88cf3fe6f292b3bc2adb83747b95e07096be2.tar.gz upstream-75f88cf3fe6f292b3bc2adb83747b95e07096be2.tar.bz2 upstream-75f88cf3fe6f292b3bc2adb83747b95e07096be2.zip | |
firewall: fix several ipset integration issues (#15016)
- Do not consider bitmap storage for IPv6 family sets
- Move ipset family parameter before any additional option
- Only emit family parameter for hash sets
- Do not allow IPv6 iprange for IPv4 sets and vice versa
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39647 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/config/firewall/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 872f217e18..8c851641e7 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2013-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_VERSION:=2013-12-17 +PKG_VERSION:=2014-02-21 PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/firewall3.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=8002b8454f9e33042aec8b9ab6346f3a4dd92994 +PKG_SOURCE_VERSION:=7dfc240dfaee099eab04bd18369edb11dfbb5045 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> |