Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add app-* packages under automation #1470

Merged
merged 22 commits into from
Dec 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
app-crypt/mhash: Sync with Gentoo
It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742.
krnowak committed Dec 7, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 644073506d116e9a3812c19159aaaedd48d37805
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Libs:-lmhash
Name: mhash
Version: @VERSION@
Description: provides a uniform interface to several hash algorithms
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">mhash</remote-id>
<upstream>
<remote-id type="sourceforge">mhash</remote-id>
</upstream>
</pkgmetadata>
Original file line number Diff line number Diff line change
@@ -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,16 +39,17 @@ 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
eautoreconf
}

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
}