From 17fef37ff4353123135c02e4a07d107d04504ca6 Mon Sep 17 00:00:00 2001
From: Hirokazu MORIKAWA <morikw2@gmail.com>
Date: Thu, 18 Apr 2019 14:41:21 +0900
Subject: [PATCH] icu: [lede-17.01] support for new Japanese era Reiwa

support for new Japanese era Reiwa
change source url

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
---
 libs/icu/Makefile                     | 12 +++++++-----
 libs/icu/patches/CVE-2017-14952.patch | 10 ----------
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 libs/icu/patches/CVE-2017-14952.patch

diff --git a/libs/icu/Makefile b/libs/icu/Makefile
index 2fb0a8559..315f55ff7 100644
--- a/libs/icu/Makefile
+++ b/libs/icu/Makefile
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icu4c
-PKG_VERSION:=58.2
-PKG_RELEASE:=4
+MAJOR_VERSION:=58
+MINOR_VERSION:=3
+PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-58_2-src.tgz
-PKG_SOURCE_URL:=http://download.icu-project.org/files/$(PKG_NAME)/$(PKG_VERSION)
-PKG_MD5SUM:=fac212b32b7ec7ab007a12dff1f3aea1
+PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
+PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)
+PKG_MD5SUM:=bac4105dfa7c83468182c166caac15ec
 
 PKG_LICENSE:=ICU-1.8.1+
 PKG_LICENSE_FILES:=LICENSE
diff --git a/libs/icu/patches/CVE-2017-14952.patch b/libs/icu/patches/CVE-2017-14952.patch
deleted file mode 100644
index b1fc14485..000000000
--- a/libs/icu/patches/CVE-2017-14952.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: source/i18n/zonemeta.cpp
-===================================================================
---- source/i18n/zonemeta.cpp	(revision 40283)
-+++ source/i18n/zonemeta.cpp	(revision 40324)
-@@ -684,5 +684,4 @@
-                     if (U_FAILURE(status)) {
-                         delete mzMappings;
--                        deleteOlsonToMetaMappingEntry(entry);
-                         uprv_free(entry);
-                         break;