From a126dabb93655e4daea3bba5753fa2d573f8242e Mon Sep 17 00:00:00 2001
From: Ted Hess <thess@kitschensync.net>
Date: Wed, 13 Dec 2017 15:39:35 -0500
Subject: [PATCH] unrar: Update to latest version (5.5.8)

11-Aug-2017 version fixes outstanding CVE's.
CVE-2012-6706, CVE-2017-12942, CVE-2017-12941, CVE-2017-12940 and CVE-2017-12938

Signed-off-by: Ted Hess <thess@kitschensync.net>
---
 utils/unrar/Makefile                         | 9 ++++-----
 utils/unrar/patches/100-makefile_fixes.patch | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile
index 31ba4a57b2..9d8f25eafe 100644
--- a/utils/unrar/Makefile
+++ b/utils/unrar/Makefile
@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
-#
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
@@ -8,13 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unrar
-PKG_VERSION:=5.4.5
+PKG_VERSION:=5.5.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.rarlab.com/rar
-PKG_HASH:=e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+PKG_HASH:=9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \
+		Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=UnRAR
 PKG_LICENSE_FILES:=license.txt
diff --git a/utils/unrar/patches/100-makefile_fixes.patch b/utils/unrar/patches/100-makefile_fixes.patch
index ae4c62386e..82205ea269 100644
--- a/utils/unrar/patches/100-makefile_fixes.patch
+++ b/utils/unrar/patches/100-makefile_fixes.patch
@@ -1,6 +1,6 @@
 --- a/makefile
 +++ b/makefile
-@@ -2,12 +2,12 @@
+@@ -2,13 +2,13 @@
  # Makefile for UNIX - unrar
  
  # Linux using GCC
@@ -11,17 +11,18 @@
  LIBFLAGS=-fPIC
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
  STRIP=strip
+ AR=ar
 -LDFLAGS=-pthread
 +LDFLAGS=-lpthread
  DESTDIR=/usr
  
  # Linux using LCC
-@@ -142,7 +142,7 @@ uninstall-unrar:
+@@ -166,7 +166,7 @@ uninstall-unrar:
  			rm -f $(DESTDIR)/bin/unrar
  
  install-lib:
 -		install libunrar.so $(DESTDIR)/lib
 +		install -D libunrar.so $(DESTDIR)/lib/libunrar.so
+ 		install libunrar.a $(DESTDIR)/lib
  
  uninstall-lib:
- 		rm -f $(DESTDIR)/lib/libunrar.so
-- 
2.30.2