p7zip-16.02-1.parabola1: updating version

2 files changed, 78 insertions, 77 deletions

diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index 73cafae17..b7ffe6201 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 268263 2016-05-17 21:43:53Z foutrelis $
+# $Id: PKGBUILD 271943 2016-07-16 13:04:22Z foutrelis $
 # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
 # Contributor (Arch): Thayer Williams <thayer@archlinux.org>
@@ -9,8 +9,8 @@
 
 _pkgname=p7zip-libre
 pkgname=p7zip
-pkgver=15.14.1
-pkgrel=2.parabola1
+pkgver=16.02
+pkgrel=1.parabola1
 pkgdesc="Command-line file archiver with high compression ratio"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://p7zip.sourceforge.net/"
@@ -23,14 +23,10 @@ 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
-        libre.patch
-        CVE-2016-2334.patch
-        CVE-2016-2335.patch)
-mksha256sums=('699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4')
-sha256sums=('2b43c19d4367356d38f78b020f58f874a5222022c7bc8e3f9620ab3c1899f61b'
-            'dd64ba789b8c23ecd3fbcccbcd62a217035de3a8c98517e7ba140a1a546ae77a'
-            '632cae14095e065cb550b0f16faf39d8f822d0a8bb5b605e903f3bc7657a4ee5'
-            '368870f92c658e8add261695923470855a969c0d7ecafd880ec7144ac245adbf')
+        libre.patch)
+mksha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
+sha256sums=('486e5784de9284c7123b401b3f27e684af772d03fc1fb8cdbbefb8123dc9f841'
+            'feeeb3b1b7a827b7a675d6c8a363ea6c2499a4f04b3160c7e8d7bba42e0b3c15')
 
 mksource() {
   cd "${srcdir}/${pkgname}_${pkgver}"
@@ -59,10 +55,6 @@ prepare() {
 
   # remove rar and parent folder icon references
   patch -Np1 -i ../libre.patch
-
-  # https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/
-  patch -Np1 -i ../CVE-2016-2334.patch
-  patch -Np1 -i ../CVE-2016-2335.patch
 }
 
 build() {
diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch
index 8b8a4964a..f9c782b93 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 785c706..0fd10fc 100644
+index 55c1c63..48b4c5d 100644
 --- a/C/Sha1.c
 +++ b/C/Sha1.c
 @@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest)
@@ -42,11 +42,11 @@ index 785c706..0fd10fc 100644
  #define Sha1_UpdateBlock(p) Sha1_GetBlockDigest(p, p->buffer, p->state)
  
  void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
-@@ -207,45 +174,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
+@@ -212,46 +179,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
    }
  }
  
--void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size, int rar350Mode)
+-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */)
 -{
 -  int returnRes = False;
 -  
@@ -80,7 +80,8 @@ index 785c706..0fd10fc 100644
 -          SetUi32(prev, d);
 -        }
 -      }
--      returnRes = rar350Mode;
+-      // returnRes = rar350Mode;
+-      returnRes = True;
 -    }
 -  }
 -}
@@ -89,23 +90,23 @@ index 785c706..0fd10fc 100644
  {
    unsigned pos = (unsigned)p->count & 0x3F;
 diff --git a/C/Sha1.h b/C/Sha1.h
-index e578a82..c0dbca3 100644
+index aa22ec3..9c45653 100644
 --- a/C/Sha1.h
 +++ b/C/Sha1.h
 @@ -27,8 +27,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest);
  void Sha1_Update(CSha1 *p, const Byte *data, size_t size);
  void Sha1_Final(CSha1 *p, Byte *digest);
  
--void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size, int rar350Mode);
+-void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */);
 -
  void Sha1_32_PrepareBlock(const CSha1 *p, UInt32 *block, unsigned size);
  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 6333cdc..ec7c118 100644
+index a0571e7..43ad3e9 100644
 --- a/CPP/7zip/Archive/7z/7zUpdate.cpp
 +++ b/CPP/7zip/Archive/7z/7zUpdate.cpp
-@@ -558,7 +558,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
+@@ -562,7 +562,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
  }
  
  static const char *g_Exts =
@@ -204,14 +205,14 @@ index 61f41f9..adc7117 100644
    "../../../../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 18c761f..cde4a57 100644
+index 71acbde..cde4a57 100644
 --- a/CPP/7zip/Crypto/Sha1Cls.h
 +++ b/CPP/7zip/Crypto/Sha1Cls.h
 @@ -28,7 +28,6 @@ class CContext: public CContextBase
  {
  public:
    void Update(const Byte *data, size_t size) throw() { Sha1_Update(&_s, data, size); }
--  void UpdateRar(Byte *data, size_t size, bool rar350Mode) throw() { Sha1_Update_Rar(&_s, data, size, rar350Mode ? 1 : 0); }
+-  void UpdateRar(Byte *data, size_t size /* , bool rar350Mode */) throw() { Sha1_Update_Rar(&_s, data, size /* , rar350Mode ? 1 : 0 */); }
    void Final(Byte *digest) throw() { Sha1_Final(&_s, digest); }
  };
  
@@ -296,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 3626cca..98f20ea 100644
+index 7d5b0c4..88ea5ab 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,7 +308,7 @@ index 3626cca..98f20ea 100644
    , "bzip2"
    , "gzip"
    , "cab"
-@@ -1685,29 +1684,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
+@@ -1720,29 +1719,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
          {
            // signature search was here
          }
@@ -383,10 +384,18 @@ index 7c74e73..48cb4fa 100644
    ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
    ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
 diff --git a/ChangeLog b/ChangeLog
-index 66449ab..3f90bb9 100644
+index daabd8e..f2a01d6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -45,11 +45,6 @@ Version 15.12 (never published)
+@@ -28,7 +28,6 @@ Version 16.00 (never published)
+       - 7z update bcj bugs were fixed.
+       - split (aaa.001) fixed
+       - iso loop fix
+-      - rar4 multivol -stdin kpidSize
+       - drag and drop 1<2.txt
+       - memory access violation fix
+ 
+@@ -80,11 +79,6 @@ Version 15.12 (never published)
      - "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).
  
@@ -398,7 +407,7 @@ index 66449ab..3f90bb9 100644
     - ..../LZHAM added
     
  
-@@ -69,9 +64,6 @@ Version 15.10 beta
+@@ -104,9 +98,6 @@ Version 15.10 beta
  	  version (-m switch).
      - Some bugs were fixed.
        - extracting from solid wim archives worked incorrectly in some cases,
@@ -408,16 +417,16 @@ index 66449ab..3f90bb9 100644
  
  Version 15.09 beta
  ==================
-@@ -93,8 +85,6 @@ Version 15.08 beta
+@@ -128,8 +119,6 @@ Version 15.08 beta
  Version 15.07 beta
  ==================
  
 -  - "bin/Codecs/Rar29.so" renamed to "bin/Codecs/Rar.so"
 -  
-   - support of cygwin 64 bits
+   - support for cygwin 64 bits
    
-   - support of cygwin 64 bits with asm
-@@ -118,15 +108,12 @@ Version 15.07 beta
+   - support for cygwin 64 bits with asm
+@@ -153,15 +142,12 @@ Version 15.07 beta
  
    - From Windows version of 7-zip 15.06 beta:
  
@@ -433,7 +442,7 @@ index 66449ab..3f90bb9 100644
      - Some bugs were fixed.
  
    - From Windows version of 7-zip 15.05 beta:
-@@ -179,9 +166,6 @@ Version 9.38
+@@ -214,9 +200,6 @@ Version 9.38
    - bug #139 "password from commanline is visible in processes list"
        Now the characters of the password are replaced with *.
  
@@ -443,7 +452,7 @@ index 66449ab..3f90bb9 100644
  
  
  
-@@ -212,12 +196,6 @@ Version 9.22
+@@ -247,12 +230,6 @@ Version 9.22
    - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack
  
  
@@ -456,7 +465,7 @@ index 66449ab..3f90bb9 100644
  Version 9.20
  ============
  
-@@ -290,8 +268,6 @@ Version 9.13
+@@ -325,8 +302,6 @@ Version 9.13
      - Some bugs were fixed.
  
  
@@ -465,7 +474,7 @@ index 66449ab..3f90bb9 100644
    - #2860898 "Dereferencing a zero pointer in cab handler" fixed
  
    - #2860679 "Division by zero in cab decoder" fixed
-@@ -420,7 +396,7 @@ Version 4.59 (never published)
+@@ -455,7 +430,7 @@ Version 4.59 (never published)
      - It's allowed to use -t switch for "list" and "extract" commands.
      - Some bugs were fixed.
  
@@ -474,7 +483,7 @@ index 66449ab..3f90bb9 100644
  
  
  Version 4.58
-@@ -433,8 +409,6 @@ Version 4.58
+@@ -468,8 +443,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).
@@ -483,7 +492,7 @@ index 66449ab..3f90bb9 100644
      - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on
      - Some bugs were fixed.
  
-@@ -650,7 +624,7 @@ Version 4.44
+@@ -685,7 +658,7 @@ Version 4.44
  
    - From Windows version of 7-zip 4.44 :
      - 7za : Cab support
@@ -492,7 +501,7 @@ index 66449ab..3f90bb9 100644
      - fix : now, updating a crypted header archive keeps the crypted header
  
    - fixes in the help displayed by 7za/7z/7zr.
-@@ -770,8 +744,6 @@ Version 4.38
+@@ -805,8 +778,6 @@ Version 4.38
  
    - patch #1465026 - Patch for install.sh for packagers
  
@@ -501,7 +510,7 @@ index 66449ab..3f90bb9 100644
    - contrib/VirtualFileSystemForMidnightCommander/u7z updated
      (thank sgh_punk)
  
-@@ -888,8 +860,6 @@ Version 4.25
+@@ -923,8 +894,6 @@ Version 4.25
      - Some bugs were fixed
      - DOCS/MANUAL/exit_codes.htm added
  
@@ -510,7 +519,7 @@ index 66449ab..3f90bb9 100644
    - better dependencies in makefile
  
  Version 4.23
-@@ -1077,9 +1047,6 @@ Version 4.10
+@@ -1112,9 +1081,6 @@ Version 4.10
    - new port of 7za from the source of 7za 4.10Beta for Windows
      => p7zip now work on big endian CPU.
  
@@ -521,12 +530,12 @@ index 66449ab..3f90bb9 100644
  ============
    - add support for FreeBSD 5.2.1
 diff --git a/DOC/License.txt b/DOC/License.txt
-index f50c52e..8ac1986 100644
+index 0bcbe26..5b0dfaa 100644
 --- a/DOC/License.txt
 +++ b/DOC/License.txt
 @@ -5,15 +5,6 @@
  
-   7-Zip Copyright (C) 1999-2015 Igor Pavlov.
+   7-Zip Copyright (C) 1999-2016 Igor Pavlov.
  
 -  Licenses for files are:
 -
@@ -562,6 +571,31 @@ index f50c52e..8ac1986 100644
 -
    --
    Igor Pavlov
+diff --git a/DOC/MANUAL/cmdline/switches/update.htm b/DOC/MANUAL/cmdline/switches/update.htm
+index 27385b1..0190fc1 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>

+diff --git a/DOC/MANUAL/general/formats.htm b/DOC/MANUAL/general/formats.htm
+index 7996c5c..cd01bd6 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>

 diff --git a/DOC/Methods.txt b/DOC/Methods.txt
 index 1a1c54c..daa94e2 100644
 --- a/DOC/Methods.txt
@@ -591,7 +625,7 @@ index 1a1c54c..daa94e2 100644
           01 - 7zAES (AES-256 + SHA-256)
  
 diff --git a/DOC/readme.txt b/DOC/readme.txt
-index db7b229..9c310ab 100644
+index 4a6998c..00591d4 100644
 --- a/DOC/readme.txt
 +++ b/DOC/readme.txt
 @@ -9,30 +9,9 @@
@@ -635,10 +669,10 @@ index db7b229..9c310ab 100644
    Methods.txt    - Compression method IDs
    readme.txt     - Readme file
 diff --git a/DOC/src-history.txt b/DOC/src-history.txt
-index d33ec60..d19469f 100644
+index 6b48c80..dda8057 100644
 --- a/DOC/src-history.txt
 +++ b/DOC/src-history.txt
-@@ -169,8 +169,6 @@ HISTORY of the 7-Zip source code
+@@ -188,8 +188,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.
@@ -647,7 +681,7 @@ index d33ec60..d19469f 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.
-@@ -181,8 +179,6 @@ HISTORY of the 7-Zip source code
+@@ -200,8 +198,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.
@@ -656,7 +690,7 @@ index d33ec60..d19469f 100644
  
  4.58 alpha 2   2007-12-31
  -------------------------
-@@ -232,7 +228,6 @@ HISTORY of the 7-Zip source code
+@@ -251,7 +247,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
@@ -664,7 +698,7 @@ index d33ec60..d19469f 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.
-@@ -414,11 +409,6 @@ HISTORY of the 7-Zip source code
+@@ -433,11 +428,6 @@ HISTORY of the 7-Zip source code
      contains common resurces
  
  
@@ -705,33 +739,8 @@ index 71650e1..d60b262 100644
  				<string>ace</string>
  				<string>ACE</string>
  				<string>.c00</string>
-diff --git a/GUI/help/cmdline/switches/update.htm b/GUI/help/cmdline/switches/update.htm
-index f51dd7f..0533382 100644
---- a/GUI/help/cmdline/switches/update.htm
-+++ b/GUI/help/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>
-diff --git a/GUI/help/general/formats.htm b/GUI/help/general/formats.htm
-index 1febf16..1804ea1 100644
---- a/GUI/help/general/formats.htm
-+++ b/GUI/help/general/formats.htm
-@@ -46,7 +46,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">SPLIT</TD> <TD></TD> <TD>001 002 ...</TD> </TR>
 diff --git a/README b/README
-index 576d3f7..22e94fc 100644
+index b76407f..c03917b 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.