# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1460771153 25200
# Node ID b6c18cf8ca8180895921e9e092751b82b9f129ee
# Parent  baf73b0669cebb95d2e8a6b7b93969450e38e1a7
23094105 Upgrade unrar to 5.3.1 or newer

diff -r baf73b0669ce -r b6c18cf8ca81 components/unrar/Makefile
--- a/components/unrar/Makefile	Fri Apr 15 14:44:19 2016 -0700
+++ b/components/unrar/Makefile	Fri Apr 15 18:45:53 2016 -0700
@@ -28,15 +28,15 @@
 PATH=$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN):$(USRSBINDIR)
 
 COMPONENT_NAME=		unrar
-COMPONENT_VERSION=	4.2.4
+COMPONENT_VERSION=	5.3.1
 COMPONENT_SRC=		$(COMPONENT_NAME)
 COMPONENT_PROJECT_URL=	http://www.rarlabs.com/rar_add.htm
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)src-$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686
+    sha256:81303fdadb4e1322a4ff2dd4b2d5c28439dd077b982bf4d142aa1ce2a21966b2
 COMPONENT_ARCHIVE_URL=	http://www.rarlab.com/rar/$(COMPONENT_ARCHIVE)
 
-TPNO=			18537
+TPNO=			27800
 
 # We need this before the default PKG_PROTO_DIRS, so set it before we include
 # common.mk, which will append the default set.
@@ -58,8 +58,12 @@
 
 COMPONENT_BUILD_ENV += DEFINES="$(CPP_LARGEFILES)"
 
-COMPONENT_BUILD_ARGS += -f makefile.unix
+COMPONENT_BUILD_ARGS += -f makefile
 COMPONENT_BUILD_ARGS += STRIP="/bin/true"
+# Override component makefile flags.
+COMPONENT_BUILD_ARGS += CXX="$(CXX)"
+COMPONENT_BUILD_ARGS += CXXFLAGS="$(CXXFLAGS)"
+COMPONENT_BUILD_ARGS += LDFLAGS="$(LDFLAGS)"
 
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/math
diff -r baf73b0669ce -r b6c18cf8ca81 components/unrar/patches/02.getpass.patch
--- a/components/unrar/patches/02.getpass.patch	Fri Apr 15 14:44:19 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- consio.cpp.orig	2012-04-17 08:23:59.905765212 -0700
-+++ consio.cpp	2012-04-17 08:25:47.074246361 -0700
-@@ -141,7 +141,7 @@
-   SetConsoleMode(hConOut,ConOutMode);
- #else
-   char StrA[MAXPASSWORD];
--#if defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS)
-+#if defined(_EMX) || defined(_BEOS) || defined (__VMS)
-   fgets(StrA,ASIZE(StrA)-1,stdin);
- #else
-   strncpyz(StrA,getpass(""),ASIZE(StrA));
diff -r baf73b0669ce -r b6c18cf8ca81 components/unrar/patches/03.makefile.unix.patch
--- a/components/unrar/patches/03.makefile.unix.patch	Fri Apr 15 14:44:19 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- makefile.unix.orig	2012-04-17 08:41:42.407887047 -0700
-+++ makefile.unix	2012-04-17 08:42:02.572836478 -0700
-@@ -6,8 +6,8 @@
- #
- 
- # Linux using GCC
--CXX=g++
--CXXFLAGS=-O2
-+#CXX=g++
-+#CXXFLAGS=-O2
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- STRIP=strip