mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 07:31:01 +02:00
app-crypt/mhash: Sync with Gentoo
It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742.
This commit is contained in:
parent
4a91665cb9
commit
644073506d
@ -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)
|
4
sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc
vendored
Normal file
4
sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
Libs:-lmhash
|
||||||
|
Name: mhash
|
||||||
|
Version: @VERSION@
|
||||||
|
Description: provides a uniform interface to several hash algorithms
|
@ -2,7 +2,7 @@
|
|||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||||
<pkgmetadata>
|
<pkgmetadata>
|
||||||
<!-- maintainer-needed -->
|
<!-- maintainer-needed -->
|
||||||
<upstream>
|
<upstream>
|
||||||
<remote-id type="sourceforge">mhash</remote-id>
|
<remote-id type="sourceforge">mhash</remote-id>
|
||||||
</upstream>
|
</upstream>
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
|
@ -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
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=8
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools
|
||||||
|
|
||||||
DESCRIPTION="Library providing a uniform interface to a large number of hash algorithms"
|
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"
|
SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
LICENSE="GPL-2+"
|
||||||
SLOT="0"
|
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"
|
IUSE="static-libs"
|
||||||
|
|
||||||
BDEPEND="dev-lang/perl" # pod2html
|
BDEPEND="dev-lang/perl" # pod2html
|
||||||
@ -25,6 +25,7 @@ PATCHES=(
|
|||||||
"${FILESDIR}"/${P}-force64bit-tiger.patch
|
"${FILESDIR}"/${P}-force64bit-tiger.patch
|
||||||
"${FILESDIR}"/${P}-align.patch
|
"${FILESDIR}"/${P}-align.patch
|
||||||
"${FILESDIR}"/${P}-alignment.patch
|
"${FILESDIR}"/${P}-alignment.patch
|
||||||
|
"${FILESDIR}"/${P}-no-malloc-check.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
DOCS=( doc/example.c doc/skid2-authentication )
|
DOCS=( doc/example.c doc/skid2-authentication )
|
||||||
@ -38,6 +39,10 @@ src_prepare() {
|
|||||||
-e 's/--netscape//' \
|
-e 's/--netscape//' \
|
||||||
"${S}"/doc/Makefile.in || die
|
"${S}"/doc/Makefile.in || die
|
||||||
|
|
||||||
|
sed \
|
||||||
|
-e "s:@VERSION@:${PV}:" \
|
||||||
|
"${FILESDIR}"/${PN}.pc > ${PN}.pc || die
|
||||||
|
|
||||||
# Refresh bundled libtool (ltmain.sh)
|
# Refresh bundled libtool (ltmain.sh)
|
||||||
# (elibtoolize is not sufficient)
|
# (elibtoolize is not sufficient)
|
||||||
# bug #668666
|
# bug #668666
|
||||||
@ -45,9 +50,6 @@ src_prepare() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
# https://sourceforge.net/p/mhash/patches/11/
|
|
||||||
export ac_cv_func_malloc_0_nonnull=yes
|
|
||||||
|
|
||||||
econf $(use_enable static-libs static)
|
econf $(use_enable static-libs static)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,5 +61,7 @@ src_compile() {
|
|||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
default
|
default
|
||||||
|
insinto /usr/$(get_libdir)/pkgconfig
|
||||||
|
doins ${PN}.pc
|
||||||
find "${ED}" -name '*.la' -delete || die
|
find "${ED}" -name '*.la' -delete || die
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user