commit: c800c7e7de6698fc8f5bb92e94c0baa27a577b36 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Sep 8 05:01:34 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 8 05:01:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c800c7e7
dev-libs/bglibs: fix tests w/ _F_S=3 Closes: https://bugs.gentoo.org/956707 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/bglibs/bglibs-2.04-r5.ebuild | 102 ++++++++++++++++++++++++ dev-libs/bglibs/files/bglibs-2.04-fortify.patch | 12 +++ 2 files changed, 114 insertions(+) diff --git a/dev-libs/bglibs/bglibs-2.04-r5.ebuild b/dev-libs/bglibs/bglibs-2.04-r5.ebuild new file mode 100644 index 000000000000..58aaed762888 --- /dev/null +++ b/dev-libs/bglibs/bglibs-2.04-r5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dot-a toolchain-funcs + +DESCRIPTION="Bruce Guenter's Libraries Collection" +HOMEPAGE="https://untroubled.org/bglibs/"; +SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"; + +LICENSE="LGPL-2.1+" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc" + +BDEPEND=" + dev-build/libtool + doc? ( + app-text/doxygen + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/bglibs-2.04-stack-buffers.patch + "${FILESDIR}"/bglibs-2.04-feature-tests.patch + "${FILESDIR}"/bglibs-2.04-musl.patch + "${FILESDIR}"/bglibs-2.04-gcc14.patch + "${FILESDIR}"/bglibs-2.04-prefix.patch + "${FILESDIR}"/bglibs-2.04-fortify.patch +) + +src_prepare() { + default + + # Remove the tests from the default target so that we can run + # them only when the user has enabled them. + sed -i '/^all:/s|selftests||' Makefile || die + sed -i '/selftests/d' TARGETS || die + + # The selftests.sh script collects the list of tests to run by + # grepping for "#ifdef SELFTEST_MAIN", which is defined in each *.c + # file to be tested. We can therefore disable individual tests by + # clobbering that line. (This should be safe; the contents of that + # ifdef are the test program, which we are disabling anyway.) + # + # This test requires network access, and currently fails even + # if you have it (https://github.com/bruceg/bglibs/issues/5). + sed -e 's/#ifdef SELFTEST_MAIN/#ifdef UNDEFINED/' \ + -i net/resolve_ipv4addr.c || die +} + +src_configure() { + lto-guarantee-fat + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} + +src_compile() { + # Parallel build fails, bug #343617 + MAKEOPTS+=" -j1" default + + if use doc; then + emake -C doc/latex pdf + fi +} + +src_test() { + einfo "Running selftests" + emake selftests +} + +src_install() { + echo "${ED}/usr/bin" > conf-bin || die + echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die + echo "${ED}/usr/include" > conf-include || die + echo "${ED}/usr/share/man" > conf-man || die + + default + + # Install .so into LDPATH + mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.2.0.0 \ + "${ED}"/usr/$(get_libdir)/ \ + || die + dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so.2 + dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so + dosym ../libbg.so.2.0.0 /usr/$(get_libdir)/bglibs/libbg.so.2.0.0 + + strip-lto-bytecode + + rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die + + dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION + dodoc -r doc/html/ + if use doc; then + dodoc doc/latex/refman.pdf + fi +} diff --git a/dev-libs/bglibs/files/bglibs-2.04-fortify.patch b/dev-libs/bglibs/files/bglibs-2.04-fortify.patch new file mode 100644 index 000000000000..37ef74f9be51 --- /dev/null +++ b/dev-libs/bglibs/files/bglibs-2.04-fortify.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/956707 +--- a/net/dns_resolvconfip.c ++++ b/net/dns_resolvconfip.c +@@ -71,7 +71,7 @@ static int init(ipv4addr ip[DNS_MAX_IPS]) + memcpy(ip,"\177\0\0\1",4); + iplen = 4; + } +- memset(ip + iplen,0,64 - iplen); ++ memset(&ip[iplen],0,sizeof(ipv4addr)); + return 0; + } +
