Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-05-15 16:20:32 +00:00
31 changed files with 167 additions and 568 deletions

View File

@@ -1,2 +1 @@
DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
DIST certbot-2.9.0.gh.tar.gz 1346993 BLAKE2B cf7fb4676dc31442abe11ef50d18073480a46f4ab19cc328da599b1372509af683b4c6010b46f31bce5703949e88b4702d404bd8582a1361caad43ec8f02cb94 SHA512 27c15ce8e4450f432fbc271cd847d27c7f1bce552cc6e5f2a91f1fbfc09ebe331b54bab17639b86c19605de059767015665c26e872c3b0699edb1c85392a0546

View File

@@ -1,69 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
PARENT_PN="${PN%-dns-rfc2136}"
PARENT_P="${PARENT_PN}-${PV}"
DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Lets Encrypt client)"
HOMEPAGE="
https://github.com/certbot/certbot
https://letsencrypt.org/
"
if [[ "${PV}" == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
EGIT_SUBMODULES=()
EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
else
SRC_URI="
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.gh.tar.gz
"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
S="${WORKDIR}/${PARENT_P}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
BDEPEND="
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
RDEPEND="
${PYTHON_DEPS}
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
"
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
distutils_enable_tests pytest
# Same than PATCHES but from repository's root directory,
# please see function `python_prepare_all` below.
# Simplier for users IMHO.
PARENT_PATCHES=(
)
# Here for patches within "${PN}" subdirectory.
PATCHES=(
)
python_prepare_all() {
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
eapply_user
popd > /dev/null || die
distutils-r1_python_prepare_all
}

View File

@@ -1 +1,2 @@
DIST fbthrift-2023.02.06.00.tar.gz 13447174 BLAKE2B d8a931dc4ded159ca1b1b1aa9db7d97c7f6fc3842fe59873c72125acf93c572bb4f31d5514b237166fb7108e746f7473bc50e62becab93411b01d8988cb53534 SHA512 a726cc3276c623471129ba7822926e311f455a1c90cc2be9a5506310563609c9843dcb0b6852c288e766a6268bb01e0db8d0a67b6c3f01fc9fd84ff58a479ba6
DIST fbthrift-2023.06.19.00.tar.gz 13918017 BLAKE2B 65bd0344915947084f0b0a4217aac882a034006165a9098322d600f1d962ddaf11c21d075b9abbae23d8cbf7dfc477417a63e1c976187a4c5a5f1b49cbfe44a3 SHA512 d39c228a1b7f25fd76eb0cede220439237e27060f9dd6252590de3976f9f05f3e8b18a0ee63a90b879f11732022dec508afb6529868e3e476623ddfebfdd1c47

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} pypy3 )
PYTHON_COMPAT=( python3_{10..13} pypy3 )
inherit cmake python-single-r1

View File

@@ -0,0 +1,47 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 )
inherit cmake python-single-r1
DESCRIPTION="Facebook's branch of Apache Thrift, including a new C++ server"
HOMEPAGE="https://github.com/facebook/fbthrift"
SRC_URI="https://github.com/facebook/fbthrift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64"
RDEPEND="
app-arch/zstd
>=dev-cpp/fizz-${PV}:=
>=dev-cpp/folly-${PV}:=
dev-cpp/gflags
dev-cpp/glog
>=dev-cpp/wangle-${PV}:=
dev-libs/boost
dev-libs/libfmt
dev-libs/openssl:0=
sys-libs/zlib
${PYTHON_DEPS}
"
DEPEND="
${RDEPEND}
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
"
BDEPEND="
sys-devel/bison
sys-devel/flex
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_configure() {
local mycmakeargs=(
-DLIB_INSTALL_DIR=$(get_libdir)
)
cmake_src_configure
}

View File

@@ -1 +1,2 @@
DIST fizz-2023.02.06.00.tar.gz 649362 BLAKE2B a77f90a9d8eca9fb934aacbc903f5af702d8e22b33b0884c742dd40b51f1993f2015758e62ee815eed0f3570a608768914d4f2077d9da0a69c50e78270a64085 SHA512 88cd3d3198442ea0cd2d5098c53fef55d9a7a6b998ddeb6e2e32f7dd26827682dabe1def9bef6f321da5dbb8c48675cb3045a20733fcc7191cc7b81248d8176e
DIST fizz-2023.06.19.00.tar.gz 671983 BLAKE2B 196b117c59c1d1442d22a77192f81f8c934bafe632b56cca45cf428c6bd73ac791b88d7642d27f4fc0074c27a327842442c157f4c7966c7226420b4f83b57f46 SHA512 55397a5916a313ebedf0ccfbe60f44ee3de59fbf47513c88ec325e005d971b309a182de44a53e612984f698c12d182212328f835a4a227bcc7abe80be99de96c

View File

@@ -0,0 +1,48 @@
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="C++14 implementation of the TLS-1.3 standard"
HOMEPAGE="https://github.com/facebookincubator/fizz"
SRC_URI="https://github.com/facebookincubator/fizz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
RDEPEND="
>=dev-cpp/folly-${PV}:=
dev-cpp/gflags
dev-cpp/glog
dev-libs/double-conversion
dev-libs/libevent
dev-libs/libfmt
dev-libs/libsodium
dev-libs/openssl:0=
"
DEPEND="
${RDEPEND}
test? ( >=dev-cpp/gtest-1.11.0 )
"
RESTRICT="!test? ( test )"
CMAKE_USE_DIR="${S}/fizz"
src_prepare() {
cmake_src_prepare
sed -i '/Sodium/d' fizz/cmake/fizz-config.cmake.in || die
}
src_configure() {
local mycmakeargs=(
-DBUILD_EXAMPLES=$(usex examples)
-DBUILD_TESTS=$(usex test)
-DLIB_INSTALL_DIR=$(get_libdir)
)
cmake_src_configure
}

View File

@@ -1 +1,2 @@
DIST wangle-2023.02.06.00.tar.gz 339890 BLAKE2B a1b1d50083bac9de7ea6bf586cd677d44a3baf5fcec0ac92d82cda16fcfad055b1e91fec2fa75143ab1ee488bc638a0d6153d19b65b30fc63829fdfdfd0c3156 SHA512 93ea81c5a4b5929e543abd77c2a0e70cec33dcdf928665f71436c1ee5d2afbf338d7ca7000e124c295821f68a1763c847f306eb8ece487047548989609a8cbc0
DIST wangle-2023.06.19.00.tar.gz 345941 BLAKE2B 17c0947dfa1b08cae09abe5eef3a5df327257d748cb31167b58719db08ba6512b45215c45a2fd6a94c8bdc028312454d0932062f4dac3b97416ca884354de151 SHA512 092d364e8f9fbefa55d749e5c642d92a25602c930d245b8991d014bc768ae528617186da733fa602b690756f5bf80c0b64fde725ebcac8c9f7c6085d78c9eccd

View File

@@ -0,0 +1,43 @@
# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Framework providing common client/server abstractions"
HOMEPAGE="https://github.com/facebook/wangle"
SRC_URI="https://github.com/facebook/wangle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
RDEPEND="
>=dev-cpp/fizz-${PV}:=
>=dev-cpp/folly-${PV}:=
dev-cpp/gflags
dev-cpp/glog
dev-libs/double-conversion
dev-libs/libevent
dev-libs/libfmt
dev-libs/openssl:0=
"
DEPEND="
${RDEPEND}
dev-cpp/gtest
"
RESTRICT="!test? ( test )"
CMAKE_USE_DIR="${S}/wangle"
src_configure() {
local mycmakeargs=(
-DBUILD_EXAMPLES=$(usex examples)
-DBUILD_TESTS=$(usex test)
-DLIB_INSTALL_DIR=$(get_libdir)
)
cmake_src_configure
}

View File

@@ -1,4 +1,4 @@
# Copyright 2023 Gentoo Authors
# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
# required because of manual install in src_install
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-any-r1 optfeature toolchain-funcs

View File

@@ -1,4 +1,4 @@
# Copyright 2023 Gentoo Authors
# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
# required because of manual install in src_install
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-any-r1

View File

@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_COMPAT=( python3_{10..12} )
DOCS_BUILDER="mkdocs"
DOCS_DEPEND="dev-python/mkdocs-material"

View File

@@ -1,4 +1,3 @@
DIST WebAssembly-testsuite-c2a67a575ddc815ff2212f68301d333e5e30a923.tar.gz 625713 BLAKE2B 0adffe3b0e60f0decbc9a0207b6a0e7137b5eb3eb405a781d51837689305ad4c41edff6cf37479b897b28545c70040fc64c67665e6529c75b817a417f794656d SHA512 c93506a5d79c36a76c0cc021a279964e47e28e523eb5dba8ce549df318c9b0c7198070b7aa27a8e632f8892349fea94c6260039e95b06d95cff8b952edced566
DIST WebAssembly-wasm-c-api-b6dd1fb658a282c64b029867845bc50ae59e1497.tar.gz 57078 BLAKE2B 393e9ae9d3a641dd9ef0517322bc840b8d45fcf911529b1a7200e7d2baed5af4470ded4d29ca7c2c70f98c4065aee9dae823660bcb4d207b0b6a4bebb29e1f75 SHA512 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0
DIST wabt-1.0.30.tar.xz 1997872 BLAKE2B 66050b651dc64d2e2cfeebf3aafa268d51a573fd7e3b1157dea72d427aacca6639679a28d958fed3d6b27e8888ccc3f267c3e38d5601bb09435ee8442a76c6c7 SHA512 2f00b7bdcf445141e16acedbec33ba465b9eb235e21b565af67e36e26cd89bd48f6a9e31ed9c7c7797f305288e2f2d45304e411ec4b637ede0d1f7a739e6cba1
DIST wabt-1.0.34.tar.gz 1226317 BLAKE2B f6acc1783f704a4b25a063f13be1e57263f11cd76e91e6bf59f111b9ba7bc17999550cc88c69a1b8e586f40656ce000560378767f96b331e115e8c60032e6be5 SHA512 93be77d18b2311276af2abff8a954f3d029b1689ba8c89e1c3f0d199ddc0af505ffaa8489fbe0df4fc8beae1a37c645971d63794ff440e305042ff1b94bd83ef

View File

@@ -1,59 +0,0 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
inherit cmake python-any-r1
DESCRIPTION="The WebAssembly Binary Toolkit"
HOMEPAGE="https://github.com/WebAssembly/wabt"
SRC_URI="https://github.com/WebAssembly/wabt/releases/download/${PV}/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-cpp/gtest )"
BDEPEND="
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/ply[${PYTHON_USEDEP}]')
"
PATCHES=(
# Disable tests depending on third_party/wasm-c-api/example/*.wasm
"${FILESDIR}/wabt-1.0.30-wasm-blob-tests.patch"
)
python_check_deps() {
python_has_version "dev-python/ply[${PYTHON_USEDEP}]"
}
src_prepare() {
cmake_src_prepare
# Submodules kept: third_party/testsuite third_party/wasm-c-api
rm -r third_party/gtest third_party/ply third_party/uvwasi || die
rm third_party/wasm-c-api/example/*.wasm fuzz-in/wasm/stuff.wasm wasm2c/examples/fac/fac.wasm || die
sed -i 's;default_compiler =.*;default_compiler = os.getenv("CC", "cc");' test/run-spec-wasm2c.py || die
}
src_configure() {
local mycmakeargs=(
-DUSE_SYSTEM_GTEST=ON
-DBUILD_LIBWASM=ON
-DWITH_WASI=OFF # Need to unbundle third_party/uvwasi
-DBUILD_TESTS=$(usex test)
)
cmake_src_configure
}
src_test() {
cmake_build check
}

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_COMPAT=( python3_{10..13} )
EGIT_COMMIT_TESTSUITE="c2a67a575ddc815ff2212f68301d333e5e30a923"
EGIT_COMMIT_WASM_C_API="b6dd1fb658a282c64b029867845bc50ae59e1497"
@@ -14,8 +14,10 @@ DESCRIPTION="The WebAssembly Binary Toolkit"
HOMEPAGE="https://github.com/WebAssembly/wabt"
SRC_URI="
https://github.com/WebAssembly/wabt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/WebAssembly/testsuite/archive/${EGIT_COMMIT_TESTSUITE}.tar.gz -> WebAssembly-testsuite-${EGIT_COMMIT_TESTSUITE}.tar.gz
https://github.com/WebAssembly/wasm-c-api/archive/${EGIT_COMMIT_WASM_C_API}.tar.gz -> WebAssembly-wasm-c-api-${EGIT_COMMIT_WASM_C_API}.tar.gz
https://github.com/WebAssembly/testsuite/archive/${EGIT_COMMIT_TESTSUITE}.tar.gz -> \
WebAssembly-testsuite-${EGIT_COMMIT_TESTSUITE}.tar.gz
https://github.com/WebAssembly/wasm-c-api/archive/${EGIT_COMMIT_WASM_C_API}.tar.gz -> \
WebAssembly-wasm-c-api-${EGIT_COMMIT_WASM_C_API}.tar.gz
"
LICENSE="Apache-2.0"
SLOT="0"

View File

@@ -1 +1 @@
DIST libtypec-0.5.0-Source.tar.gz 41621 BLAKE2B 09b7e592b4e52f5b6f568675335dc2366902fa8e2d67c5f1c6d2895345d4f4e2e880fc5336ae849133da7794ab457c7cd2dd31111655a68247a15b45d1a6fca6 SHA512 a5f404400f6a08f67f026bbc115fa2278586a0c6b8e9f3766162967d43c111e8985563692a1648efb3a3d3a4cd5047dd903f8733d72a40a175c7bb6be130dcb3
DIST libtypec-0.5.1-Source.tar.gz 146305 BLAKE2B d93f640c3a37e51c1b0116c8dbdc6f06f301ec63a95739107c09458eecb765ee82ab4b3a4c7d8c54dbcbef32496d67e1030a3b9b11a144dfa149584cf9b4b151 SHA512 b6f9b2396306825e31cb1002953ea0eac8597a099305cd59bb08590939e98c720a0f2eca2742de70a10a90ae379d3338d42cb6f8e5a6a359246f7266ba9b016a

View File

@@ -1,26 +0,0 @@
From 8614051a1ff9856c3de932045dc149e758c2b0b1 Mon Sep 17 00:00:00 2001
From: Adrian Ratiu <adrian.ratiu@collabora.com>
Date: Fri, 12 Apr 2024 17:08:09 +0300
Subject: [PATCH] CMakeLists.txt: fix pkgconfig install path
pkgconfig pc files need to go under libdir instead of datadir.
Suggested-by: Sam James <sam@gentoo.org>
Upstream-Status: Backport [upstream commit 8614051]
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d533ab..aecf4e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,4 +59,4 @@ configure_file(
)
install(FILES ${CMAKE_BINARY_DIR}/libtypec.pc
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
--
2.43.2

View File

@@ -1,33 +0,0 @@
From 67d40a5f0132e2b02167ad274c6d6c76e4393964 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:42:54 +0000
Subject: [PATCH] libtypec: close fp before returning
Fix resource leak on fp on error return path, close fp before
returning.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 67d40a5]
---
libtypec_sysfs_ops.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libtypec_sysfs_ops.c b/libtypec_sysfs_ops.c
index 747b562..a22de5a 100644
--- a/libtypec_sysfs_ops.c
+++ b/libtypec_sysfs_ops.c
@@ -504,8 +504,10 @@ static int count_billbrd_if(const char *usb_path, const struct stat *sb, int typ
if(num_bb_if < MAX_BB_PATH_STORED)
{
int len = strlen(usb_path);
- if(len > 512 ) /*exceeds buffer size*/
+ if(len > 512 ) { /*exceeds buffer size*/
+ fclose(fd);
return 0;
+ }
strcpy(bb_dev_path[num_bb_if],usb_path);
}
--
2.43.2

View File

@@ -1,30 +0,0 @@
From 7de1000ff658c594a8f0a4b62f4956fc635d6c23 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:46:19 +0000
Subject: [PATCH] libtypec: utils: add missing break in switch statement
For the product_type_pd3p1_drd case there is a missing break
statement causing an unintentional fall-through to the default
case. Add in the missing break statement.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 7de1000]
---
utils/lstypec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/lstypec.c b/utils/lstypec.c
index a30b2bc..98d23f6 100644
--- a/utils/lstypec.c
+++ b/utils/lstypec.c
@@ -396,6 +396,7 @@ void print_identity_data(int recipient, union libtypec_discovered_identity id, s
printf(" Product VDO 2: 0x%08x\n", id.disc_id.product_type_vdo2);
printf(" Product VDO 3: 0x%08x\n", id.disc_id.product_type_vdo3);
print_vdo(((uint32_t) id.disc_id.product_type_vdo3), 6, pd3p1_dfp_fields, pd3p1_dfp_field_desc);
+ break;
default:
printf(" Product VDO 1: 0x%08x\n", id.disc_id.product_type_vdo1);
printf(" Product VDO 2: 0x%08x\n", id.disc_id.product_type_vdo2);
--
2.43.2

View File

@@ -1,31 +0,0 @@
From 6d193776421db948e4201a60cf239fdae62c196d Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:52:57 +0000
Subject: [PATCH] libtypec: utils: add missing return at end of function
Function typecstatus_power_contract is missing a return 0 at the
end of the function, currently it is returning nothing and so
it may be returning a garbage value.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 6d19377]
---
utils/typecstatus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index 5e16e74..bfb4142 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -208,7 +208,7 @@ int typecstatus_power_contract()
printf("\tNo Power Contract on port %d\n",i);
}
}
-
+ return 0;
}
/* Check all typec ports */
--
2.43.2

View File

@@ -1,30 +0,0 @@
From d15c9d17148632b7864990c29854321b891c95c3 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:44:04 +0000
Subject: [PATCH] libtypec: utils: add missing return at end of function
Function typec_status_billboard is missing a return 0 at the
end of the function, currently it is returning nothing and so
it may be returning a garbage value.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit d15c9d1]
---
utils/typecstatus.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index 43801c0..5e16e74 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -169,6 +169,7 @@ int typec_status_billboard()
}
}
+ return 0;
}
int typecstatus_power_contract()
--
2.43.2

View File

@@ -1,44 +0,0 @@
From 477b08cea7e27da5fb97ce52d0af3d2c98f4f98f Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:41:04 +0000
Subject: [PATCH] libtypec: utils: close fp before returning
Fix resource leak on fp on error return path, close fp before
returning.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 477b08c]
---
utils/typecstatus.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index be906a4..43801c0 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -92,11 +92,13 @@ static unsigned long get_dword_from_path(char *path)
FILE *fp = fopen(path, "r");
- if (fp == NULL)
+ if (fp == NULL)
return -1;
- if(fgets(buf, 64, fp) == NULL)
+ if(fgets(buf, 64, fp) == NULL) {
+ fclose(fp);
return -1;
+ }
dword = strtoul(buf, NULL, 10);
@@ -253,4 +255,4 @@ int main (int argc, char **argv)
}
names_exit();
-}
\ No newline at end of file
+}
--
2.43.2

View File

@@ -1,45 +0,0 @@
From f1ecf54f8190351b6b1c2f163375405c4b238f64 Mon Sep 17 00:00:00 2001
From: Adrian Ratiu <adrian.ratiu@collabora.com>
Date: Fri, 12 Apr 2024 17:42:38 +0300
Subject: [PATCH] libtypec_sysfs_ops: define feature test macro for nftw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
According to the man page [1], the definiton of nftw() is
hidden behind the _XOPEN_SOURCE 500 feature test, so we
must enable it to avoid warnings or errors (if the toolchain
is configured to treat them as errors) like this:
/var/tmp/portage/dev-libs/libtypec-0.5.0/work/libtypec-0.5.0-Source/libtypec_sysfs_ops.c:1059:13:
warning: implicit declaration of function nftw; did you mean ftw?
[-Wimplicit-function-declaration]
1059 | if (nftw ("/dev/bus/usb/", count_billbrd_if, fd_limit, 0) != 0)
| ^~~~
| ftw
[1] https://linux.die.net/man/3/nftw
Upstream-Status: Backport [upstream commit f1ecf54]
---
libtypec_sysfs_ops.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libtypec_sysfs_ops.c b/libtypec_sysfs_ops.c
index 747b562..bfb5246 100644
--- a/libtypec_sysfs_ops.c
+++ b/libtypec_sysfs_ops.c
@@ -29,6 +29,11 @@ SOFTWARE.
* @brief Functions for libtypec sysfs based operations
*/
+/**
+ * required for enalbing nftw(), which is part of SUSv1.
+ */
+#define _XOPEN_SOURCE 500
+
#include "libtypec_ops.h"
#include <dirent.h>
#include <stdio.h>
--
2.43.2

View File

@@ -1,55 +0,0 @@
From d11cd006700bada6ac09da4d58794474018650e4 Mon Sep 17 00:00:00 2001
From: Adrian Ratiu <adrian.ratiu@collabora.com>
Date: Fri, 12 Apr 2024 18:36:15 +0300
Subject: [PATCH] libtypec_sysfs_ops: fix nftw() fun pointer def
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
According to the __ntfw_func_t definiton [1], and ftw
documentation [2], ntfw() is being passed a wrong fun
argument, which is expected for the deprecated ftw(),
not for ntfw().
This got hidden by the fact that _XOPEN_SOURCE >= 500
feature flag was disabled, so the C compilers just
issued an implicit declaration warning/error.
Example:
/var/tmp/portage/dev-libs/libtypec-0.5.0/work/libtypec-0.5.0-Source/libtypec_sysfs_ops.c:1064:36:
warning: passing argument 2 of nftw from incompatible pointer type
[-Wincompatible-pointer-types]
1064 | if (nftw ("/dev/bus/usb/", count_billbrd_if, fd_limit, 0) != 0)
| ^~~~~~~~~~~~~~~~
| |
| int (*)(const char *, const struct stat *, int)
In file included from /var/tmp/portage/dev-libs/libtypec-0.5.0/work/libtypec-0.5.0-Source/libtypec_sysfs_ops.c:48:
/usr/include/ftw.h:179:51: note: expected __nftw_func_t {aka int (*)(const char *, const struct stat *, int, struct FTW *)} but argument is of type int (*)(const char *, const struct stat *, int)
179 | extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
| ~~~~~~~~~~~~~~^~~~~~
[1]
https://www.gnu.org/software/libc/manual/html_node/Working-with-Directory-Trees.html#index-_005f_005fnftw_005ffunc_005ft
[2] https://man7.org/linux/man-pages/man3/ftw.3.html
Upstream-Status: Backport [upstream commit d11cd00]
---
libtypec_sysfs_ops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libtypec_sysfs_ops.c b/libtypec_sysfs_ops.c
index bfb5246..e496e5f 100644
--- a/libtypec_sysfs_ops.c
+++ b/libtypec_sysfs_ops.c
@@ -476,7 +476,7 @@ static unsigned int get_fixed_supply_pdo(char *path, int src_snk)
}
-static int count_billbrd_if(const char *usb_path, const struct stat *sb, int typeflag)
+static int count_billbrd_if(const char *usb_path, const struct stat *sb, int typeflag, struct FTW *ftw)
{
FILE *fd;
--
2.43.2

View File

@@ -1,82 +0,0 @@
From 026acf3f2688631af2951630d3b9588badc65ca6 Mon Sep 17 00:00:00 2001
From: Rajaram Regupathy <rajaram.regupathy@gmail.com>
Date: Sun, 14 Apr 2024 14:55:15 +0530
Subject: [PATCH] typecstatus : fix potential overflow
check index returned and use to avoid potential buffer overflow
Upstream-Status: Backport [upstream commit 026acf3]
---
utils/typecstatus.c | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index bfb4142..7ca7669 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -133,40 +133,42 @@ int typec_status_billboard()
bb_loc = find_bb_bos_index(bb_data,ret);
- struct bb_bos_descritor *bb_bos_desc = (struct bb_bos_descritor *)&bb_data[bb_loc];
+ if(bb_loc > 0 )
+ {
+ struct bb_bos_descritor *bb_bos_desc = (struct bb_bos_descritor *)&bb_data[bb_loc];
- printf("\tBillboard Device Version : %x.%x\n",bb_bos_desc->cap_desc_bcd_ver[1],bb_bos_desc->cap_desc_bcd_ver[0]);
+ printf("\tBillboard Device Version : %x.%x\n",bb_bos_desc->cap_desc_bcd_ver[1],bb_bos_desc->cap_desc_bcd_ver[0]);
- printf("\tNumber of Alternate Mode : %d\n",bb_bos_desc->cap_desc_num_aum);
+ printf("\tNumber of Alternate Mode : %d\n",bb_bos_desc->cap_desc_num_aum);
- for(int x=0;x<bb_bos_desc->cap_desc_num_aum;x++)
- {
- int idx = 0, k=0, j=0;
- #define bmCONF_STR_ARR_MAX 4
+ for(int x=0;x<bb_bos_desc->cap_desc_num_aum;x++)
+ {
+ int idx = 0, k=0, j=0;
+ #define bmCONF_STR_ARR_MAX 4
- char *bmconf_str_array[]= {"Unspecified Error","AUM not attempted","AUM attempt unsuccessful","AUM configuration successful","Undefined Configuration"};
+ char *bmconf_str_array[]= {"Unspecified Error","AUM not attempted","AUM attempt unsuccessful","AUM configuration successful","Undefined Configuration"};
- if( (x !=0) && ((x % 4) == 0))
- {
- j++;
- k=0;
- }
+ if( (x !=0) && ((x % 4) == 0))
+ {
+ j++;
+ k=0;
+ }
- idx = bb_bos_desc->cap_desc_bmconfig[j];
+ idx = bb_bos_desc->cap_desc_bmconfig[j];
- idx = (idx >> k) & 0x3;
+ idx = (idx >> k) & 0x3;
- k++;
+ k++;
- idx = idx < bmCONF_STR_ARR_MAX ? idx : bmCONF_STR_ARR_MAX;
+ idx = idx < bmCONF_STR_ARR_MAX ? idx : bmCONF_STR_ARR_MAX;
- char *aum = &bb_bos_desc->cap_desc_aum_array_start;
+ char *aum = &bb_bos_desc->cap_desc_aum_array_start;
- aum = aum + (x*4);
+ aum = aum + (x*4);
- printf("\tAlternate Mode 0x%02X%02X in state : %s\n",aum[1]&0xFF,aum[0]&0xFF,bmconf_str_array[idx]);
+ printf("\tAlternate Mode 0x%02X%02X in state : %s\n",aum[1]&0xFF,aum[0]&0xFF,bmconf_str_array[idx]);
+ }
}
-
}
}
return 0;
--
2.43.2

View File

@@ -1,36 +0,0 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Library to interface with USB Type-c/Power Delivery devices"
HOMEPAGE="https://github.com/Rajaram-Regupathy/libtypec"
SRC_URI="https://github.com/Rajaram-Regupathy/libtypec/releases/download/${P}/${P}-Source.tar.gz"
S="${WORKDIR}/${P}-Source"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
PATCHES=(
"${FILESDIR}/${PN}-0.5.0-CMakeLists.txt-fix-pkgconfig-install-path.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-define-feature-test-macro-for-nft.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-fix-nftw-fun-pointer-def.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-close-fp-before-returning.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-close-fp-before-returning.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-return-at-end-of-fun.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-return-at-end-of-function.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-break-in-switch-statement.patch"
"${FILESDIR}/${PN}-0.5.0-typecstatus-fix-potential-overflow.patch"
)
src_configure() {
# don't force CFLAGS to allow Gentoo toolchain to set them
local mycmakeargs=(
-DLIBTYPEC_STRICT_CFLAGS=OFF
)
cmake_src_configure
}

View File

@@ -15,12 +15,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
PATCHES=(
"${FILESDIR}/${PN}-0.5.0-CMakeLists.txt-fix-pkgconfig-install-path.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-define-feature-test-macro-for-nft.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-fix-nftw-fun-pointer-def.patch"
)
src_configure() {
# don't force CFLAGS to allow Gentoo toolchain to set them
local mycmakeargs=(

View File

@@ -1,16 +1,19 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYPI_NO_NORMALIZE=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_11 )
PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1 pypi
DESCRIPTION="Reads and extracts files from a password-encrypted iOS backup"
HOMEPAGE="https://pypi.org/project/iOSbackup/ https://github.com/avibrazil/iOSbackup"
HOMEPAGE="
https://pypi.org/project/iOSbackup/
https://github.com/avibrazil/iOSbackup
"
LICENSE="GPL-2"
SLOT="0"
@@ -18,6 +21,8 @@ KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="dev-python/biplist[${PYTHON_USEDEP}]
dev-python/pycryptodome[${PYTHON_USEDEP}]
dev-python/NSKeyedUnArchiver[${PYTHON_USEDEP}]"
RDEPEND="
dev-python/biplist[${PYTHON_USEDEP}]
dev-python/pycryptodome[${PYTHON_USEDEP}]
dev-python/NSKeyedUnArchiver[${PYTHON_USEDEP}]
"

View File

@@ -1 +1 @@
DIST libusb1-2.0.1.tar.gz 82619 BLAKE2B 53b5302b0b2a6907b62493f56a041add928a20950542bf8034ada4240b65c51fd187aff3a97393d2cde64b4a7756a0aeebec449a62b25b5b7c82f4afe815c5a5 SHA512 d675ff9e0b89f53341182e69d62573a6494826abdfbcb56a3fe2de232920375ddcd37da1ee802a2315ef695418ce202a3c84b8ec4c7ed24799ed5aee37eaf242
DIST libusb1-3.1.0.tar.gz 83013 BLAKE2B d2d09d6fd94714471357080ac10bf9e76158d59a43d16c82135898cd312829c611a18359b13a2d616eb574b50c9e0cd58bd2747e5eaa50f374893cf4c3251f7c SHA512 9ee841e3d6f31e5fbebc8112f6d00ddd959a5e882515e238a84fcf5516c636198d9b84d64e39ff848c9d93c32bc5ab0d8eb6b65bb6213b4af28522fcc6b6ee99

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10,11} pypy3 )
PYTHON_COMPAT=( python3_{10..12} pypy3 )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 pypi

View File

@@ -24,7 +24,6 @@
# - bump python compat version (at least to 11, try 12)
# - try and fix open bugs for these packages
# Otherwise, they will be removed by 2024-06-13
dev-python/hypothesmith
dev-python/pymorphy2-dicts-uk
dev-python/pymorphy2-dicts-ru
dev-python/pymorphy2-dicts