001-timeout-size.patch fixed upstream Signed-off-by: Erik Rigtorp <e...@rigtorp.se> --- package/network/utils/ipset/Makefile | 6 ++--- .../utils/ipset/patches/001-timeout-size.patch | 28 ---------------------- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 package/network/utils/ipset/patches/001-timeout-size.patch
diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index 71045e4..29ee48f 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -1,5 +1,5 @@ -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=6.20.1 +PKG_VERSION:=6.21.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_MD5SUM:=8af741492752fbf24d3a28a9d1473d40 +PKG_MD5SUM:=9c136fd51694eb0ef259cda085145da0 PKG_MAINTAINER:=Jo-Philipp Wich <j...@openwrt.org> diff --git a/package/network/utils/ipset/patches/001-timeout-size.patch b/package/network/utils/ipset/patches/001-timeout-size.patch deleted file mode 100644 index b9ff4e2..0000000 --- a/package/network/utils/ipset/patches/001-timeout-size.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/lib/parse.c b/lib/parse.c -index 8ea8542..440ef8f 100644 ---- a/lib/parse.c -+++ b/lib/parse.c -@@ -1292,15 +1292,20 @@ ipset_parse_timeout(struct ipset_session *session, - enum ipset_opt opt, const char *str) - { - int err; -- unsigned long long num = 0; -+ unsigned long long llnum = 0; -+ uint32_t num = 0; - - assert(session); - assert(opt == IPSET_OPT_TIMEOUT); - assert(str); - -- err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &num); -- if (err == 0) -+ err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &llnum); -+ if (err == 0) { -+ /* Timeout is expected to be 32bits wide, so we have -+ to convert it here */ -+ num = llnum; - return ipset_session_data_set(session, opt, &num); -+ } - - return err; - } -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
