From f5588424e3182e3006f725536eebd7dc7b5bbfd4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Dec 2023 14:53:46 +0000 Subject: gentoo auto-resync : 16:12:2023 - 14:53:46 --- dev-libs/libmcrypt/Manifest | 3 ++ .../libmcrypt/files/libmcrypt-2.5.8-c99-2.patch | 42 ++++++++++++++++ dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch | 56 ++++++++++++++++++++++ dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild | 45 +++++++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch create mode 100644 dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch create mode 100644 dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild (limited to 'dev-libs/libmcrypt') diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest index 7ff627317406..9cc29dcc2c31 100644 --- a/dev-libs/libmcrypt/Manifest +++ b/dev-libs/libmcrypt/Manifest @@ -1,4 +1,6 @@ AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79 +AUX libmcrypt-2.5.8-c99-2.patch 1103 BLAKE2B ad03edd1015f2d559f74ddf05944e6eaf30c6a4360fed2462b6530b6eca127681625156fda6699545c0704c39951e67d301b170b19139836ed90eaff7a05d2dd SHA512 601c98a58c152a16762d0835575137146ee907ef6597fe0c1d0fa94a53c67d3985e41bf86bdcc52a776e57d5c15f6da4ba19cf6d986126b66998aa579949733f +AUX libmcrypt-2.5.8-c99.patch 3193 BLAKE2B c8d692a2e0bf94ee0cb5e28ac40540b3c43e0003dcfcb2a0aba7e5a9964505616229e84635abe43179ce4728bfd8267f82191d812f2303d7e476c2d1ec744c57 SHA512 83fb939e6668dcce0b376f934641fbf232d42a8082c7bf625a0062ae69d55d3061d44d4abd1d3e4d4d7d75294e9032798d5f1c8159033bc134458d949aa3086d AUX libmcrypt-2.5.8-implicit-int.patch 2367 BLAKE2B be96b6c76f75d6998211877aa8e7bae68c0a585ac5ca469f38cf701c5d46c3a7e18c9b41e68cc1e111cad6c6951737a2b02867e08761769cd4bead44028cc849 SHA512 a3e0dfab2a17393631e09334f214a11c572df1cc8bc3572375d35c9598f1b51bf75b5a4db382022273da68e58b48d70173d040095bc17ef235bdb679f1ebe8eb 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 @@ -6,4 +8,5 @@ AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a2 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1 EBUILD libmcrypt-2.5.8-r4.ebuild 918 BLAKE2B 1a6e3419f27e0bfe0bfc8f3cbfabd53b802d0069efc90293012b6fb331a611d0e877284273f2e26dd8e10358a369f10042f6c6080a6466c5b90fe525f55b4b93 SHA512 fc16b72db54973d4b74b58b3cf9cfd3719131a0e4baf749b94dd9cc2e090e1d011e6793b28469716e18c5a2d8d257cada2dac8f971a0e38cdc878969f3cf3c5b EBUILD libmcrypt-2.5.8-r6.ebuild 1207 BLAKE2B 5396daf57c3f6b226346c0eb183e3d5a4e4873a1156b11af94f99d43e66b0ae27f42c22409e8bdd3682a66d82812832b75ab869eee013138b6f0c61c756e86fe SHA512 d8210a585f575a6093092d1a2699435603bc2b2146859578f435633d017527e55bd574f51c2fa814fb420fa9937251667b31c3863d42715040fb8b0c96306aff +EBUILD libmcrypt-2.5.8-r7.ebuild 1253 BLAKE2B b6417c7e10bae50e4e21b5c31dfe2c802d05fcc5ca74e094016bcef13bf1fc5794da3b5ec182cdf582af4ca18d1a2309f6a2a63391ade418e3b085ebcfd82f04 SHA512 534d3826f5877daa39ee02a390172b13aebc433f31ea56446c2832b07a14c8982ed8ee7cec5603f83ed154908d44e7298d7bf4469ee26ecb0a34656261e190a3 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3 diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch new file mode 100644 index 000000000000..ba2236de6c42 --- /dev/null +++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch @@ -0,0 +1,42 @@ +https://src.fedoraproject.org/rpms/libmcrypt/blob/e02fbd614a5b7ba093e9e15ab322e7eb02d64e3b/f/libmcrypt-configure-c99-2.patch + +Fix glitches in the readdir and bcopy probes. They were +just invalid. + +diff --git a/configure b/configure +index d0fb8783e147654b..4fe7660a16359171 100755 +--- a/configure ++++ b/configure +@@ -6639,7 +6639,7 @@ fi + done + + +-for ac_func in readdir,, ++for ac_func in readdir + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -6741,7 +6741,7 @@ fi + done + + +-for ac_func in bcopy,, ++for ac_func in bcopy + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +diff --git a/configure.in b/configure.in +index a815778931728ec2..f0c9a0e8f73e1153 100644 +--- a/configure.in ++++ b/configure.in +@@ -204,8 +204,8 @@ AC_FUNC_MEMCMP + AC_FUNC_REALLOC + + AC_CHECK_FUNCS([bzero memmove memset mlock readdir_r strchr strdup strrchr]) +-AC_CHECK_FUNCS([readdir,,]) +-AC_CHECK_FUNCS([bcopy,,]) ++AC_CHECK_FUNCS([readdir]) ++AC_CHECK_FUNCS([bcopy]) + + dnl Checks for libraries. + AC_C_BIGENDIAN diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch new file mode 100644 index 000000000000..25c555c99627 --- /dev/null +++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch @@ -0,0 +1,56 @@ +https://src.fedoraproject.org/rpms/libmcrypt/blob/e02fbd614a5b7ba093e9e15ab322e7eb02d64e3b/f/libmcrypt-c99.patch + +Add return and argument types to fake prototypes in mcrypt_symb.c. +This avoids build failures with future compilers that do not support +implicit function declarations. + +Also fix a minor type error in the perminit calls in the Triple DES +implementation. + +Submitted upstream: + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index a1a09578858aaf3c..a92f150627a1f610 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -23,8 +23,8 @@ mcrypt_symb.c: mcrypt_internal.h + @echo "/* This is automatically created. Don't touch... */" >> mcrypt_symb.c + @echo "" >> mcrypt_symb.c + -@for i in $(EXTRA_ALGOS); do \ +- if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \ +- if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \ ++ if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \ ++ if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \ + done + @echo "" >> mcrypt_symb.c + @echo "const mcrypt_preloaded mps[] = {" >> mcrypt_symb.c +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 1baaa1e94be1abce..e0e690d1c831370f 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -561,8 +561,8 @@ mcrypt_symb.c: mcrypt_internal.h + @echo "/* This is automatically created. Don't touch... */" >> mcrypt_symb.c + @echo "" >> mcrypt_symb.c + -@for i in $(EXTRA_ALGOS); do \ +- if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \ +- if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \ ++ if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \ ++ if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \ + done + @echo "" >> mcrypt_symb.c + @echo "const mcrypt_preloaded mps[] = {" >> mcrypt_symb.c +diff --git a/modules/algorithms/tripledes.c b/modules/algorithms/tripledes.c +index 98e9bd45b4f336b1..2737d2fd8fd02a3f 100644 +--- a/modules/algorithms/tripledes.c ++++ b/modules/algorithms/tripledes.c +@@ -201,8 +201,8 @@ static int _mcrypt_desinit(TRIPLEDES_KEY * key) + spinit(key, 0); + spinit(key, 1); + spinit(key, 2); +- perminit(&key->iperm, ip); +- perminit(&key->fperm, fp); ++ perminit(key->iperm, ip); ++ perminit(key->fperm, fp); + + + return 0; diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild new file mode 100644 index 000000000000..3f3d5b686185 --- /dev/null +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Provides an uniform interface to access several encryption algorithms" +HOMEPAGE="https://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" + +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" + "${FILESDIR}/${P}-c99.patch" + "${FILESDIR}/${P}-c99-2.patch" +) + +src_prepare() { + default + + mv configure.in configure.ac || die + mv libltdl/configure.in libltdl/configure.ac || die + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die + + eautoreconf # update stale autotools +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} -- cgit v1.2.3