Update to 15.14.

3 files changed, 4 insertions, 287 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index cdeaa962d881..809bf8bdbc20 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p7zip
-PORTVERSION=	15.09
+PORTVERSION=	15.14
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${DISTVERSION}_src_all
@@ -35,7 +35,7 @@ post-patch:
 	       -e 's/ -s //' \
 	       -e 's/-D_LARGEFILE_SOURCE//' \
 	       -e 's/-D_FILE_OFFSET_BITS=64//' \
-	       ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
+	       ${WRKSRC}/makefile.freebsd6+ > ${WRKSRC}/makefile.machine
 	${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
 		${WRKSRC}/man1/*
 	${MV} ${WRKSRC}/README ${WRKSRC}/DOC/readme.unix
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 8097cb1f1d5d..28f383311ac5 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (p7zip_15.09_src_all.tar.bz2) = 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f
-SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
+SHA256 (p7zip_15.14_src_all.tar.bz2) = b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8
+SIZE (p7zip_15.14_src_all.tar.bz2) = 4147609
diff --git a/archivers/p7zip/files/patch-CVE-2015-1038 b/archivers/p7zip/files/patch-CVE-2015-1038
deleted file mode 100644
index e7237059162b..000000000000
--- a/archivers/p7zip/files/patch-CVE-2015-1038
+++ /dev/null
@@ -1,283 +0,0 @@
-Author: Ben Hutchings <ben@decadent.org.uk>
-Date: Tue, 19 May 2015 02:38:40 +0100
-Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
-Bug: http://sourceforge.net/p/p7zip/bugs/147/
-Bug-Debian: https://bugs.debian.org/774660
-
-Alexander Cherepanov discovered that 7zip is susceptible to a
-directory traversal vulnerability.  While extracting an archive, it
-will extract symlinks and then follow them if they are referenced in
-further entries.  This can be exploited by a rogue archive to write
-files outside the current directory.
-
-We have to create placeholder files (which we already do) and delay
-creating symlinks until the end of extraction.
-
-Due to the possibility of anti-items (deletions) in the archive, it is
-possible for placeholders to be deleted and replaced before we create
-the symlinks.  It's not clear that this can be used for mischief, but
-GNU tar guards against similar problems by checking that the placeholder
-still exists and is the same inode.  XXX It also checks 'birth time' but
-this isn't portable.  We can probably get away with comparing ctime
-since we don't support hard links.
-
---- CPP/7zip/UI/Agent/Agent.cpp.orig	2015-09-17 19:02:35 UTC
-+++ CPP/7zip/UI/Agent/Agent.cpp
-@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
-   HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
-       realIndices.Size(), testMode, extractCallback);
-   if (result == S_OK)
--    result = extractCallbackSpec->SetDirsTimes();
-+    result = extractCallbackSpec->SetFinalAttribs();
-   return result;
-   COM_TRY_END
- }
---- CPP/7zip/UI/Client7z/Client7z.cpp.orig	2015-10-17 14:52:30 UTC
-+++ CPP/7zip/UI/Client7z/Client7z.cpp
-@@ -230,8 +230,11 @@ private:
-   COutFileStream *_outFileStreamSpec;
-   CMyComPtr<ISequentialOutStream> _outFileStream;
- 
-+  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
-+
- public:
-   void Init(IInArchive *archiveHandler, const FString &directoryPath);
-+  HRESULT SetFinalAttribs();
- 
-   UInt64 NumErrors;
-   bool PasswordIsDefined;
-@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
-   }
-   _outFileStream.Release();
-   if (_extractMode && _processedFileInfo.AttribDefined)
--    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
-+    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
-   PrintNewLine();
-   return S_OK;
- }
- 
-+HRESULT CArchiveExtractCallback::SetFinalAttribs()
-+{
-+  HRESULT result = S_OK;
-+
-+  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
-+    if (!_delayedSymLinks[i].Create())
-+      result = E_FAIL;
-+
-+  _delayedSymLinks.Clear();
-+
-+  return result;
-+}
- 
- STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
- {
-@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
-       // extractCallbackSpec->PasswordIsDefined = true;
-       // extractCallbackSpec->Password = L"1";
-       HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
-+      if (result == S_OK)
-+	result = extractCallbackSpec->SetFinalAttribs();
-       if (result != S_OK)
-       {
-         PrintError("Extract Error");
---- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig	2015-10-03 08:49:15 UTC
-+++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
-@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
-     NumFiles++;
- 
-   if (!_stdOutMode && _extractMode && _fi.AttribDefined)
--    SetFileAttrib(_diskFilePath, _fi.Attrib);
-+    SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
-   
-   RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
-   
-@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha
-   }
- }
- 
--HRESULT CArchiveExtractCallback::SetDirsTimes()
-+HRESULT CArchiveExtractCallback::SetFinalAttribs()
- {
-+  HRESULT result = S_OK;
-   CRecordVector<CExtrRefSortPair> pairs;
-   pairs.ClearAndSetSize(_extractedFolderPaths.Size());
-   unsigned i;
-@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs
-       (WriteATime && ATimeDefined) ? &ATime : NULL,
-       (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
-   }
--  return S_OK;
-+
-+  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
-+    if (!_delayedSymLinks[i].Create())
-+      result = E_FAIL;
-+
-+  _delayedSymLinks.Clear();
-+
-+  return result;
- }
---- CPP/7zip/UI/Common/ArchiveExtractCallback.h.orig	2015-10-03 10:29:09 UTC
-+++ CPP/7zip/UI/Common/ArchiveExtractCallback.h
-@@ -6,6 +6,8 @@
- #include "../../../Common/MyCom.h"
- #include "../../../Common/Wildcard.h"
- 
-+#include "../../../Windows/FileDir.h"
-+
- #include "../../IPassword.h"
- 
- #include "../../Common/FileStreams.h"
-@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
-   bool _saclEnabled;
-   #endif
- 
-+  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
-+
-   void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
-   HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
-   HRESULT GetUnpackSize();
-@@ -330,7 +334,7 @@ public:
-   }
-   #endif
- 
--  HRESULT SetDirsTimes();
-+  HRESULT SetFinalAttribs();
- };
- 
- bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
---- CPP/7zip/UI/Common/Extract.cpp.orig	2015-09-07 19:47:32 UTC
-+++ CPP/7zip/UI/Common/Extract.cpp
-@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
-   else
-     result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
-   if (result == S_OK && !options.StdInMode)
--    result = ecs->SetDirsTimes();
-+    result = ecs->SetFinalAttribs();
-   return callback->ExtractResult(result);
- }
- 
---- CPP/Windows/FileDir.cpp.orig	2015-10-10 12:37:41 UTC
-+++ CPP/Windows/FileDir.cpp
-@@ -347,7 +347,8 @@ static int convert_to_symlink(const char
-   return -1;
- }
- 
--bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
-+bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes,
-+		   CObjectVector<CDelayedSymLink> *delayedSymLinks)
- {
-   if (!fileName) {
-     SetLastError(ERROR_PATH_NOT_FOUND);
-@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
-      stat_info.st_mode = fileAttributes >> 16;
- #ifdef ENV_HAVE_LSTAT
-      if (S_ISLNK(stat_info.st_mode)) {
--        if ( convert_to_symlink(name) != 0) {
-+        if (delayedSymLinks)
-+          delayedSymLinks->Add(CDelayedSymLink(name));
-+        else if ( convert_to_symlink(name) != 0) {
-           TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
-           return false;
-         }
-@@ -814,6 +817,43 @@ bool CTempDir::Remove()
-   return !_mustBeDeleted;
- }
- 
-+#ifdef ENV_UNIX
-+
-+CDelayedSymLink::CDelayedSymLink(const char * source)
-+  : _source(source)
-+{
-+  struct stat st;
-+
-+  if (lstat(_source, &st) == 0) {
-+    _dev = st.st_dev;
-+    _ino = st.st_ino;
-+  } else {
-+    _dev = 0;
-+  }
-+}
-+
-+bool CDelayedSymLink::Create()
-+{
-+  struct stat st;
-+
-+  if (_dev == 0) {
-+    errno = EPERM;
-+    return false;
-+  }
-+  if (lstat(_source, &st) != 0)
-+    return false;
-+  if (_dev != st.st_dev || _ino != st.st_ino) {
-+    // Placeholder file has been overwritten or moved by another
-+    // symbolic link creation
-+    errno = EPERM;
-+    return false;
-+  }
-+
-+  return convert_to_symlink(_source) == 0;
-+}
-+
-+#endif // ENV_UNIX
-+
- }}}
- 
- #ifndef _SFX
---- CPP/Windows/FileDir.h.orig	2015-06-19 10:52:06 UTC
-+++ CPP/Windows/FileDir.h
-@@ -4,6 +4,7 @@
- #define __WINDOWS_FILE_DIR_H
- 
- #include "../Common/MyString.h"
-+#include "../Common/MyVector.h"
- 
- #include "FileIO.h"
- 
-@@ -11,11 +12,14 @@ namespace NWindows {
- namespace NFile {
- namespace NDir {
- 
-+class CDelayedSymLink;
-+
- bool GetWindowsDir(FString &path);
- bool GetSystemDir(FString &path);
- 
- bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
--bool SetFileAttrib(CFSTR path, DWORD attrib);
-+bool SetFileAttrib(CFSTR path, DWORD attrib,
-+		   CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
- bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
- 
- #ifndef UNDER_CE
-@@ -76,6 +80,31 @@ public:
-   bool Remove();
- };
- 
-+// Symbolic links must be created last so that they can't be used to
-+// create or overwrite files above the extraction directory.
-+class CDelayedSymLink
-+{
-+#ifdef ENV_UNIX
-+  // Where the symlink should be created.  The target is specified in
-+  // the placeholder file.
-+  AString _source;
-+
-+  // Device and inode of the placeholder file.  Before creating the
-+  // symlink, we must check that these haven't been changed by creation
-+  // of another symlink.
-+  dev_t _dev;
-+  ino_t _ino;
-+
-+public:
-+  explicit CDelayedSymLink(const char * source);
-+  bool Create();
-+#else // !ENV_UNIX
-+public:
-+  CDelayedSymLink(const char * source) {}
-+  bool Create() { return true; }
-+#endif // ENV_UNIX
-+};
-+
- #if !defined(UNDER_CE)
- class CCurrentDirRestorer
- {