commit: a8abae6c9f23b61e1930b4908ef97d0950c7913f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 29 01:07:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 29 01:09:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8abae6c
dev-util/pkgconf: add 2.5.1, drop 2.5.0 .1 fixes a regression in .0. Closes: https://bugs.gentoo.org/959232 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/pkgconf/Manifest | 2 +- dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch | 19 +++++++++++++++++++ .../{pkgconf-2.5.0.ebuild => pkgconf-2.5.1.ebuild} | 4 ++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index 0568a4f2e735..083270b5dda3 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,3 +1,3 @@ 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.0.tar.xz 328028 BLAKE2B f26e1b0f4d5bc22bfabc1a922859f83148c6995487b228973818260e1e2285b473eb572cd52e20e76ed7003e75d9c924f2cec28f6a379ce1db3312adbb91d087 SHA512 8f63720045df9dab728fa464be2c346f82a5cf12292b1ea2a716bd81e374e64d598ef86de1d471f6cb117b8cd23fb2900d6b8c963a397b7424796922a7b54cee +DIST pkgconf-2.5.1.tar.xz 328064 BLAKE2B 0995c1d649876d27e9275a77b702c0c100979c7b83fb7b58c925ca287be5e1568dd7ae2781dac51beb9e84a41d4424428f0542e4de488c45d005d602e76e1277 SHA512 e654c3a460e5f0f801e8ac43ad9086f397d1da0553186ff05f5f0e18ffdac99fb652fd9b6c0379db4bc8307699699d69bc66d13cc85a4a6b0cd36462f5948a1d diff --git a/dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch b/dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch new file mode 100644 index 000000000000..5a377c3f368d --- /dev/null +++ b/dev-util/pkgconf/files/pkgconf-2.5.1-buf_sz.patch @@ -0,0 +1,19 @@ +https://github.com/pkgconf/pkgconf/commit/aa6b5c4ca9cb5ea723b5c11e68a385fe46fd54a8 + +From aa6b5c4ca9cb5ea723b5c11e68a385fe46fd54a8 Mon Sep 17 00:00:00 2001 +From: Ariadne Conill <[email protected]> +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; + diff --git a/dev-util/pkgconf/pkgconf-2.5.0.ebuild b/dev-util/pkgconf/pkgconf-2.5.1.ebuild similarity index 97% rename from dev-util/pkgconf/pkgconf-2.5.0.ebuild rename to dev-util/pkgconf/pkgconf-2.5.1.ebuild index 0b8ad1b53b8b..6654342ab94d 100644 --- a/dev-util/pkgconf/pkgconf-2.5.0.ebuild +++ b/dev-util/pkgconf/pkgconf-2.5.1.ebuild @@ -30,6 +30,10 @@ BDEPEND=" " RDEPEND="!dev-util/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-buf_sz.patch +) + src_prepare() { default
