Fix build on OS X.

From Jonathan Buschmann in PR 50839.

2 files changed, 16 insertions, 12 deletions

diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 2b7ad5ebbbd..9062239d2e7 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.46 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2016/02/24 13:03:04 wiz Exp $
 
 SHA1 (p7zip_15.09_src_all.tar.bz2) = d5d21ac15e7c197f8af0366694ab9a301cfce972
 RMD160 (p7zip_15.09_src_all.tar.bz2) = f9ca03529644f43893f1f1b7ef6d864549e53022
 SHA512 (p7zip_15.09_src_all.tar.bz2) = 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 Size (p7zip_15.09_src_all.tar.bz2) = 4048481 bytes
 SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
-SHA1 (patch-CVE-2015-1038) = 461acb6f72cb98fe5f8b240c5d6ed4310404263c
+SHA1 (patch-CVE-2015-1038) = 21d196e5c840597a17bba3e835c5adc3ecc77bb4
 SHA1 (patch-aa) = 9c103fa831cc6ff099e3a604c763ff416f1b48ec
 SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
 SHA1 (patch-ac) = a7afeded4aeb5ef230d006d1556ee601a6190063
diff --git a/archivers/p7zip/patches/patch-CVE-2015-1038 b/archivers/p7zip/patches/patch-CVE-2015-1038
index ef76893b0bc..85cb721a0ad 100644
--- a/archivers/p7zip/patches/patch-CVE-2015-1038
+++ b/archivers/p7zip/patches/patch-CVE-2015-1038
@@ -1,4 +1,4 @@
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 * A patch for CVE-2015-1038
   http://pkgs.fedoraproject.org/cgit/rpms/p7zip.git/plain/p7zip-15.09-CVE-2015-1038.patch
@@ -14,7 +14,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
    return result;
    COM_TRY_END
  }
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/7zip/UI/Client7z/Client7z.cpp.orig	2015-10-17 14:52:30.000000000 +0000
 +++ CPP/7zip/UI/Client7z/Client7z.cpp
@@ -64,7 +64,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
        if (result != S_OK)
        {
          PrintError("Extract Error");
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig	2015-10-03 08:49:15.000000000 +0000
 +++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
@@ -102,7 +102,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
 +
 +  return result;
  }
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/7zip/UI/Common/ArchiveExtractCallback.h.orig	2015-10-03 10:29:09.000000000 +0000
 +++ CPP/7zip/UI/Common/ArchiveExtractCallback.h
@@ -133,7 +133,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
  };
  
  bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/7zip/UI/Common/Extract.cpp.orig	2015-09-07 19:47:32.000000000 +0000
 +++ CPP/7zip/UI/Common/Extract.cpp
@@ -146,7 +146,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
    return callback->ExtractResult(result);
  }
  
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/Windows/FileDir.cpp.orig	2015-10-10 12:37:41.000000000 +0000
 +++ CPP/Windows/FileDir.cpp
@@ -215,19 +215,23 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
  }}}
  
  #ifndef _SFX
-$NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
+$NetBSD: patch-CVE-2015-1038,v 1.2 2016/02/24 13:03:04 wiz Exp $
 
 --- CPP/Windows/FileDir.h.orig	2015-06-19 10:52:06.000000000 +0000
 +++ CPP/Windows/FileDir.h
-@@ -4,6 +4,7 @@
+@@ -4,6 +4,11 @@
  #define __WINDOWS_FILE_DIR_H
  
  #include "../Common/MyString.h"
 +#include "../Common/MyVector.h"
++
++#ifdef ENV_UNIX
++#include <sys/stat.h>
++#endif
  
  #include "FileIO.h"
  
-@@ -11,11 +12,14 @@ namespace NWindows {
+@@ -11,11 +16,14 @@
  namespace NFile {
  namespace NDir {
  
@@ -243,7 +247,7 @@ $NetBSD: patch-CVE-2015-1038,v 1.1 2016/02/14 08:39:47 ryoon Exp $
  bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
  
  #ifndef UNDER_CE
-@@ -76,6 +80,31 @@ public:
+@@ -76,6 +84,31 @@
    bool Remove();
  };