# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1334772652 25200
# Node ID 0efb89d4efa52dca0ff5bd0199750b0dde555953
# Parent  9d5e4d6466cdbde01f768a9feda759b760038e63
7161382 Update unrar to version 4.1.4

diff -r 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/Makefile
--- a/components/unrar/Makefile	Wed Apr 18 11:08:05 2012 -0700
+++ b/components/unrar/Makefile	Wed Apr 18 11:10:52 2012 -0700
@@ -28,11 +28,11 @@
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		unrar
-COMPONENT_VERSION=	3.8.5
+COMPONENT_VERSION=	4.1.4
 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=	sha1:911d3ef2c279d9522afa22b452176dd86883a751
+COMPONENT_ARCHIVE_HASH=	sha1:ae4b1e2c99e96527c4a97f980daa547499f42a0f
 COMPONENT_ARCHIVE_URL=	http://www.rarlab.com/rar/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
diff -r 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/patches/01.x86.patch
--- a/components/unrar/patches/01.x86.patch	Wed Apr 18 11:08:05 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- os.hpp.old	Wed Mar 25 07:26:03 2009
-+++ os.hpp	Wed Mar 25 07:40:39 2009
-@@ -228,6 +228,19 @@
-   #endif
- #endif
- 
-+#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
-+  #if defined(__i386) || defined(i386) || defined(__i386__)
-+    #define LITTLE_ENDIAN
-+  #elif defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN
-+    #define LITTLE_ENDIAN
-+  #elif defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN
-+    #define BIG_ENDIAN
-+  #else
-+    #error "Neither LITTLE_ENDIAN nor BIG_ENDIAN are defined. Define one of them."
-+  #endif
-+#endif
-+
-+
- #if !defined(BIG_ENDIAN) && !defined(_WIN_CE) && defined(_WIN_32)
- /* allow not aligned integer access, increases speed in some operations */
- #define ALLOW_NOT_ALIGNED_INT
diff -r 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/patches/02.getpass.patch
--- a/components/unrar/patches/02.getpass.patch	Wed Apr 18 11:08:05 2012 -0700
+++ b/components/unrar/patches/02.getpass.patch	Wed Apr 18 11:10:52 2012 -0700
@@ -1,11 +1,11 @@
---- consio.cpp.orig	Tue Jun  7 16:00:37 2011
-+++ consio.cpp	Tue Jun  7 16:01:33 2011
-@@ -124,7 +124,7 @@
-   OemToChar(Str,Str);
-   SetConsoleMode(hConIn,ConInMode);
+--- 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);
--#elif defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS)
-+#elif defined(_EMX) || defined(_BEOS) || defined (__VMS)
-   fgets(Str,MaxLength-1,stdin);
  #else
-   strncpyz(Str,getpass(""),MaxLength);
+   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 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/patches/03.makefile.unix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/unrar/patches/03.makefile.unix.patch	Wed Apr 18 11:10:52 2012 -0700
@@ -0,0 +1,13 @@
+--- 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
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ STRIP=strip
+ DESTDIR=/usr
diff -r 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/patches/04.options.hpp.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/unrar/patches/04.options.hpp.patch	Wed Apr 18 11:10:52 2012 -0700
@@ -0,0 +1,11 @@
+--- options.hpp.orig	2012-04-17 10:53:02.384081275 -0700
++++ options.hpp	2012-04-17 10:53:11.332633173 -0700
+@@ -35,7 +35,7 @@
+   RECURSE_NONE=0,    // no recurse switches
+   RECURSE_DISABLE,   // switch -r-
+   RECURSE_ALWAYS,    // switch -r
+-  RECURSE_WILDCARDS, // switch -r0
++  RECURSE_WILDCARDS  // switch -r0
+ };
+ 
+ enum OVERWRITE_MODE 
diff -r 9d5e4d6466cd -r 0efb89d4efa5 components/unrar/unrar.license
--- a/components/unrar/unrar.license	Wed Apr 18 11:08:05 2012 -0700
+++ b/components/unrar/unrar.license	Wed Apr 18 11:10:52 2012 -0700
@@ -1,3 +1,9 @@
+---------------
+- unrar 4.1.4 -
+---------------
+
+Oracle Internal Tracking Number 4581
+
  ******    *****   ******   UnRAR - free utility for RAR archives
  **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ******   *******  ******    License for use and distribution of