From d33b3cf6cff9fdbfc8362bf854c3c34b2c28d518 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Apr 2023 00:01:06 +0100 Subject: gentoo auto-resync : 21:04:2023 - 00:01:05 --- dev-libs/libmcrypt/Manifest | 3 +- .../files/libmcrypt-2.5.8-implicit-int.patch | 31 ++++++++++++++++ dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild | 41 --------------------- dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild | 42 ++++++++++++++++++++++ 4 files changed, 75 insertions(+), 42 deletions(-) create mode 100644 dev-libs/libmcrypt/files/libmcrypt-2.5.8-implicit-int.patch delete mode 100644 dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild create mode 100644 dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild (limited to 'dev-libs/libmcrypt') diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest index c47646f2a9f5..0a9b8424c4c1 100644 --- a/dev-libs/libmcrypt/Manifest +++ b/dev-libs/libmcrypt/Manifest @@ -1,8 +1,9 @@ AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79 +AUX libmcrypt-2.5.8-implicit-int.patch 2286 BLAKE2B 2e814a47d2b6c55ab8b13ab753e5227b09daa71703c2114857b971a8a683355751774d9399c2a5f4dc95c9249287eb212398108d75da91815acce655967b5ab1 SHA512 625252e7b6c5f0cf022f6e1cfcface0f0616b4c7c4ef4dca045f1108f17fd0ab3e01435606a7db513e2bed53e26860e7a14a342792ed86ad2cdcf37da01e1354 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 992 BLAKE2B 8dd30536cd627150835cd6b4df96075410f5fc604d41d26298d84db8f7309016472c8fce6afcb8128fbd50ff349a19968ede8efce02bd3456df7dda563037eef SHA512 baa75457336aed9bb842e8150cc6fbe103c03cae6e78bf114620ac022d8c7ff496f826a83732998cb488004621fe9023b82803f3ba53d27b211c9c227102d2cf -EBUILD libmcrypt-2.5.8-r5.ebuild 1246 BLAKE2B ed3ca8781e3d736cc6c2739bab02e3f3a3466e5aa0b39f578adbaaa579f999b45f5a275090014be4e96e61a8d7f0be38734e975b9ba553cb2845c4c78e7be25d SHA512 daa81407b62afb3faa36782ef39093ad5c45a9777da435e8b1711821cd748b58de9e0a1a45060bf85700cc18fa5920baedf904b68a008494257b60a24a1cfece +EBUILD libmcrypt-2.5.8-r6.ebuild 1281 BLAKE2B 49e683f512e1626720dc1408dc5247f98ebf45f86484bb659fae46598a987cd0a9b36f4860a860efa31fb79951b5ffc3bd2a04d468952c977b42f943e8a9761a SHA512 92fc367a4cb15360329972ff3b5f83a237761a4853a98f1c7300b40f9a3d9369e8879f197ee042b0fdd02c5a5e24a733050cacd1635c7052bd49a3a0a1474ac0 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3 diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-implicit-int.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-implicit-int.patch new file mode 100644 index 000000000000..f504014011e3 --- /dev/null +++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-implicit-int.patch @@ -0,0 +1,31 @@ +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. + +--- 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 +--- 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/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild deleted file mode 100644 index 54637cd96a4f..000000000000 --- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 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 ~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 -} diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild new file mode 100644 index 000000000000..ad764fba60fa --- /dev/null +++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild @@ -0,0 +1,42 @@ +# 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 ~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" + "${FILESDIR}/${P}-implicit-int.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 +} -- cgit v1.2.3