diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch new file mode 100644 index 0000000000..6da1f98ac7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch @@ -0,0 +1,20 @@ +https://sourceforge.net/p/mhash/patches/11/ + +Compiling mhash-0.9.9.9 on platforms (like AIX) without GNU libc compatible malloc leads to undefined symbol rpl_malloc +when linking the in-mhash executables drver, frag_test, rest_test, hmac_test, keygen_test. + +Reason is that configure.in still contains AC_FUNC_MALLOC, detecting need +to "#define malloc rpl_malloc", while mhash does not provide a rpl_malloc implementation. + +As the only use of malloc() in lib/stdfns.c does not rely on GNU libc +compatible malloc actually, there is no need to check for one. +--- a/configure.in ++++ b/configure.in +@@ -64,7 +64,6 @@ AC_CHECK_HEADERS(signal.h stdint.h stdio.h stdlib.h string.h strings.h) + + dnl Checks for functions + +-AC_FUNC_MALLOC + AC_FUNC_MEMCMP + + AC_CHECK_FUNCS(bcopy bzero) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc new file mode 100644 index 0000000000..6186f85c78 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc @@ -0,0 +1,4 @@ +Libs:-lmhash +Name: mhash +Version: @VERSION@ +Description: provides a uniform interface to several hash algorithms diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml index dad2754fed..11aead93f4 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml @@ -2,7 +2,7 @@ - - mhash + + mhash diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild similarity index 72% rename from sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild index 55e78bbb25..e2dff3f8b8 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Library providing a uniform interface to a large number of hash algorithms" -HOMEPAGE="http://mhash.sourceforge.net/" +HOMEPAGE="https://mhash.sourceforge.net/" SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" BDEPEND="dev-lang/perl" # pod2html @@ -25,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${P}-force64bit-tiger.patch "${FILESDIR}"/${P}-align.patch "${FILESDIR}"/${P}-alignment.patch + "${FILESDIR}"/${P}-no-malloc-check.patch ) DOCS=( doc/example.c doc/skid2-authentication ) @@ -38,6 +39,10 @@ src_prepare() { -e 's/--netscape//' \ "${S}"/doc/Makefile.in || die + sed \ + -e "s:@VERSION@:${PV}:" \ + "${FILESDIR}"/${PN}.pc > ${PN}.pc || die + # Refresh bundled libtool (ltmain.sh) # (elibtoolize is not sufficient) # bug #668666 @@ -45,9 +50,6 @@ src_prepare() { } src_configure() { - # https://sourceforge.net/p/mhash/patches/11/ - export ac_cv_func_malloc_0_nonnull=yes - econf $(use_enable static-libs static) } @@ -59,5 +61,7 @@ src_compile() { src_install() { default + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc find "${ED}" -name '*.la' -delete || die }