gentoo resync : 14.05.2020

6 files changed, 24 insertions, 180 deletions

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 49a890c2e20d..c22f3c860e41 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,8 +1,4 @@
-AUX ophcrack-openssl-des.patch 3253 BLAKE2B 91bdac930a784eb8f68c9cfbec7f0a41e05356cc5a87b2db37669e943fc576938b3cc494446d78407555d56af4357a77e4d92f391a4ec5971b5ae97ccd36a0db SHA512 60f4ec2792f1d697db62bbef16a1f365e368fa4cf99695b1fdda4cdfaa1fdef04bf39dbfea72fe5d97aead6435553051eda0b3b619ae93915f11b87de29cc4bc
-DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
-DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
+AUX ophcrack-ar.patch 242 BLAKE2B f268c2a0c0900c3ea6a3e4fc1c99530a090e413fbba9e4ff7c339ae6b5db49ad546eb58cd42a64f81d669c38ed9a4de25cfcfb29ee17af1c88b4372aee4fda51 SHA512 bb4f8154abe676ccec48536b50513b45253828334db040f28fe71e5b9d3d7abb6b34693ec234f10ce8c26592d07ccdd678a68b96b6a80ca9137c18a9e0598bfc
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.6.0.ebuild 789 BLAKE2B 2b669ff146298dc6c004511384b7b462a79f587f9f18a17baa1500ba333ef2567b014bb5d2eb92a05a99711231a22375d0062455f61dc7fd10cbcaf8b9388ab4 SHA512 f4d7f623523eed36281a0a95915680a504bab50fb866e9f1b1edee414055e6c44fe630dee9b077f6c242520353019cd141a5170fa862f769378256208d0c11c9
-EBUILD ophcrack-3.7.0.ebuild 739 BLAKE2B 9019a62a463c8f1bbdb7f3d5d90d1d130cfc79c09a87a3a86d4722c6788561cd67ec32f9dbafc08064e2dbfeb2935b63fa3c3ce18d5b7f60f46f0b937d9ef305 SHA512 3f684df8eab1422442e1665cebe987d0d5949d44f55c549930e21a4d585511f070d65fe5552f64ec77ee8a8f7fd4422cc1dd6c62dc5dd1b7de8a56e913f3c219
-EBUILD ophcrack-3.8.0.ebuild 907 BLAKE2B be3aa07cd0440d11d4583f7734d12d875a849b041e7cef419c346029cb128220dad093d31e01dd72cf3f3a652e5529c8ea996732bcc562e1d732d282ec3baf2f SHA512 e13997efd14e685f24040590e1dbbaf5a4a93b343801d852f269a9223d3f7209ee9a1bb40ab5e0649f921442f26fc7ca91687fa7d9dd796a7ddeb35d5a89071b
+EBUILD ophcrack-3.8.0.ebuild 939 BLAKE2B 437e2f298f7855b67748e9f0ecd82f901ad9eead6423f561ae83953b83065ba1b51bd13da7c994510295ce39aaf193bf3a51f1848cfd03278768bbd3eb281b22 SHA512 e91c9d5589133065b764d41d7701f4ba7b962071ba2da7dc81dc6f3e62b6c75bb61413f1f60e65d7ffc39065950cecef6b0319619cfd8203be9b52e34195f323
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/files/ophcrack-ar.patch b/app-crypt/ophcrack/files/ophcrack-ar.patch
new file mode 100644
index 000000000000..422c17398d20
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-ar.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common.mk.in b/src/common.mk.in
+index 0f090a8..9c133e0 100644
+--- a/src/common.mk.in
++++ b/src/common.mk.in
+@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
+ all:
+ 
+ %.a:
+-	ar r $@ $^
++	$(AR) r $@ $^
+ 	$(RANLIB) $@
+ 
+ %.o: %.c
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
deleted file mode 100644
index 2515c178abb7..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/src/lmtable.c	2013-06-04 07:42:47 UTC
-+++ b/src/lmtable.c
-@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
- /*-------------------------------------------------------------------------*/
- void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
-   uchar_t key[8];
--  des_key_schedule ks;
--  des_cblock *magic = (des_cblock*)lmmagic;
-+  DES_key_schedule ks;
-+  DES_cblock *magic = (DES_cblock*)lmmagic;
-   
-   key[0] = pwd[0];
-   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
-@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
-   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
-   key[7] = (pwd[6] << 1) ;
- 
--  des_set_odd_parity(&key);
--  des_set_key(&key, ks);
--  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
-+  DES_set_odd_parity(&key);
-+  DES_set_key(&key, &ks);
-+  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
- }
-
---- a/src/samdump2/samdump2.c	2015-03-30 02:26:33 UTC
-+++ b/src/samdump2/samdump2.c
-@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
- 	for (i=0;i<8;i++) {
- 		key[i] = (key[i]<<1);
- 	}
--	des_set_odd_parity((des_cblock *)key);
-+	DES_set_odd_parity((DES_cblock *)key);
- }
- 
- /*
-@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
-   unsigned char hbootkey[0x20];
-   
-   /* Des */
--  des_key_schedule ks1, ks2;
--  des_cblock deskey1, deskey2;
-+  DES_key_schedule ks1, ks2;
-+  DES_cblock deskey1, deskey2;
-   
-   int i, j;
-   
-@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
-       
-       /* Get the two decrpt keys. */
-       sid_to_key1(rid,(unsigned char *)deskey1);
--      des_set_key_checked((des_cblock *)deskey1,ks1);
-+      DES_set_key_checked((DES_cblock *)deskey1, &ks1);
-       sid_to_key2(rid,(unsigned char *)deskey2);
--      des_set_key_unchecked((des_cblock *)deskey2,ks2);
-+      DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
-       
-       /* Decrypt the lanman password hash as two 8 byte blocks. */
--      des_ecb_encrypt((des_cblock *)obfkey,
--		      (des_cblock *)fb, ks1, DES_DECRYPT);
--      des_ecb_encrypt((des_cblock *)(obfkey + 8),
--		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)obfkey,
-+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-       
-       
-       
-@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
-       if (lm_size != 0x14) {
- 	/* Get the two decrpt keys. */
- 	sid_to_key1(rid,(unsigned char *)deskey1);
--	des_set_key((des_cblock *)deskey1,ks1);
-+	DES_set_key((DES_cblock *)deskey1, &ks1);
- 	sid_to_key2(rid,(unsigned char *)deskey2);
--	des_set_key((des_cblock *)deskey2,ks2);
-+	DES_set_key((DES_cblock *)deskey2, &ks2);
-       }
- 
-       /* Decrypt the NT md4 password hash as two 8 byte blocks. */
--      des_ecb_encrypt((des_cblock *)obfkey,
--		      (des_cblock *)fb, ks1, DES_DECRYPT);
--      des_ecb_encrypt((des_cblock *)(obfkey + 8),
--		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)obfkey,
-+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-       
-       /* sf27 wrap to sf25 */
-       //sf27( obfkey, (int*)&rid, fb );
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
deleted file mode 100644
index 94d9250666bc..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib"
-DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
-
-src_configure() {
-
-	local myconf
-
-	myconf="${myconf} $(use_enable debug) --disable-gui"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
deleted file mode 100644
index 736f3bea8b86..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib"
-DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-src_configure() {
-
-	local myconf
-
-	myconf="${myconf} $(use_enable debug) --disable-gui"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 98ebe5ffe25f..c35c0f3c154c 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug libressl qt5 +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib
-		 qt5? ( dev-qt/qtcharts:5
-		 dev-qt/qtgui:5 )"
+		libressl? ( dev-libs/libressl:0= )
+		net-libs/netwib
+		qt5? ( dev-qt/qtcharts:5
+		dev-qt/qtgui:5 )"
 DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
+		virtual/pkgconfig
+		${CDEPEND}"
 RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
+		${CDEPEND}"
+PATCHES=("${FILESDIR}/ophcrack-ar.patch")
 
 src_configure() {