Index: head/archivers/p7zip/Makefile =================================================================== --- head/archivers/p7zip/Makefile (revision 402987) +++ head/archivers/p7zip/Makefile (revision 402988) @@ -1,60 +1,63 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= p7zip -PORTVERSION= 9.38.1 -PORTREVISION?= 2 +PORTVERSION= 15.09 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all MAINTAINER= rakuco@FreeBSD.org COMMENT?= File archiver with high compression ratio LICENSE?= LGPL21 ALL_TARGET?= all3 USES= cpe tar:bzip2 CPE_VENDOR= 7-zip MAKEFILE= makefile MAKE_ARGS= OPTFLAGS="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_ia64= -fPIC CFLAGS_powerpc= -fPIC CFLAGS_sparc64= -fPIC OPTIONS_DEFINE= DOCS +PORTDOCS= * + post-patch: ${SED} -e 's!g\+\+!${CXX}!' \ -e 's!gcc!${CC}!' \ -e 's/ -s //' \ -e 's/-D_LARGEFILE_SOURCE//' \ -e 's/-D_FILE_OFFSET_BITS=64//' \ ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine ${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \ ${WRKSRC}/man1/* ${MV} ${WRKSRC}/README ${WRKSRC}/DOC/readme.unix .if ! defined(PKGNAMESUFFIX) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/p7zip .for BINARY in 7z 7za 7zr 7zCon.sfx ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINARY} ${STAGEDIR}${PREFIX}/libexec/p7zip .endfor ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${STAGEDIR}${PREFIX}/libexec/p7zip ${INSTALL_SCRIPT} ${FILESDIR}/7z ${STAGEDIR}${PREFIX}/bin ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr - (cd ${WRKSRC}/DOC && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/man1 && \ ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1) + +do-install-DOCS-on: + (cd ${WRKSRC}/DOC && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/archivers/p7zip/distinfo =================================================================== --- head/archivers/p7zip/distinfo (revision 402987) +++ head/archivers/p7zip/distinfo (revision 402988) @@ -1,2 +1,2 @@ -SHA256 (p7zip_9.38.1_src_all.tar.bz2) = fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 -SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925 +SHA256 (p7zip_15.09_src_all.tar.bz2) = 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f +SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481 Index: head/archivers/p7zip/files/patch-CPP-Windows-System.cpp =================================================================== --- head/archivers/p7zip/files/patch-CPP-Windows-System.cpp (revision 402987) +++ head/archivers/p7zip/files/patch-CPP-Windows-System.cpp (revision 402988) @@ -1,11 +1,11 @@ ---- CPP/Windows/System.cpp.orig 2008-09-07 02:29:34.000000000 +0800 -+++ CPP/Windows/System.cpp 2008-09-07 02:30:23.000000000 +0800 -@@ -44,7 +44,7 @@ +--- CPP/Windows/System.cpp.orig 2015-09-26 08:47:01 UTC ++++ CPP/Windows/System.cpp +@@ -44,7 +44,7 @@ namespace NWindows #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) UInt32 GetNumberOfProcessors() { int nbcpu = 1; - size_t value; -+ int value; ++ int value; size_t len = sizeof(value); if (sysctlbyname("hw.ncpu", &value, &len, NULL, 0) == 0) nbcpu = value; Index: head/archivers/p7zip/files/patch-CVE-2015-1038 =================================================================== --- head/archivers/p7zip/files/patch-CVE-2015-1038 (revision 402987) +++ head/archivers/p7zip/files/patch-CVE-2015-1038 (revision 402988) @@ -1,283 +1,283 @@ Author: Ben Hutchings 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 +--- CPP/7zip/UI/Agent/Agent.cpp.orig 2015-09-17 19:02:35 UTC +++ CPP/7zip/UI/Agent/Agent.cpp -@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const +@@ -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 +--- CPP/7zip/UI/Client7z/Client7z.cpp.orig 2015-10-17 14:52:30 UTC +++ CPP/7zip/UI/Client7z/Client7z.cpp -@@ -222,8 +222,11 @@ private: +@@ -230,8 +230,11 @@ private: COutFileStream *_outFileStreamSpec; CMyComPtr _outFileStream; + CObjectVector _delayedSymLinks; + public: void Init(IInArchive *archiveHandler, const FString &directoryPath); + HRESULT SetFinalAttribs(); UInt64 NumErrors; bool PasswordIsDefined; -@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se +@@ -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) { -@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha +@@ -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 +--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig 2015-10-03 08:49:15 UTC +++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp -@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se +@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se NumFiles++; - if (_extractMode && _fi.AttribDefined) + if (!_stdOutMode && _extractMode && _fi.AttribDefined) - SetFileAttrib(_diskFilePath, _fi.Attrib); + SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); - RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted)); - return S_OK; - COM_TRY_END -@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s) + + 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 pairs; pairs.ClearAndSetSize(_extractedFolderPaths.Size()); unsigned i; -@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs +@@ -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 +--- 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" -@@ -213,6 +215,8 @@ class CArchiveExtractCallback: +@@ -237,6 +239,8 @@ class CArchiveExtractCallback: bool _saclEnabled; #endif + CObjectVector _delayedSymLinks; + void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); HRESULT GetUnpackSize(); -@@ -293,7 +297,7 @@ public: - _baseParentFolder = indexInArc; +@@ -330,7 +334,7 @@ public: } + #endif - HRESULT SetDirsTimes(); + HRESULT SetFinalAttribs(); }; - #endif ---- CPP/7zip/UI/Common/Extract.cpp + 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 -@@ -170,7 +170,7 @@ static HRESULT DecompressArchive( +@@ -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 +--- CPP/Windows/FileDir.cpp.orig 2015-10-10 12:37:41 UTC +++ CPP/Windows/FileDir.cpp -@@ -343,7 +343,8 @@ static int convert_to_symlink(const char +@@ -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 *delayedSymLinks) { if (!fileName) { SetLastError(ERROR_PATH_NOT_FOUND); -@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD +@@ -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; } -@@ -885,6 +888,43 @@ bool CTempDir::Remove() +@@ -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 + }}} - ---- CPP/Windows/FileDir.h + #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 *delayedSymLinks = 0); bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); #ifndef UNDER_CE -@@ -69,6 +73,31 @@ public: +@@ -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 { Index: head/archivers/p7zip/pkg-plist =================================================================== --- head/archivers/p7zip/pkg-plist (revision 402987) +++ head/archivers/p7zip/pkg-plist (revision 402988) @@ -1,69 +1,11 @@ bin/7z bin/7za bin/7zr libexec/p7zip/7z libexec/p7zip/7z.so libexec/p7zip/7zCon.sfx libexec/p7zip/7za libexec/p7zip/7zr man/man1/7z.1.gz man/man1/7za.1.gz man/man1/7zr.1.gz -%%PORTDOCS%%%%DOCSDIR%%/7zC.txt -%%PORTDOCS%%%%DOCSDIR%%/7zFormat.txt -%%PORTDOCS%%%%DOCSDIR%%/License.txt -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/add.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/bench.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/delete.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract_full.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/hash.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/index.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/list.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/rename.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/style.css -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/test.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/update.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/exit_codes.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/index.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/style.css -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_exclude.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_include.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_no.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/charset.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/exclude.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/include.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/index.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/large_pages.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/list_tech.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/method.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/output_dir.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/overwrite.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/password.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/recurse.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sa.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/scrc.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sdel.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sfx.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sni.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sns.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/spf.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ssc.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdin.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdout.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stl.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stop_switch.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/style.css -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/type.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/update.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/volume.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/working_dir.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/yes.htm -%%PORTDOCS%%%%DOCSDIR%%/MANUAL/syntax.htm -%%PORTDOCS%%%%DOCSDIR%%/Methods.txt -%%PORTDOCS%%%%DOCSDIR%%/copying.txt -%%PORTDOCS%%%%DOCSDIR%%/lzma.txt -%%PORTDOCS%%%%DOCSDIR%%/readme.txt -%%PORTDOCS%%%%DOCSDIR%%/readme.unix -%%PORTDOCS%%%%DOCSDIR%%/src-history.txt -%%PORTDOCS%%%%DOCSDIR%%/unRarLicense.txt Index: head/archivers/p7zip-codec-rar/Makefile =================================================================== --- head/archivers/p7zip-codec-rar/Makefile (revision 402987) +++ head/archivers/p7zip-codec-rar/Makefile (revision 402988) @@ -1,25 +1,25 @@ # $FreeBSD$ PKGNAMESUFFIX= -codec-rar PORTREVISION= 0 COMMENT= RAR decoder codec for p7zip LICENSE= LGPL21 UNRAR LICENSE_COMB= multi LICENSE_NAME_UNRAR= unRAR usage restriction license LICENSE_FILE_UNRAR= ${WRKSRC}/DOC/unRarLicense.txt LICENSE_PERMS_UNRAR= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell MASTERDIR= ${.CURDIR}/../p7zip ALL_TARGET= common7z DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist OPTIONS_EXCLUDE= DOCS do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs - ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/Rar29.so ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs + ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/Rar.so ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs .include "${MASTERDIR}/Makefile" Index: head/archivers/p7zip-codec-rar/pkg-plist =================================================================== --- head/archivers/p7zip-codec-rar/pkg-plist (revision 402987) +++ head/archivers/p7zip-codec-rar/pkg-plist (revision 402988) @@ -1 +1 @@ -libexec/p7zip/Codecs/Rar29.so +libexec/p7zip/Codecs/Rar.so