From b401f4b0e4dcb2d69cac5617cbd14b32b7b1d09f Mon Sep 17 00:00:00 2001
From: milisbir <milisarge@gmail.com>
Date: Fri, 29 Dec 2017 10:33:31 +0200
Subject: [PATCH] p7zip.guncellendi

---
 talimatname/genel/p/p7zip/CVE-2016-9296.patch | 11 +++++++
 talimatname/genel/p/p7zip/talimat             | 29 +++++++++++++------
 2 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 talimatname/genel/p/p7zip/CVE-2016-9296.patch

diff --git a/talimatname/genel/p/p7zip/CVE-2016-9296.patch b/talimatname/genel/p/p7zip/CVE-2016-9296.patch
new file mode 100644
index 000000000..fa98afb4f
--- /dev/null
+++ b/talimatname/genel/p/p7zip/CVE-2016-9296.patch
@@ -0,0 +1,11 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig	2016-11-21 01:42:29.460901230 +0000
++++ ./CPP/7zip/Archive/7z/7zIn.cpp	2016-11-21 01:42:57.481197725 +0000
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+         ThrowIncorrect();
+   }
+-  HeadersSize += folders.PackPositions[folders.NumPackStreams];
++  if (folders.PackPositions)
++      HeadersSize += folders.PackPositions[folders.NumPackStreams];
+   return S_OK;
+ }
diff --git a/talimatname/genel/p/p7zip/talimat b/talimatname/genel/p/p7zip/talimat
index 19a564289..f17ebb6ff 100644
--- a/talimatname/genel/p/p7zip/talimat
+++ b/talimatname/genel/p/p7zip/talimat
@@ -1,20 +1,31 @@
-# Tanım: 7zip sıkıştırılmış dosya arşivinin komut satırı sürümü
+# Tanım: 7zip sıkıştırılmış dosya arşivinin konsol uygulaması
 # URL: http://p7zip.sourceforge.net
 # Paketçi: milisarge
-# Gerekler: nasm yasm 
+# Gerekler: yasm 
+# Grup: ağ
 
 isim=p7zip
-surum=9.38.1
+surum=16.02
 devir=1
 
-kaynak=(http://downloads.sourceforge.net/sourceforge/$isim/${isim}_${surum}_src_all.tar.bz2)
+kaynak=(https://downloads.sourceforge.net/project/$isim/$isim/$surum/${isim}_${surum}_src_all.tar.bz2
+		CVE-2016-9296.patch)
 
 derle() {
 	cd ${isim}_$surum
-	[[ `uname -m` = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-	make -j1 all3 OPTFLAGS="${CXXFLAGS}"
-	make install DEST_DIR=$PKG DEST_HOME=/usr DEST_MAN=/usr/share/man
+	# https://sourceforge.net/p/p7zip/bugs/185/
+	patch -Np1 -i $SRC/CVE-2016-9296.patch
 
+	cp makefile.linux_amd64_asm makefile.machine
+
+	make all3
+
+	make install \
+	DEST_DIR="$PKG" \
+	DEST_HOME=/usr 
+
+	# Remove documentation for the GUI file manager
+	rm -r "$PKG/usr/share/doc/"
+
+	install -d "${PKG}"/usr/share/licenses/p7zip
 }