p7zip-17.04-1.parabola1: updating version

5 files changed, 235 insertions, 295 deletions

diff --git a/libre/p7zip/CVE-2016-9296.patch b/libre/p7zip/CVE-2016-9296.patch
deleted file mode 100644
index 773f92a46..000000000
--- a/libre/p7zip/CVE-2016-9296.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./CPP/7zip/Archive/7z/7zIn.cpp.orig	2016-11-21 01:42:29.460901230 +0000
-+++ ./CPP/7zip/Archive/7z/7zIn.cpp	2016-11-21 01:42:57.481197725 +0000
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
-       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
-         ThrowIncorrect();
-   }
--  HeadersSize += folders.PackPositions[folders.NumPackStreams];
-+  if (folders.PackPositions)
-+      HeadersSize += folders.PackPositions[folders.NumPackStreams];
-   return S_OK;
- }
- 
diff --git a/libre/p7zip/CVE-2017-17969.patch b/libre/p7zip/CVE-2017-17969.patch
deleted file mode 100644
index ebc0ac93e..000000000
--- a/libre/p7zip/CVE-2017-17969.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 79bca880ce7bcf07216c45f93afea545e0344418 Mon Sep 17 00:00:00 2001
-From: aone <aone@keka.io>
-Date: Mon, 5 Feb 2018 13:01:09 +0100
-Subject: [PATCH] Security fix CVE-2017-17969
-
----
- CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
-index 80b7e67..5bb0559 100644
---- a/CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-     {
-       _stack[i++] = _suffixes[cur];
-       cur = _parents[cur];
-+	  if (cur >= kNumItems || i >= kNumItems)
-+	  	break;
-     }
-+	
-+	if (cur >= kNumItems || i >= kNumItems)
-+		break;
-     
-     _stack[i++] = (Byte)cur;
-     lastChar2 = (Byte)cur;
diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index f7c09510a..7619db131 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -1,40 +1,38 @@
-# $Id: PKGBUILD 288091 2017-02-05 19:09:19Z foutrelis $
 # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
 # Contributor (Arch): Thayer Williams <thayer@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
-# Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
+# Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _pkgname=p7zip-libre
 pkgname=p7zip
-pkgver=16.02
-pkgrel=5.parabola1
+pkgver=17.04
+pkgrel=1
+pkgrel+=.parabola1
 pkgdesc="Command-line file archiver with high compression ratio"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://p7zip.sourceforge.net/"
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+url="https://github.com/jinfeihan57/p7zip"
 license=('LGPL')
 conflicts=('p7zip-libre')
 replaces=('p7zip-libre')
 depends=('gcc-libs' 'sh')
-makedepends_i686=('nasm')
-makedepends_x86_64=('yasm')
-install=$pkgname.install
-mksource=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2)
-source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2
-        CVE-2016-9296.patch
-        CVE-2017-17969.patch
+source=(https://github.com/jinfeihan57/p7zip/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
+        oemcp-iconv.patch::https://github.com/jinfeihan57/p7zip/commit/c104127e6a93.patch
+        oemcp-cygwin.patch::https://github.com/jinfeihan57/p7zip/commit/0e0a1a8316b6.patch
+        oemcp-apple.patch::https://github.com/jinfeihan57/p7zip/commit/334a01e3f8bc.patch
         libre.patch)
-mksha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
-sha256sums=('486e5784de9284c7123b401b3f27e684af772d03fc1fb8cdbbefb8123dc9f841'
-            'f9bcbf21d4aa8938861a6cba992df13dec19538286e9ed747ccec6d9a4e8f983'
-            'c6af5ba588b8932a5e99f3741fcf1011b7c94b533de903176c7d1d4c02a9ebef'
-            'feeeb3b1b7a827b7a675d6c8a363ea6c2499a4f04b3160c7e8d7bba42e0b3c15')
+sha256sums=('ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef'
+            'e32636aa03b9c75a2b9d9138e03a738ceed6ca5da4c3c67e7f5981e135fb9e24'
+            'fa658d42cc1da2b567a210a819502bd8e3bb1e02d5d23e087e2278c4aaffe15e'
+            'a1b21ceb5582633d85d41ec9e4995f758cba1731dd80fb6f45a7bc6b18bfe394'
+            '5dd8986cbc8541b9197235163d1bc63cc04956bf8256a5473f9682dfdf6843c1')
 
-mksource() {
-  cd "${srcdir}/${pkgname}_${pkgver}"
+prepare() {
+  cd $pkgname-$pkgver
 
   # Remove nonfree unRAR utility files from the source
   rm -rv CPP/7zip/{Archive,Compress}/Rar
@@ -45,36 +43,23 @@ mksource() {
 
   # Remove nonfree parent folder icon
   rm CPP/7zip/UI/FileManager/res/ParentFolder.h
-}
-
-prepare() {
-  cd "$srcdir/${pkgname}_$pkgver"
-
-  # https://sourceforge.net/p/p7zip/bugs/185/
-  patch -Np1 -i ../CVE-2016-9296.patch
-
-  # https://sourceforge.net/p/p7zip/bugs/204/
-  patch -Np1 -i ../CVE-2017-17969.patch
-
-  if [[ $CARCH = x86_64 ]]; then
-    cp makefile.linux_amd64_asm makefile.machine
-  elif [[ $CARCH = i686 ]]; then
-    cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-  else
-    cp makefile.linux_any_cpu_gcc_4.X makefile.machine
-  fi
 
   # Remove RAR and parent folder icon references
   patch -Np1 -i ../libre.patch
+  
+  # https://github.com/jinfeihan57/p7zip/issues/112
+  patch -Rp1 -i ../oemcp-apple.patch
+  patch -Rp1 -i ../oemcp-cygwin.patch
+  patch -Rp1 -i ../oemcp-iconv.patch
 }
 
 build() {
-  cd "$srcdir/${pkgname}_$pkgver"
-  make all3 OPTFLAGS="$CFLAGS"
+  cd $pkgname-$pkgver
+  make OPTFLAGS="$CPPFLAGS $CFLAGS" 7z 7zr 7za
 }
 
 package() {
-  cd "$srcdir/${pkgname}_$pkgver"
+    cd $pkgname-$pkgver
 
   make install \
     DEST_DIR="$pkgdir" \
diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch
index f9c782b93..be927433a 100644
--- a/libre/p7zip/libre.patch
+++ b/libre/p7zip/libre.patch
@@ -1,5 +1,5 @@
 diff --git a/C/Sha1.c b/C/Sha1.c
-index 55c1c63..48b4c5d 100644
+index 96b5e78..7772b4c 100644
 --- a/C/Sha1.c
 +++ b/C/Sha1.c
 @@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest)
@@ -33,7 +33,7 @@ index 55c1c63..48b4c5d 100644
 -
 -  if (returnRes)
 -  {
--    unsigned i;
+-    size_t i;
 -    for (i = 0 ; i < SHA1_NUM_BLOCK_WORDS; i++)
 -      data[i] = W[kNumW - SHA1_NUM_BLOCK_WORDS + i];
 -  }
@@ -72,7 +72,7 @@ index 55c1c63..48b4c5d 100644
 -      Sha1_UpdateBlock_Rar(p, p->buffer, returnRes);
 -      if (returnRes)
 -      {
--        unsigned i;
+-        size_t i;
 -        for (i = 0; i < SHA1_NUM_BLOCK_WORDS; i++)
 -        {
 -          UInt32 d = p->buffer[i];
@@ -103,107 +103,107 @@ index aa22ec3..9c45653 100644
  void Sha1_32_Update(CSha1 *p, const UInt32 *data, size_t size);
  void Sha1_32_Final(CSha1 *p, UInt32 *digest);
 diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp
-index a0571e7..43ad3e9 100644
+index 7c752ab..79019d4 100644
 --- a/CPP/7zip/Archive/7z/7zUpdate.cpp
 +++ b/CPP/7zip/Archive/7z/7zUpdate.cpp
-@@ -562,7 +562,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
+@@ -558,7 +558,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
  }
  
  static const char *g_Exts =
--  " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rar rpm sit zoo"
-+  " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rpm sit zoo"
+-  " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lz tlz lz4 tlz4 lzh lzo lzx pak rar rpm sit zoo zst"
++  " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lz tlz lz4 tlz4 lzh lzo lzx pak rpm sit zoo zst"
    " zip jar ear war msi"
    " 3gp avi mov mpeg mpg mpe wmv"
    " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav"
 diff --git a/CPP/7zip/Bundles/Format7zFree/makefile.list b/CPP/7zip/Bundles/Format7zFree/makefile.list
-index da2056b..1dcf1a5 100644
+index 83359b4..307e956 100644
 --- a/CPP/7zip/Bundles/Format7zFree/makefile.list
 +++ b/CPP/7zip/Bundles/Format7zFree/makefile.list
-@@ -87,8 +87,6 @@ SRCS=\
-   ../../../../CPP/7zip/Archive/PeHandler.cpp \
-   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
-   ../../../../CPP/7zip/Archive/QcowHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
-   ../../../../CPP/7zip/Archive/RpmHandler.cpp \
-   ../../../../CPP/7zip/Archive/SplitHandler.cpp \
-   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -191,9 +189,6 @@ SRCS=\
-   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
-   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
-   ../../../../CPP/7zip/Crypto/RandGen.cpp \
--  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
--  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
--  ../../../../CPP/7zip/Crypto/RarAes.cpp \
-   ../../../../CPP/7zip/Crypto/WzAes.cpp \
-   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
-   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
-@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp
- QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp
--RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
--	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
--Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
--	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
- RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp
- SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp
-@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
- RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp
--Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
--	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
--Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
--	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
--RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp
--	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp
- WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp
- 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp
- ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp
-@@ -869,8 +854,6 @@ OBJS=\
-  PeHandler.o \
-  PpmdHandler.o \
-  QcowHandler.o \
-- RarHandler.o \
-- Rar5Handler.o \
-  RpmHandler.o \
-  SplitHandler.o \
-  SquashfsHandler.o \
-@@ -973,9 +956,6 @@ OBJS=\
-  MyAesReg.o \
-  Pbkdf2HmacSha1.o \
-  RandGen.o \
-- Rar20Crypto.o \
-- Rar5Aes.o \
-- RarAes.o \
-  WzAes.o \
-  ZipCrypto.o \
-  ZipStrong.o \
+@@ -90,8 +90,6 @@ SRCS=\
+   ../../../../CPP/7zip/Archive/PeHandler.cpp \

+   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \

+   ../../../../CPP/7zip/Archive/QcowHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \

+   ../../../../CPP/7zip/Archive/RpmHandler.cpp \

+   ../../../../CPP/7zip/Archive/SplitHandler.cpp \

+   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \

+@@ -218,9 +216,6 @@ SRCS=\
+   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \

+   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \

+   ../../../../CPP/7zip/Crypto/RandGen.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \

+-  ../../../../CPP/7zip/Crypto/RarAes.cpp \

+   ../../../../CPP/7zip/Crypto/WzAes.cpp \

+   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \

+   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \

+@@ -817,10 +812,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp

+ QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp

+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp

+-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp

+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp

+-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp

+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp

+ RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp

+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp

+ SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp

+@@ -1073,12 +1064,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp

+ RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp

+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp

+-Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp

+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp

+-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp

+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp

+-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp

+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp

+ WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp

+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp

+ ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp

+@@ -1364,8 +1349,6 @@ OBJS=\
+  PeHandler.o \

+  PpmdHandler.o \

+  QcowHandler.o \

+- RarHandler.o \

+- Rar5Handler.o \

+  RpmHandler.o \

+  SplitHandler.o \

+  SquashfsHandler.o \

+@@ -1492,9 +1475,6 @@ OBJS=\
+  MyAesReg.o \

+  Pbkdf2HmacSha1.o \

+  RandGen.o \

+- Rar20Crypto.o \

+- Rar5Aes.o \

+- RarAes.o \

+  WzAes.o \

+  ZipCrypto.o \

+  ZipStrong.o \

 diff --git a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
-index 61f41f9..adc7117 100644
+index 261a450..a95038d 100644
 --- a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
 +++ b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
-@@ -126,8 +126,6 @@ add_library(7z MODULE
-   "../../../../CPP/7zip/Archive/PeHandler.cpp"
-   "../../../../CPP/7zip/Archive/PpmdHandler.cpp"
-   "../../../../CPP/7zip/Archive/QcowHandler.cpp"
--  "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"
--  "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp"
-   "../../../../CPP/7zip/Archive/RpmHandler.cpp"
-   "../../../../CPP/7zip/Archive/SplitHandler.cpp"
-   "../../../../CPP/7zip/Archive/SquashfsHandler.cpp"
-@@ -230,9 +228,6 @@ add_library(7z MODULE
-   "../../../../CPP/7zip/Crypto/MyAesReg.cpp"
-   "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"
-   "../../../../CPP/7zip/Crypto/RandGen.cpp"
--  "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"
--  "../../../../CPP/7zip/Crypto/Rar5Aes.cpp"
--  "../../../../CPP/7zip/Crypto/RarAes.cpp"
-   "../../../../CPP/7zip/Crypto/WzAes.cpp"
-   "../../../../CPP/7zip/Crypto/ZipCrypto.cpp"
-   "../../../../CPP/7zip/Crypto/ZipStrong.cpp"
+@@ -225,8 +225,6 @@ add_library(7z MODULE
+   "../../../../CPP/7zip/Archive/PeHandler.cpp"

+   "../../../../CPP/7zip/Archive/PpmdHandler.cpp"

+   "../../../../CPP/7zip/Archive/QcowHandler.cpp"

+-  "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"

+-  "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp"

+   "../../../../CPP/7zip/Archive/RpmHandler.cpp"

+   "../../../../CPP/7zip/Archive/SplitHandler.cpp"

+   "../../../../CPP/7zip/Archive/SquashfsHandler.cpp"

+@@ -353,9 +351,6 @@ add_library(7z MODULE
+   "../../../../CPP/7zip/Crypto/MyAesReg.cpp"

+   "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"

+   "../../../../CPP/7zip/Crypto/RandGen.cpp"

+-  "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"

+-  "../../../../CPP/7zip/Crypto/Rar5Aes.cpp"

+-  "../../../../CPP/7zip/Crypto/RarAes.cpp"

+   "../../../../CPP/7zip/Crypto/WzAes.cpp"

+   "../../../../CPP/7zip/Crypto/ZipCrypto.cpp"

+   "../../../../CPP/7zip/Crypto/ZipStrong.cpp"

 diff --git a/CPP/7zip/Crypto/Sha1Cls.h b/CPP/7zip/Crypto/Sha1Cls.h
 index 71acbde..cde4a57 100644
 --- a/CPP/7zip/Crypto/Sha1Cls.h
@@ -217,7 +217,7 @@ index 71acbde..cde4a57 100644
  };
  
 diff --git a/CPP/7zip/Guid.txt b/CPP/7zip/Guid.txt
-index 7edab6e..cc22992 100644
+index 7c9a82e..255aec6 100644
 --- a/CPP/7zip/Guid.txt
 +++ b/CPP/7zip/Guid.txt
 @@ -151,7 +151,6 @@ Handler GUIDs:
@@ -228,7 +228,7 @@ index 7edab6e..cc22992 100644
    04 Arj
    05 Z
    06 Lzh
-@@ -168,7 +167,6 @@ Handler GUIDs:
+@@ -169,7 +168,6 @@ Handler GUIDs:
    C9 VDI
    CA Qcow
    CB GPT
@@ -237,28 +237,28 @@ index 7edab6e..cc22992 100644
    CE Hxs
    CF TE
 diff --git a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
-index afa36d4..93c45c7 100644
+index a983b32..86cd158 100644
 --- a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
 +++ b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
-@@ -137,8 +137,6 @@ SOURCES +=  \
-   ../../../../CPP/7zip/Archive/PeHandler.cpp \
-   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
-   ../../../../CPP/7zip/Archive/QcowHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
-   ../../../../CPP/7zip/Archive/RpmHandler.cpp \
-   ../../../../CPP/7zip/Archive/SplitHandler.cpp \
-   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -241,9 +239,6 @@ SOURCES +=  \
-   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
-   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
-   ../../../../CPP/7zip/Crypto/RandGen.cpp \
--  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
--  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
--  ../../../../CPP/7zip/Crypto/RarAes.cpp \
-   ../../../../CPP/7zip/Crypto/WzAes.cpp \
-   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
-   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
+@@ -239,8 +239,6 @@ SOURCES +=  \
+   ../../../../CPP/7zip/Archive/PeHandler.cpp \

+   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \

+   ../../../../CPP/7zip/Archive/QcowHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \

+   ../../../../CPP/7zip/Archive/RpmHandler.cpp \

+   ../../../../CPP/7zip/Archive/SplitHandler.cpp \

+   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \

+@@ -367,9 +365,6 @@ SOURCES +=  \
+   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \

+   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \

+   ../../../../CPP/7zip/Crypto/RandGen.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \

+-  ../../../../CPP/7zip/Crypto/RarAes.cpp \

+   ../../../../CPP/7zip/Crypto/WzAes.cpp \

+   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \

+   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \

 diff --git a/CPP/7zip/QMAKE/all.pro b/CPP/7zip/QMAKE/all.pro
 index a565ba8..6668619 100644
 --- a/CPP/7zip/QMAKE/all.pro
@@ -272,7 +272,7 @@ index a565ba8..6668619 100644
            test_lib
  
 diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp
-index d0eca6d..7f4e6e2 100644
+index 42a8a33..d6f29bb 100644
 --- a/CPP/7zip/UI/Client7z/Client7z.cpp
 +++ b/CPP/7zip/UI/Client7z/Client7z.cpp
 @@ -32,7 +32,7 @@ HINSTANCE g_hInstance = 0;
@@ -297,7 +297,7 @@ index ac9eeac..076bd1c 100644
    CArcInfoEx():
        Flags(0),
 diff --git a/CPP/7zip/UI/Common/OpenArchive.cpp b/CPP/7zip/UI/Common/OpenArchive.cpp
-index 7d5b0c4..88ea5ab 100644
+index 7a8a90c..0202a5b 100644
 --- a/CPP/7zip/UI/Common/OpenArchive.cpp
 +++ b/CPP/7zip/UI/Common/OpenArchive.cpp
 @@ -1063,7 +1063,6 @@ static const char * const k_Formats_with_simple_signuature[] =
@@ -307,8 +307,8 @@ index 7d5b0c4..88ea5ab 100644
 -  , "rar"
    , "bzip2"
    , "gzip"
-   , "cab"
-@@ -1720,29 +1719,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
+   , "lzip"
+@@ -1727,29 +1726,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
          {
            // signature search was here
          }
@@ -361,33 +361,33 @@ index 83578ed..034feed 100644
  		pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
  		pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
 diff --git a/CPP/ANDROID/Format7zFree/jni/Android.mk b/CPP/ANDROID/Format7zFree/jni/Android.mk
-index 7c74e73..48cb4fa 100644
+index 39d0431..498f0fe 100644
 --- a/CPP/ANDROID/Format7zFree/jni/Android.mk
 +++ b/CPP/ANDROID/Format7zFree/jni/Android.mk
 @@ -91,8 +91,6 @@ LOCAL_SRC_FILES := \
-   ../../../../CPP/7zip/Archive/PeHandler.cpp \
-   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
-   ../../../../CPP/7zip/Archive/QcowHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
--  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
-   ../../../../CPP/7zip/Archive/RpmHandler.cpp \
-   ../../../../CPP/7zip/Archive/SplitHandler.cpp \
-   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -195,9 +193,6 @@ LOCAL_SRC_FILES := \
-   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
-   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
-   ../../../../CPP/7zip/Crypto/RandGen.cpp \
--  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
--  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
--  ../../../../CPP/7zip/Crypto/RarAes.cpp \
-   ../../../../CPP/7zip/Crypto/WzAes.cpp \
-   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
-   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
+   ../../../../CPP/7zip/Archive/PeHandler.cpp \

+   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \

+   ../../../../CPP/7zip/Archive/QcowHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \

+-  ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \

+   ../../../../CPP/7zip/Archive/RpmHandler.cpp \

+   ../../../../CPP/7zip/Archive/SplitHandler.cpp \

+   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \

+@@ -219,9 +217,6 @@ LOCAL_SRC_FILES := \
+   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \

+   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \

+   ../../../../CPP/7zip/Crypto/RandGen.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \

+-  ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \

+-  ../../../../CPP/7zip/Crypto/RarAes.cpp \

+   ../../../../CPP/7zip/Crypto/WzAes.cpp \

+   ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \

+   ../../../../CPP/7zip/Crypto/ZipStrong.cpp \

 diff --git a/ChangeLog b/ChangeLog
-index daabd8e..f2a01d6 100644
+index 186027f..4f5fd6c 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -28,7 +28,6 @@ Version 16.00 (never published)
+@@ -97,7 +97,6 @@ Version 16.00 (never published)
        - 7z update bcj bugs were fixed.
        - split (aaa.001) fixed
        - iso loop fix
@@ -395,19 +395,21 @@ index daabd8e..f2a01d6 100644
        - drag and drop 1<2.txt
        - memory access violation fix
  
-@@ -80,11 +79,6 @@ Version 15.12 (never published)
+@@ -148,13 +147,6 @@ Version 15.12 (never published)
+   - From Windows version of 7-Zip 15.12 :
      - "There are no errors" string after "Test" operation inside archive.
      - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code).
- 
+-
 -
 -  - From Windows version of 7-Zip 15.11 :
 -        - Some bugs were fixed.
 -        - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives.
 -
-    - ..../LZHAM added
+-   - ..../LZHAM added
     
  
-@@ -104,9 +98,6 @@ Version 15.10 beta
+ 
+@@ -173,9 +165,6 @@ Version 15.10 beta
  	  version (-m switch).
      - Some bugs were fixed.
        - extracting from solid wim archives worked incorrectly in some cases,
@@ -417,7 +419,7 @@ index daabd8e..f2a01d6 100644
  
  Version 15.09 beta
  ==================
-@@ -128,8 +119,6 @@ Version 15.08 beta
+@@ -197,8 +186,6 @@ Version 15.08 beta
  Version 15.07 beta
  ==================
  
@@ -426,7 +428,7 @@ index daabd8e..f2a01d6 100644
    - support for cygwin 64 bits
    
    - support for cygwin 64 bits with asm
-@@ -153,15 +142,12 @@ Version 15.07 beta
+@@ -222,15 +209,12 @@ Version 15.07 beta
  
    - From Windows version of 7-zip 15.06 beta:
  
@@ -442,17 +444,18 @@ index daabd8e..f2a01d6 100644
      - Some bugs were fixed.
  
    - From Windows version of 7-zip 15.05 beta:
-@@ -214,9 +200,6 @@ Version 9.38
+@@ -283,10 +267,6 @@ Version 9.38
    - bug #139 "password from commanline is visible in processes list"
        Now the characters of the password are replaced with *.
  
 -  - From Windows version of 7-zip
 -     - bug#138 If you extract the password with # program crashes
 -       7z now supports long password in RAR 3 and 4.
+-
  
  
- 
-@@ -247,12 +230,6 @@ Version 9.22
+ Version 9.22
+@@ -316,12 +296,6 @@ Version 9.22
    - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack
  
  
@@ -465,7 +468,7 @@ index daabd8e..f2a01d6 100644
  Version 9.20
  ============
  
-@@ -325,8 +302,6 @@ Version 9.13
+@@ -394,8 +368,6 @@ Version 9.13
      - Some bugs were fixed.
  
  
@@ -474,7 +477,7 @@ index daabd8e..f2a01d6 100644
    - #2860898 "Dereferencing a zero pointer in cab handler" fixed
  
    - #2860679 "Division by zero in cab decoder" fixed
-@@ -455,7 +430,7 @@ Version 4.59 (never published)
+@@ -524,7 +496,7 @@ Version 4.59 (never published)
      - It's allowed to use -t switch for "list" and "extract" commands.
      - Some bugs were fixed.
  
@@ -483,7 +486,7 @@ index daabd8e..f2a01d6 100644
  
  
  Version 4.58
-@@ -468,8 +443,6 @@ Version 4.58
+@@ -537,8 +509,6 @@ Version 4.58
          2) -mcu switch:  7-Zip uses UTF-8, if there are non-ASCII symbols.
          3) -mcl switch:  7-Zip uses local code page.
      - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch).
@@ -492,7 +495,7 @@ index daabd8e..f2a01d6 100644
      - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on
      - Some bugs were fixed.
  
-@@ -685,7 +658,7 @@ Version 4.44
+@@ -754,7 +724,7 @@ Version 4.44
  
    - From Windows version of 7-zip 4.44 :
      - 7za : Cab support
@@ -501,7 +504,7 @@ index daabd8e..f2a01d6 100644
      - fix : now, updating a crypted header archive keeps the crypted header
  
    - fixes in the help displayed by 7za/7z/7zr.
-@@ -805,8 +778,6 @@ Version 4.38
+@@ -874,8 +844,6 @@ Version 4.38
  
    - patch #1465026 - Patch for install.sh for packagers
  
@@ -510,7 +513,7 @@ index daabd8e..f2a01d6 100644
    - contrib/VirtualFileSystemForMidnightCommander/u7z updated
      (thank sgh_punk)
  
-@@ -923,8 +894,6 @@ Version 4.25
+@@ -992,8 +960,6 @@ Version 4.25
      - Some bugs were fixed
      - DOCS/MANUAL/exit_codes.htm added
  
@@ -519,7 +522,7 @@ index daabd8e..f2a01d6 100644
    - better dependencies in makefile
  
  Version 4.23
-@@ -1112,9 +1081,6 @@ Version 4.10
+@@ -1181,9 +1147,6 @@ Version 4.10
    - new port of 7za from the source of 7za 4.10Beta for Windows
      => p7zip now work on big endian CPU.
  
@@ -530,10 +533,10 @@ index daabd8e..f2a01d6 100644
  ============
    - add support for FreeBSD 5.2.1
 diff --git a/DOC/License.txt b/DOC/License.txt
-index 0bcbe26..5b0dfaa 100644
+index 0bcbe26..aaaaf9f 100644
 --- a/DOC/License.txt
 +++ b/DOC/License.txt
-@@ -5,15 +5,6 @@
+@@ -5,14 +5,6 @@
  
    7-Zip Copyright (C) 1999-2016 Igor Pavlov.
  
@@ -545,11 +548,10 @@ index 0bcbe26..5b0dfaa 100644
 -  The GNU LGPL + unRAR restriction means that you must follow both 
 -  GNU LGPL rules and unRAR restriction rules.
 -
--
+ 
    GNU LGPL information
    --------------------
- 
-@@ -33,21 +24,5 @@
+@@ -33,21 +25,5 @@
      USA
  
  
@@ -572,30 +574,30 @@ index 0bcbe26..5b0dfaa 100644
    --
    Igor Pavlov
 diff --git a/DOC/MANUAL/cmdline/switches/update.htm b/DOC/MANUAL/cmdline/switches/update.htm
-index 27385b1..0190fc1 100644
+index f51dd7f..0533382 100644
 --- a/DOC/MANUAL/cmdline/switches/update.htm
 +++ b/DOC/MANUAL/cmdline/switches/update.htm
 @@ -139,7 +139,7 @@ someone in another time zone.</P>
- <LI>UTC file systems: NTFS

- <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim

- <LI>Local time file systems : FAT, FAT32

--<LI>Local time archive formats : rar, zip, cab

-+<LI>Local time archive formats : zip, cab

- </UL>

- 

- <H4>Examples</H4>

+ <LI>UTC file systems: NTFS
+ <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
+ <LI>Local time file systems : FAT, FAT32
+-<LI>Local time archive formats : rar, zip, cab
++<LI>Local time archive formats : zip, cab
+ </UL>
+ 
+ <H4>Examples</H4>
 diff --git a/DOC/MANUAL/general/formats.htm b/DOC/MANUAL/general/formats.htm
-index 7996c5c..cd01bd6 100644
+index 2484e66..edd3570 100644
 --- a/DOC/MANUAL/general/formats.htm
 +++ b/DOC/MANUAL/general/formats.htm
-@@ -47,7 +47,6 @@
-   <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>

-   <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>

-   <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>

--  <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>

-   <TR> <TD align="center">RPM</TD>  <TD></TD> <TD>rpm</TD></TR>

-   <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>

-   <TR> <TD align="center">QCOW2</TD> <TD></TD> <TD>qcow qcow2 qcow2c</TD> </TR>

+@@ -48,7 +48,6 @@
+   <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>
+   <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>
+   <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>
+-  <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>
+   <TR> <TD align="center">RPM</TD>  <TD></TD> <TD>rpm</TD></TR>
+   <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>
+   <TR> <TD align="center">QCOW2</TD> <TD></TD> <TD>qcow qcow2 qcow2c</TD> </TR>
 diff --git a/DOC/Methods.txt b/DOC/Methods.txt
 index 1a1c54c..daa94e2 100644
 --- a/DOC/Methods.txt
@@ -625,10 +627,10 @@ index 1a1c54c..daa94e2 100644
           01 - 7zAES (AES-256 + SHA-256)
  
 diff --git a/DOC/readme.txt b/DOC/readme.txt
-index 4a6998c..00591d4 100644
+index 9bc64ff..17a33a4 100644
 --- a/DOC/readme.txt
 +++ b/DOC/readme.txt
-@@ -9,30 +9,9 @@
+@@ -9,29 +9,9 @@
  License Info
  ------------
  
@@ -656,11 +658,10 @@ index 4a6998c..00591d4 100644
 -2) You can fix bugs in source code and use compiled fixed version.
 -3) You can not use unRAR sources to re-create the RAR compression algorithm.
 -
--
+ 
  LZMA SDK
  --------
- 
-@@ -96,7 +75,6 @@ DOC                Documentation
+@@ -96,7 +76,6 @@ DOC                Documentation
  ---
    7zFormat.txt   - 7z format description
    copying.txt    - GNU LGPL license
@@ -669,10 +670,10 @@ index 4a6998c..00591d4 100644
    Methods.txt    - Compression method IDs
    readme.txt     - Readme file
 diff --git a/DOC/src-history.txt b/DOC/src-history.txt
-index 6b48c80..dda8057 100644
+index 5b2605e..f070900 100644
 --- a/DOC/src-history.txt
 +++ b/DOC/src-history.txt
-@@ -188,8 +188,6 @@ HISTORY of the 7-Zip source code
+@@ -199,8 +199,6 @@ HISTORY of the 7-Zip source code
  - 7-Zip now has 128 MB dictionary limit for 32-bit version:
    It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2;
  - TAR: 'D' link flag support.
@@ -681,7 +682,7 @@ index 6b48c80..dda8057 100644
  - Fixed bugs:
    - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\
      In case of move it removed original files.
-@@ -200,8 +198,6 @@ HISTORY of the 7-Zip source code
+@@ -211,8 +209,6 @@ HISTORY of the 7-Zip source code
        7-zip tries to delete all extra fileds (except for WzAES).
        And that code could hang.
    -  7-Zip GUI didn't suggest BZip2 dictionary size used in previous run.
@@ -690,7 +691,7 @@ index 6b48c80..dda8057 100644
  
  4.58 alpha 2   2007-12-31
  -------------------------
-@@ -251,7 +247,6 @@ HISTORY of the 7-Zip source code
+@@ -262,7 +258,6 @@ HISTORY of the 7-Zip source code
    stratup code, or you must add CPP/Common/CRC.cpp to your project.
  - Method ID in .7z now is 63-bit integer (UInt64).
  - Open error messages
@@ -698,7 +699,7 @@ index 6b48c80..dda8057 100644
  - unShrink fixed
  - BUG of 4.43 beta and 4.44 beta was fixed.
    7-Zip compressing to .zip in multi-threading mode didn't work in some cases.
-@@ -433,11 +428,6 @@ HISTORY of the 7-Zip source code
+@@ -444,11 +439,6 @@ HISTORY of the 7-Zip source code
      contains common resurces
  
  
@@ -711,13 +712,16 @@ index 6b48c80..dda8057 100644
  -------------------------
  - SDK/Archive/Cab/MSZipDecoder.cpp
 diff --git a/GUI/Contents/Info.plist b/GUI/Contents/Info.plist
-index 71650e1..d60b262 100644
+index 8380a15..9b17d3b 100644
 --- a/GUI/Contents/Info.plist
 +++ b/GUI/Contents/Info.plist
-@@ -311,24 +311,6 @@
- 		<dict>
- 			<key>CFBundleTypeExtensions</key>
- 			<array>
+@@ -346,24 +346,6 @@
+ 			<key>NSPersistentStoreTypeKey</key>
+ 			<string>XML</string>
+ 		</dict>
+-		<dict>
+-			<key>CFBundleTypeExtensions</key>
+-			<array>
 -				<string>rar</string>
 -				<string>RAR</string>
 -				<string>.r00</string>
@@ -733,14 +737,11 @@ index 71650e1..d60b262 100644
 -			<key>NSPersistentStoreTypeKey</key>
 -			<string>XML</string>
 -		</dict>
--		<dict>
--			<key>CFBundleTypeExtensions</key>
--			<array>
- 				<string>ace</string>
- 				<string>ACE</string>
- 				<string>.c00</string>
+ 		<dict>
+ 			<key>CFBundleTypeExtensions</key>
+ 			<array>
 diff --git a/README b/README
-index b76407f..c03917b 100644
+index 91ae672..29dab99 100644
 --- a/README
 +++ b/README
 @@ -8,7 +8,7 @@ p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip.
@@ -783,10 +784,10 @@ index 1be72ec..7da359a 100644
  file0='Utils/file_7z_so.py'
  
 diff --git a/Utils/file_7z_so.py b/Utils/file_7z_so.py
-index 7ca9fff..43edb87 100644
+index fd49e76..2b2c657 100644
 --- a/Utils/file_7z_so.py
 +++ b/Utils/file_7z_so.py
-@@ -111,8 +111,6 @@ files_cpp=[
+@@ -210,8 +210,6 @@ files_cpp=[
   'CPP/7zip/Archive/PeHandler.cpp',
   'CPP/7zip/Archive/PpmdHandler.cpp',
   'CPP/7zip/Archive/QcowHandler.cpp',
@@ -795,7 +796,7 @@ index 7ca9fff..43edb87 100644
   'CPP/7zip/Archive/RpmHandler.cpp',
   'CPP/7zip/Archive/SplitHandler.cpp',
   'CPP/7zip/Archive/SquashfsHandler.cpp',
-@@ -215,9 +213,6 @@ files_cpp=[
+@@ -338,9 +336,6 @@ files_cpp=[
   'CPP/7zip/Crypto/MyAesReg.cpp',
   'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp',
   'CPP/7zip/Crypto/RandGen.cpp',
@@ -806,7 +807,7 @@ index 7ca9fff..43edb87 100644
   'CPP/7zip/Crypto/ZipCrypto.cpp',
   'CPP/7zip/Crypto/ZipStrong.cpp',
 diff --git a/Utils/generate.py b/Utils/generate.py
-index 132024a..62c0456 100755
+index 06f4ff5..d5590c6 100644
 --- a/Utils/generate.py
 +++ b/Utils/generate.py
 @@ -281,7 +281,6 @@ import file_7zr
@@ -817,7 +818,7 @@ index 132024a..62c0456 100755
  import file_Codecs_Lzham_so
  import file_LzmaCon
  import file_Client7z
-@@ -440,43 +439,6 @@ LOCAL_CFLAGS := -DANDROID_NDK  -fexceptions \
+@@ -442,44 +441,6 @@ LOCAL_CFLAGS := -DANDROID_NDK  -fexceptions \
  -I../../../include_windows
  ''')
  
@@ -829,6 +830,8 @@ index 132024a..62c0456 100755
 -	files_c=file_Codecs_Rar_so.files_c,
 -	files_cpp=file_Codecs_Rar_so.files_cpp,
 -	cmake_end='''
+-    
+-SET_TARGET_PROPERTIES(Rar PROPERTIES PREFIX "")
 -
 -find_library(DL_LIB dl)
 -
@@ -857,11 +860,10 @@ index 132024a..62c0456 100755
 --I../../../include_windows
 -''')
 -
--
+ 
  
  project_Codecs_Lzham=Structure(name="Lzham",name2="Lzham",
- 	type=TYPE_DLL,
-@@ -762,7 +724,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za)
+@@ -766,7 +727,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za)
  generate_makefile_list('../CPP/7zip/Bundles/Alone7z/makefile.list',project_7zr)
  generate_makefile_list('../CPP/7zip/UI/Console/makefile.list',project_7z)
  generate_makefile_list('../CPP/7zip/Bundles/Format7zFree/makefile.list',project_Format7zFree)
@@ -869,7 +871,7 @@ index 132024a..62c0456 100755
  generate_makefile_list('../CPP/7zip/Compress/Lzham/makefile.list',project_Codecs_Lzham,'../../../../bin/Codecs')
  generate_makefile_list('../CPP/7zip/Bundles/SFXCon/makefile.list',project_7zCon_sfx)
  generate_makefile_list('../CPP/7zip/UI/GUI/makefile.list',project_7zG)
-@@ -776,7 +737,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za)
+@@ -780,7 +740,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za)
  generate_pro('../CPP/7zip/QMAKE/7zr/7zr.pro',project_7zr)
  generate_pro('../CPP/7zip/QMAKE/7z_/7z_.pro',project_7z)
  generate_pro('../CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro',project_Format7zFree)
diff --git a/libre/p7zip/p7zip.install b/libre/p7zip/p7zip.install
deleted file mode 100644
index 4c3bb82ac..000000000
--- a/libre/p7zip/p7zip.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  if (($(vercmp $2 9.38.1-3) < 0)); then
-    echo ':: The 7zFM graphical frontend is no longer included in this package.'
-    echo '   If you used it, consider installing one of the following packages:'
-    echo '   1) file-roller, 2) engrampa, 3) kdeutils-ark.'
-  fi
-}
-
-# vim:set ts=2 sw=2 et: