Update unrar to 5.6.4

7 files changed, 27 insertions, 48 deletions

diff --git a/data/unrar/_metadata/version b/data/unrar/_metadata/version
index 424e1794d..1f8428b5f 100644
--- a/data/unrar/_metadata/version
+++ b/data/unrar/_metadata/version
@@ -1 +1 @@
-3.6.8
+5.6.4
diff --git a/data/unrar/cross.diff b/data/unrar/cross.diff
new file mode 100644
index 000000000..ae1970710
--- /dev/null
+++ b/data/unrar/cross.diff
@@ -0,0 +1,18 @@
+diff -ur unrar/makefile unrar+iPhone/makefile
+--- unrar/makefile	2017-11-21 20:53:39.000000000 -1000
++++ unrar+iPhone/makefile	2018-08-06 11:47:39.000000000 -1000
+@@ -2,12 +2,12 @@
+ # Makefile for UNIX - unrar
+ 
+ # Linux using GCC
+-CXX=c++
++CXX?=c++
+ CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-AR=ar
++AR?=ar
+ LDFLAGS=-pthread
+ DESTDIR=/usr
+ 
diff --git a/data/unrar/exceptions.diff b/data/unrar/exceptions.diff
deleted file mode 100644
index 94062e15c..000000000
--- a/data/unrar/exceptions.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru unrar/errhnd.cpp unrar+iPhone/errhnd.cpp
---- unrar/errhnd.cpp	2006-08-04 18:32:40.000000000 +0000
-+++ unrar+iPhone/errhnd.cpp	2007-12-28 03:44:02.000000000 +0000
-@@ -321,7 +321,7 @@
-   throw Code;
- #else
-   File::RemoveCreated();
--  exit(Code);
-+  _exit(Code);
- #endif
- }
- 
-diff -ru unrar/errhnd.hpp unrar+iPhone/errhnd.hpp
---- unrar/errhnd.hpp	2006-08-04 18:32:40.000000000 +0000
-+++ unrar+iPhone/errhnd.hpp	2007-12-28 03:43:39.000000000 +0000
-@@ -1,11 +1,6 @@
- #ifndef _RAR_ERRHANDLER_
- #define _RAR_ERRHANDLER_
- 
--#if (defined(GUI) || !defined(_WIN_32)) && !defined(SFX_MODULE) && !defined(_WIN_CE) || defined(RARDLL)
--#define ALLOW_EXCEPTIONS
--#endif
--
--
- 
- #define rarmalloc malloc
- #define rarcalloc calloc
-diff -ru unrar/rar.cpp unrar+iPhone/rar.cpp
---- unrar/rar.cpp	2006-08-04 18:32:40.000000000 +0000
-+++ unrar+iPhone/rar.cpp	2007-12-28 03:41:09.000000000 +0000
-@@ -127,7 +127,7 @@
- #if defined(_EMX) && !defined(_DJGPP)
-   uni_done();
- #endif
--  return(ErrHandler.GetErrorCode());
-+  _exit(ErrHandler.GetErrorCode());
- }
- #endif
- 
diff --git a/data/unrar/make.sh b/data/unrar/make.sh
index d4a5d1755..8bf01bce8 100644
--- a/data/unrar/make.sh
+++ b/data/unrar/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
-make -f makefile.unix CXX="${PKG_TARG}-g++" all
+make CXX="${PKG_TARG}-g++" all
 pkg: mkdir -p /usr/bin
 pkg: cp -a unrar /usr/bin
diff --git a/data/unrar/strip.diff b/data/unrar/strip.diff
index 7773b0374..d71a404ea 100644
--- a/data/unrar/strip.diff
+++ b/data/unrar/strip.diff
@@ -1,17 +1,17 @@
-diff -ru unrar/makefile.unix unrar+iPhone/makefile.unix
---- unrar/makefile.unix	2005-04-30 07:00:12.000000000 +0000
-+++ unrar+iPhone/makefile.unix	2008-04-04 20:59:42.000000000 +0000
-@@ -105,13 +105,11 @@
- unrar:	$(OBJECTS) $(UNRAR_OBJ)
+diff -ur unrar/makefile unrar+iPhone/makefile
+--- unrar/makefile	2017-11-21 20:53:39.000000000 -1000
++++ unrar+iPhone/makefile	2018-08-06 11:47:39.000000000 -1000
+@@ -143,13 +143,11 @@
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
  	@rm -f unrar
  	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
 -	$(STRIP) unrar
  
  sfx:	WHAT=SFX_MODULE
- sfx:	$(OBJECTS)
+ sfx:	clean $(OBJECTS)
  	@rm -f default.sfx
  	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
 -	$(STRIP) default.sfx
  
  lib:	WHAT=RARDLL
- lib:	$(OBJECTS) $(LIB_OBJ)
+ lib:	CXXFLAGS+=$(LIBFLAGS)
diff --git a/data/unrar/unrarsrc-3.6.8.tar.gz b/data/unrar/unrarsrc-3.6.8.tar.gz
deleted file mode 100644
index bcc96b124..000000000
--- a/data/unrar/unrarsrc-3.6.8.tar.gz
+++ /dev/null
diff --git a/data/unrar/unrarsrc-5.6.4.tar.gz b/data/unrar/unrarsrc-5.6.4.tar.gz
new file mode 100644
index 000000000..7f555dbac
--- /dev/null
+++ b/data/unrar/unrarsrc-5.6.4.tar.gz