gentoo auto-resync : 29:10:2022 - 04:00:35

4 files changed, 91 insertions, 0 deletions

diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 7469eca9031c..a717f860ba2c 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,5 +1,8 @@
 AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79
+AUX libmcrypt-2.5.8-prototypes.patch 1435 BLAKE2B 6b4e85df1432e7766d5e678595b08b75a1592993d79f18373d28868566b4cbe271552d7e899719530677e4f2ad2b34d4308f01ff7808a0527507f23dc74dbf70 SHA512 c821c8c6bb42e50bb377c85042ff3127375b195ffa075d17a6ead6cedd01ff66dfe6e1fdf049a48d12b5285ee26e0a2208a86ab333294055c2df7723857c70d7
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
+AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a239e45020de177271da7ac6b15c20f6d791399f5fb9c48970e66e6f43168408ce83c347fc8c1387308fee9d273726f268ed91 SHA512 d5bf3520f101a5edae1e165358c075be763ec1a76d721301b562476fe6495f4cfb0b991c71c24fe182885bf86903ef796b934fd9f5b2f026ad8a433579d70791
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
 EBUILD libmcrypt-2.5.8-r4.ebuild 997 BLAKE2B 09eabad4327b46c88a5930322f77bebf3035c09ff5d53cc9a2cafff485326b7c7f6d02c6e70695e308ec856fa7bd2a9d4014413133214ffa31e049eca3b70e15 SHA512 db16aa64a129a6feadbc8831712b7e0b95163c6c1a6459aa35075e60839e76022c2361a73db80d57b333717ea4dfcb82399c2b7abd3c2e9641e3ef47294bff47
+EBUILD libmcrypt-2.5.8-r5.ebuild 1254 BLAKE2B 46f964ee310decd45d39f409a5d890da2f4ade958f4f079a1776576a7a498f94416b63a2d6719c0d732d63c4e918262fbc9b8b0a94012e23b3f6285949b1ab63 SHA512 196d42be134d5a7ab32cbd7f798c39e65a50d02108d78581b06faffde4b9f99f2c3b58909402a4d33ad9184419e848bb330e86d05a38be77f0f8f12df7a774be
 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
new file mode 100644
index 000000000000..eca6e7793161
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
@@ -0,0 +1,35 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/des.c.BAD libmcrypt-2.5.8/modules/algorithms/des.c
+--- libmcrypt-2.5.8/modules/algorithms/des.c.BAD	2008-08-25 17:40:29.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/des.c	2008-08-25 17:40:51.000000000 -0400
+@@ -35,9 +35,12 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
+-perminit_fp();
+-static word32 f();
++static void permute_ip(char *, DES_KEY *, char *);
++static void permute_fp(char *, DES_KEY *, char *);
++static void perminit_ip(DES_KEY *);
++static void spinit(DES_KEY *);
++static void perminit_fp(DES_KEY *);
++static word32 f(DES_KEY *, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
+diff -up libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD libmcrypt-2.5.8/modules/algorithms/tripledes.c
+--- libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD	2008-08-25 17:40:56.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/tripledes.c	2008-08-25 17:41:13.000000000 -0400
+@@ -36,8 +36,10 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute(), perminit(), spinit();
+-static word32 f();
++static void permute(char *, char[16][16][8], char *);
++static void perminit(char[16][16][8], char[64]);
++static void spinit(TRIPLEDES_KEY *, int);
++static word32 f(TRIPLEDES_KEY *, int, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
new file mode 100644
index 000000000000..f52dc9334b40
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
@@ -0,0 +1,12 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD libmcrypt-2.5.8/modules/algorithms/twofish.c
+--- libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD	2008-08-25 17:38:21.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/twofish.c	2008-08-25 17:38:30.000000000 -0400
+@@ -499,7 +499,7 @@ static void f_rnd(int i, word32* blk, TW
+ /* encrypt a block of text  */
+ WIN32DLL_DEFINE void _mcrypt_encrypt(TWI * pkey, word32 * in_blk)
+ {
+-	word32 t0, t1, blk[4];
++	word32 t0 = 0, t1 = 0, blk[4];
+ #ifdef WORDS_BIGENDIAN
+ 	blk[0] = byteswap32(in_blk[0]) ^ pkey->l_key[0];
+ 	blk[1] = byteswap32(in_blk[1]) ^ pkey->l_key[1];
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
new file mode 100644
index 000000000000..cf8ea98d268d
--- /dev/null
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="libmcrypt provides uniform interface to access several encryption algorithms"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DOCS=(
+	AUTHORS NEWS README THANKS TODO ChangeLog
+	doc/README.config doc/README.key doc/README.xtea
+	doc/example.c
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-rotate-mask.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #775113
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895
+	"${FILESDIR}/${P}-uninitialized.patch"
+	"${FILESDIR}/${P}-prototypes.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	mv libltdl/configure.in libltdl/configure.ac
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
+	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}