mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-12 07:26:58 +02:00
dev-util/pkgconf: Sync with Gentoo
It's from Gentoo commit a8abae6c9f23b61e1930b4908ef97d0950c7913f.
This commit is contained in:
Flatcar Buildbot
parent
7135440915
commit
782fdede1e
@ -1,5 +1,3 @@
|
||||
DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba
|
||||
DIST pkgconf-2.1.1.tar.xz 311956 BLAKE2B b59e57b1118bb75bc946a1e65e037a172c2ade3a7b9da8404b3598833cd091600045de151f2db06453b23563501b2dff7fdda8967e14c0c933ac50d28ddb3cd0 SHA512 cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d
|
||||
DIST pkgconf-2.2.0.tar.xz 311920 BLAKE2B c2a89e932e7671785799f4b82beb75e92f246c152c03e88c847cedef39f2123da0544ff914d1c1512b8616f8b8cfd9f5115b33560042bcfa7ac5f78c0ceb2a27 SHA512 c4ff254c7323bdebc2595037df60e33f17fc5c222d7500a4b9d8b18c8b451ac35cd3ac90d31c920c23e9495ece2b82422de61e13286d43de3a5d1fe8211bd944
|
||||
DIST pkgconf-2.3.0.tar.xz 316160 BLAKE2B cca3476df0b79cdbca798ed3a067611414e9b422e8347d0f490e7c4d0c43cdd2c7b586ac11e028a8df365d4ea4194f46b1d9fc0acd0f5fd6b4a5548673a8f853 SHA512 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c
|
||||
DIST pkgconf-2.4.3.tar.xz 321352 BLAKE2B 5ca90b1b97e5516369e7042952418d5046faee02ff67144b0805c3c007507c42400825cfe73ac2c4df3f11dab4d5abba24b52abe930a3b25abbcbbddb3a06a31 SHA512 7e59b6aaf875ec3fc8c225985937384d2aef57d9daf64b7ea88242bf1a11349fe52cf6d1238d728f0509599982d69c761a0f01e8f8e24de028db58288760896f
|
||||
DIST pkgconf-2.5.1.tar.xz 328064 BLAKE2B 0995c1d649876d27e9275a77b702c0c100979c7b83fb7b58c925ca287be5e1568dd7ae2781dac51beb9e84a41d4424428f0542e4de488c45d005d602e76e1277 SHA512 e654c3a460e5f0f801e8ac43ad9086f397d1da0553186ff05f5f0e18ffdac99fb652fd9b6c0379db4bc8307699699d69bc66d13cc85a4a6b0cd36462f5948a1d
|
||||
|
||||
19
sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch
vendored
Normal file
19
sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
https://github.com/pkgconf/pkgconf/commit/aa6b5c4ca9cb5ea723b5c11e68a385fe46fd54a8
|
||||
|
||||
From aa6b5c4ca9cb5ea723b5c11e68a385fe46fd54a8 Mon Sep 17 00:00:00 2001
|
||||
From: Ariadne Conill <ariadne@ariadne.space>
|
||||
Date: Tue, 24 Jun 2025 16:31:21 -0700
|
||||
Subject: [PATCH] libpkgconf: dependency: make sure buf_sz is at least 1 byte
|
||||
|
||||
--- a/libpkgconf/dependency.c
|
||||
+++ b/libpkgconf/dependency.c
|
||||
@@ -321,7 +321,7 @@ pkgconf_dependency_parse_str(pkgconf_client_t *client, pkgconf_list_t *deplist_h
|
||||
|
||||
memset(cmpname, '\0', sizeof cmpname);
|
||||
|
||||
- buf_sz = strlen(depends) * 2;
|
||||
+ buf_sz = (strlen(depends) * 2) + 1;
|
||||
buf = calloc(1, buf_sz);
|
||||
if (buf == NULL)
|
||||
return;
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
# Copyright 2012-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit multilib multilib-minimal
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
inherit autotools git-r3
|
||||
EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
|
||||
else
|
||||
SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
|
||||
HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/3"
|
||||
IUSE="test"
|
||||
|
||||
# tests require 'kyua'
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-libs/atf
|
||||
dev-util/kyua
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
!dev-util/pkgconfig
|
||||
"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/pkgconf$(get_exeext)
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
[[ ${PV} == "9999" ]] && eautoreconf
|
||||
MULTILIB_CHOST_TOOLS+=(
|
||||
/usr/bin/pkg-config$(get_exeext)
|
||||
)
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local ECONF_SOURCE="${S}"
|
||||
local args=(
|
||||
--with-system-includedir="${EPREFIX}/usr/include"
|
||||
--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
|
||||
)
|
||||
econf "${args[@]}"
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
|
||||
dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,73 +0,0 @@
|
||||
# Copyright 2012-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit multilib multilib-minimal
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
inherit autotools git-r3
|
||||
EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
|
||||
else
|
||||
SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
|
||||
HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/5"
|
||||
IUSE="+native-symlinks test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-libs/atf
|
||||
dev-util/kyua
|
||||
)
|
||||
"
|
||||
RDEPEND="!dev-util/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
[[ ${PV} == 9999 ]] && eautoreconf
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/pkgconf$(get_exeext)
|
||||
/usr/bin/pkg-config$(get_exeext)
|
||||
)
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-system-includedir="${EPREFIX}/usr/include"
|
||||
--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
|
||||
)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
|
||||
dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if ! use native-symlinks; then
|
||||
rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die
|
||||
fi
|
||||
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 2012-2024 Gentoo Authors
|
||||
# Copyright 2012-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -7,17 +7,17 @@ inherit multilib multilib-minimal
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
inherit autotools git-r3
|
||||
EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
|
||||
EGIT_REPO_URI="https://github.com/pkgconf/pkgconf"
|
||||
else
|
||||
SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
|
||||
HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
|
||||
HOMEPAGE="https://github.com/pkgconf/pkgconf"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/4"
|
||||
SLOT="0/7"
|
||||
IUSE="+native-symlinks test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
@ -30,6 +30,10 @@ BDEPEND="
|
||||
"
|
||||
RDEPEND="!dev-util/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-buf_sz.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
@ -17,7 +17,7 @@ DESCRIPTION="pkg-config compatible replacement with no dependencies other than C
|
||||
HOMEPAGE="https://github.com/pkgconf/pkgconf"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/6"
|
||||
SLOT="0/7"
|
||||
IUSE="+native-symlinks test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user