Attachment 163612 Details for Bug 204865 – archivers/p7zip patch

[patch] archivers/p7zip patch

archivers_p7zip (text/plain), 11.14 KB, created by Po-Chuan Hsieh on 2015-11-28 12:52:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2015-11-28 12:52:49 UTC

Size: 11.14 KB

patch

obsolete

>Index: archivers/p7zip/Makefile
>===================================================================
>--- archivers/p7zip/Makefile	(revision 402508)
>+++ archivers/p7zip/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	p7zip
>-PORTVERSION=	9.38.1
>-PORTREVISION?=	2
>+PORTVERSION=	15.09
> CATEGORIES=	archivers
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}_${DISTVERSION}_src_all
>@@ -28,6 +27,8 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>+PORTDOCS=	*
>+
> post-patch:
> 	${SED} -e 's!g\+\+!${CXX}!' \
> 	       -e 's!gcc!${CC}!' \
>@@ -51,10 +52,12 @@
> 	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za
> 	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr
> 
>+	(cd ${WRKSRC}/man1 && \
>+		${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
>+
>+do-install-DOCS-on:
> 	(cd ${WRKSRC}/DOC && \
> 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
>-	(cd ${WRKSRC}/man1 && \
>-		${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
> .endif
> 
> .include <bsd.port.mk>
>Index: archivers/p7zip/distinfo
>===================================================================
>--- archivers/p7zip/distinfo	(revision 402508)
>+++ archivers/p7zip/distinfo	(working copy)
>@@ -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: archivers/p7zip/files/patch-CPP-Windows-System.cpp
>===================================================================
>--- archivers/p7zip/files/patch-CPP-Windows-System.cpp	(revision 402508)
>+++ archivers/p7zip/files/patch-CPP-Windows-System.cpp	(working copy)
>@@ -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: archivers/p7zip/files/patch-CVE-2015-1038
>===================================================================
>--- archivers/p7zip/files/patch-CVE-2015-1038	(revision 402508)
>+++ archivers/p7zip/files/patch-CVE-2015-1038	(working copy)
>@@ -21,9 +21,9 @@
> 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)
>@@ -32,9 +32,9 @@
>    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<ISequentialOutStream> _outFileStream;
>  
>@@ -46,7 +46,7 @@
>  
>    UInt64 NumErrors;
>    bool PasswordIsDefined;
>-@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
>+@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
>    }
>    _outFileStream.Release();
>    if (_extractMode && _processedFileInfo.AttribDefined)
>@@ -71,7 +71,7 @@
>  
>  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);
>@@ -80,18 +80,18 @@
>        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
>    }
>  }
>  
>@@ -102,7 +102,7 @@
>    CRecordVector<CExtrRefSortPair> 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));
>    }
>@@ -116,7 +116,7 @@
> +
> +  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"
>@@ -127,7 +127,7 @@
>  #include "../../IPassword.h"
>  
>  #include "../../Common/FileStreams.h"
>-@@ -213,6 +215,8 @@ class CArchiveExtractCallback:
>+@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
>    bool _saclEnabled;
>    #endif
>  
>@@ -136,18 +136,18 @@
>    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)
>@@ -156,9 +156,9 @@
>    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;
>  }
>  
>@@ -168,7 +168,7 @@
>  {
>    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)) {
>@@ -179,7 +179,7 @@
>            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;
>  }
>  
>@@ -222,8 +222,8 @@
> +
>  }}}
>  
>- 
>---- 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
>@@ -249,7 +249,7 @@
>  bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
>  
>  #ifndef UNDER_CE
>-@@ -69,6 +73,31 @@ public:
>+@@ -76,6 +80,31 @@ public:
>    bool Remove();
>  };
>  
>Index: archivers/p7zip/pkg-plist
>===================================================================
>--- archivers/p7zip/pkg-plist	(revision 402508)
>+++ archivers/p7zip/pkg-plist	(working copy)
>@@ -9,61 +9,3 @@
> 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

Actions: View | Diff

Attachments on bug 204865: 163612 | 163840