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>

SVN-Revision: 39647
master
Jo-Philipp Wich 11 years ago
parent 12fa3eae23
commit 21f4cf1a73
  1. 6
      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>

Loading…
Cancel
Save