gentoo resync : 30.09.2018

3 files changed, 123 insertions, 21 deletions

diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
index d3072f582553..4413ea525eeb 100644
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@@ -1,3 +1,4 @@
+AUX pkcrack-1.2.2-build.patch 2539 BLAKE2B 54ce5effd250832aaf04977b4baa9a212cc80cf1fb4b50a7629314a7e716c2ced9a758f20631c0c783e25611ece51d19048880b9f63790140a8914a9661f1214 SHA512 48b71bc2d5aa850603eb1872c200465e655fcb527323ebc9d1728311fcf9fa15722f7b80a6809c7960ec0f4fcf3d4e65561880f61feb4dcbe35dedf15c198f20
 DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
-EBUILD pkcrack-1.2.2-r1.ebuild 1108 BLAKE2B 4aea9ef44695b89bf44baa0a795689e479610a308e34ba7a92a8d6dadfaf90acd76c5a44fc39c06b414bf571be6c67f81ace4c2b0ec1436ef75852b8ab231ce2 SHA512 1dd51a17e71b6f47fa04561f1235bc5628a77132a88812283b26a51593d6048d68cda2ba139af2ed9f08f9f8bb2e041f3bf5c7beecb9da5f4a9aabcaa2b91f57
+EBUILD pkcrack-1.2.2-r1.ebuild 1049 BLAKE2B f9898cfabf8537198fff10b66c5075e23789fcfe73d66fb80a96bb4d6f674191783986a58aad1ad6513bc9c53b89491596bac776129014b72bb83fdd984f425e SHA512 3058ef6d96bbe2851c1cd2e539a96795db66b55fa98e80998e421ad38d1a0447f9aaff5e1e3e972be937a6d5bd97e9ed91ee41f71888e85eb6e4a08e5fa46c0f
 MISC metadata.xml 370 BLAKE2B 1d584e6fa52911c3d0f099c44193eeb00261e2f46f99dd2924744e9f4ce4af84bddc72b85415f85e3ca5ad11612914bcc022e494b9c4c00a5e95f8c1b5f1d72d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492
diff --git a/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch b/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch
new file mode 100644
index 000000000000..d9e160decc2c
--- /dev/null
+++ b/app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch
@@ -0,0 +1,102 @@
+From 7bcbfd712044a5455f03d607a60c557f90d16671 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 23 Sep 2018 15:49:32 +0300
+Subject: [PATCH] build
+
+---
+ src/extract.c  | 2 +-
+ src/findkey.c  | 2 +-
+ src/main.c     | 2 +-
+ src/makekey.c  | 3 ++-
+ src/mktmptbl.c | 1 +
+ src/zdmain.c   | 2 +-
+ 6 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/extract.c b/src/extract.c
+index 6cb7800..58e740d 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -90,7 +90,7 @@ static void usage( char *prg )
+     fprintf( stderr, " -s <size>\textract only specified number of bytes\n" );
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ char	*ret, *outname;
+ int	outfile, err=0, i, caseflg=0, size=0;
+diff --git a/src/findkey.c b/src/findkey.c
+index 0de9dd3..ab2094a 100644
+--- a/src/findkey.c
++++ b/src/findkey.c
+@@ -56,7 +56,7 @@ static void usage( char *name )
+     exit( 1 );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ uword	key0, key1, key2;
+ int	pwdLen=0;
+diff --git a/src/main.c b/src/main.c
+index 8e58072..d84b339 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -128,7 +128,7 @@ static void usage( char *myself )
+     fprintf( stderr, " -n\tno progress indicator\n" );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ int		crypt, plain, cryptlength, plainlength;
+ struct stat	filestat;
+diff --git a/src/makekey.c b/src/makekey.c
+index 271fab3..f28029c 100644
+--- a/src/makekey.c
++++ b/src/makekey.c
+@@ -12,6 +12,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "pkcrack.h"
+ #include "keystuff.h"
+ #include "crc.h"
+@@ -24,7 +25,7 @@ static void usage( char *name )
+     exit( 1 );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ char *	pwd;  
+ int	pwdLen, i;
+diff --git a/src/mktmptbl.c b/src/mktmptbl.c
+index 46f1402..848f171 100644
+--- a/src/mktmptbl.c
++++ b/src/mktmptbl.c
+@@ -43,6 +43,7 @@
+ static char RCSID[]="$Id: mktmptbl.c,v 1.9 2002/11/02 15:12:06 lucifer Exp $";
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "mktmptbl.h"
+ 
+ ushort	tempTable[256][64];
+diff --git a/src/zdmain.c b/src/zdmain.c
+index bfb1f6b..6909b2d 100644
+--- a/src/zdmain.c
++++ b/src/zdmain.c
+@@ -35,7 +35,7 @@ static char RCSID[]="$Id: zdmain.c,v 1.4 2002/12/28 17:01:42 lucifer Exp $";
+ 
+ extern void zipdecrypt( char*infile, char*outfile, int k0, int k1, int k2 );
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ char *c;
+ 
+-- 
+2.16.4
+
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
index 251eb649d276..862cdd7871b6 100644
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="PkZip cipher breaker"
@@ -13,38 +13,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
-DEPEND="test? ( app-arch/zip[crypt] )"
 RDEPEND="!<app-text/html-xml-utils-5.3"
+BDEPEND="test? ( app-arch/zip[crypt] )"
 
 DOCS=(
-	../doc/KNOWN_BUGS
-	../doc/appnote.iz.txt
-	../doc/README.W32
-	../doc/pkzip.ps.gz
-	../doc/CHANGES
-	../doc/LIESMICH
-	../doc/README.html
-	../doc/README
+	doc/KNOWN_BUGS
+	doc/appnote.iz.txt
+	doc/README.W32
+	doc/pkzip.ps.gz
+	doc/CHANGES
+	doc/LIESMICH
+	doc/README.html
+	doc/README
 )
 
-S="${WORKDIR}/${P}/src"
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
 
-src_prepare() {
-	default
-	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
-		-e "/^CFLAGS=.*/d" \
-		-e "s/CFLAGS/LDFLAGS/" \
-		Makefile
-	sed -i -e "s:void main:int main:" *.c
+src_compile() {
+	cd src
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_test() {
-	cd "${S}/../test"
-	make CC="$(tc-getCC)" all
+	cd test
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_install() {
 	einstalldocs
+	cd src
 	dobin pkcrack zipdecrypt findkey makekey
 	newbin extract "$PN-extract"
 }