Cleanup patches, a* categories.

Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight

3 files changed, 11 insertions, 11 deletions

diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp
index 2ff5cd79e848..e01719cb0514 100644
--- a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp
+++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp
@@ -1,9 +1,9 @@
 Patch for CVE-2016-2334.
 
 Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/
---- CPP/7zip/Archive/HfsHandler.cpp.orig	Fri Jun 19 06:52:08 2015
-+++ CPP/7zip/Archive/HfsHandler.cpp	Mon May 23 20:37:42 2016
-@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFork &fork, cons
+--- CPP/7zip/Archive/HfsHandler.cpp.orig	2015-06-19 10:52:08 UTC
++++ CPP/7zip/Archive/HfsHandler.cpp
+@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo
        item.GroupID = Get32(r + 0x24);
        item.AdminFlags = r[0x28];
        item.OwnerFlags = r[0x29];
@@ -13,13 +13,13 @@ Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b
        item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount
        item.FileType = Get32(r + 0x30);
        item.FileCreator = Get32(r + 0x34);
-@@ -1571,6 +1573,9 @@ HRESULT CHandler::ExtractZlibFile(
-       blockSize = (UInt32)rem;
+@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile(
  
      UInt32 size = GetUi32(tableBuf + i * 8 + 4);
-+
+ 
 +    if (size > buf.Size() || size > kCompressionBlockSize + 1)
 +        return S_FALSE;
- 
++
      RINOK(ReadStream_FALSE(inStream, buf, size));
  
+     if ((buf[0] & 0xF) == 0xF)
diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp
index 54c50066a2ef..a8e754d18f17 100644
--- a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp
+++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp
@@ -1,9 +1,9 @@
 Patch for CVE-2016-2335.
 
 Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/
---- CPP/7zip/Archive/Udf/UdfIn.cpp.orig	Fri Nov 20 15:40:08 2015
-+++ CPP/7zip/Archive/Udf/UdfIn.cpp	Mon May 23 20:37:46 2016
-@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int volIndex, int fsI
+--- CPP/7zip/Archive/Udf/UdfIn.cpp.orig	2015-11-20 20:40:08 UTC
++++ CPP/7zip/Archive/Udf/UdfIn.cpp
+@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol
      return S_FALSE;
    CFile &file = Files.Back();
    const CLogVol &vol = LogVols[volIndex];
diff --git a/archivers/p7zip/files/patch-CPP-Windows-System.cpp b/archivers/p7zip/files/patch-CPP_Windows_System.cpp
index 467aceaccba2..4214f0888b95 100644
--- a/archivers/p7zip/files/patch-CPP-Windows-System.cpp
+++ b/archivers/p7zip/files/patch-CPP_Windows_System.cpp
@@ -1,4 +1,4 @@
---- CPP/Windows/System.cpp.orig	2015-09-26 08:47:01 UTC
+--- CPP/Windows/System.cpp.orig	2015-11-20 21:33:04 UTC
 +++ CPP/Windows/System.cpp
 @@ -44,7 +44,7 @@ namespace NWindows
  		#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)