public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/files/, sys-apps/dnf5/
@ 2024-11-14 11:59 Takuya Wakazono
  0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2024-11-14 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     aca6db9408272567b1a9c8db806c61d459f7ac13
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 14 11:53:06 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Nov 14 11:53:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aca6db94

sys-apps/dnf5: remove buggy tests

Removing buggy tests until upstream fixes them.
https://github.com/rpm-software-management/dnf5/issues/1692

Closes: https://bugs.gentoo.org/939518
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 ...{dnf5-5.2.6.0.ebuild => dnf5-5.2.6.0-r1.ebuild} |  4 +++-
 .../files/dnf5-5.2.6.0-remove-buggy-tests.patch    | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sys-apps/dnf5/dnf5-5.2.6.0.ebuild b/sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild
similarity index 95%
rename from sys-apps/dnf5/dnf5-5.2.6.0.ebuild
rename to sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild
index d5b62426e..53c63f2c5 100644
--- a/sys-apps/dnf5/dnf5-5.2.6.0.ebuild
+++ b/sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-arch/rpm-4.17.0
-	dev-cpp/sdbus-c++:=
+	dev-cpp/sdbus-c++:0/1
 	dev-cpp/toml11
 	>=dev-db/sqlite-3.35.0:3
 	>=dev-libs/glib-2.46.0:2
@@ -48,6 +48,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.2.5.0-remove-empty-dir.patch"
 	# Prevent test suite from writing to system files.
 	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
+	# bug #939518
+	"${FILESDIR}/${P}-remove-buggy-tests.patch"
 )
 
 src_prepare() {

diff --git a/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch b/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch
new file mode 100644
index 000000000..f07af504a
--- /dev/null
+++ b/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch
@@ -0,0 +1,22 @@
+Those tests causes a use-after-free.
+https://bugs.gentoo.org/939518
+https://github.com/rpm-software-management/dnf5/issues/1692
+diff --git a/test/dnf5-plugins/copr_plugin/CMakeLists.txt b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
+index 2a99f6c6..ce87b437 100644
+--- a/test/dnf5-plugins/copr_plugin/CMakeLists.txt
++++ b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
+@@ -24,5 +24,3 @@ target_link_libraries(run_tests_copr PRIVATE ${JSONC_LIBRARIES})
+ 
+ add_compile_definitions(TEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
+ 
+-add_test(NAME test_copr COMMAND run_tests_copr)
+-set_tests_properties(test_copr PROPERTIES RUN_SERIAL TRUE)
+diff --git a/test/libdnf5-cli/CMakeLists.txt b/test/libdnf5-cli/CMakeLists.txt
+index e37cbfa5..02722d40 100644
+--- a/test/libdnf5-cli/CMakeLists.txt
++++ b/test/libdnf5-cli/CMakeLists.txt
+@@ -19,4 +19,3 @@ target_link_directories(run_tests_cli PRIVATE ${CMAKE_BINARY_DIR}/libdnf5)
+ target_link_libraries(run_tests_cli PRIVATE stdc++ libdnf5_static libdnf5-cli cppunit test_shared)
+ 
+ 
+-add_test(NAME test_libdnf_cli COMMAND run_tests_cli)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/files/, sys-apps/dnf5/
@ 2025-02-07 16:17 Takuya Wakazono
  0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2025-02-07 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d53ee422a9c119c4e7ce1c50a9e9f5b8a15beec6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Feb  7 15:35:12 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Fri Feb  7 16:16:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d53ee422

sys-apps/dnf5: drop 5.2.7.0, 5.2.8.1

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-apps/dnf5/Manifest                             |  2 -
 sys-apps/dnf5/dnf5-5.2.7.0.ebuild                  | 78 ----------------------
 sys-apps/dnf5/dnf5-5.2.8.1.ebuild                  | 78 ----------------------
 .../files/dnf5-5.2.6.0-remove-buggy-tests.patch    | 22 ------
 4 files changed, 180 deletions(-)

diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest
index ae945673f..8fc0df67e 100644
--- a/sys-apps/dnf5/Manifest
+++ b/sys-apps/dnf5/Manifest
@@ -1,3 +1 @@
 DIST dnf5-5.2.10.0.tar.gz 1684363 BLAKE2B bcdac38c8a9dcf31673b44b7aff89e4c638e25508830b62e65d752eb54349e553f0fef2b613e678dfb058a892845f80ae38e9f49ed0ebb248599a3fa35f45ed6 SHA512 968d974c4da4fc5f6d19696dc679cdee0031cdacc46b1a25567c21617c30ef1808ff9b2f52d5abfcfe88a3feab2d28d1cc38b4507501c19d6a029f4fc18c23c4
-DIST dnf5-5.2.7.0.tar.gz 1571567 BLAKE2B 92dec0c3a89b6d6d15ff7c5cf683d906d72b8a52fac0d2473410dd3422c50970e97e621c07424aa9d8323ca623bf771b54edc991aa5d825bc141267bf9fe3c05 SHA512 f3ade5df924efc9b07e7e7f7e80cd940dd61b4bdcc48a5c093e87190e9e207083e0f19a2218958f9d36b390f2984deff3d2f5b5bc6953e62173bc567e5e060d7
-DIST dnf5-5.2.8.1.tar.gz 1628391 BLAKE2B 6a78cfcd9e139cf70af12fd8c206724e3a60b08574691cc86a96ae016ade28459a2fa8e594f071dd18b9605ecb2c0c24a7d3cff0745c0cbdca8edf8ba2ef705c SHA512 8a683aa47114b3bef240ade6b92ae25de197196a4c1d5ca802fa26672684e519dabb7c52cc3f9ad4c5f7ea09d05d026f5e930441b81a0ae71563f146ec9b3bd4

diff --git a/sys-apps/dnf5/dnf5-5.2.7.0.ebuild b/sys-apps/dnf5/dnf5-5.2.7.0.ebuild
deleted file mode 100644
index 0ee66c37a..000000000
--- a/sys-apps/dnf5/dnf5-5.2.7.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command-line package manager"
-HOMEPAGE="https://github.com/rpm-software-management/dnf5"
-SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="nls systemd test"
-PROPERTIES="test_network"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/rpm-4.17.0
-	dev-cpp/sdbus-c++:0/1
-	dev-cpp/toml11
-	>=dev-db/sqlite-3.35.0:3
-	>=dev-libs/glib-2.46.0:2
-	dev-libs/json-c:=
-	dev-libs/libfmt:=
-	>=dev-libs/librepo-1.17.1
-	>=dev-libs/libsolv-0.7.25
-	dev-libs/libxml2
-	sys-apps/util-linux
-	>=sys-libs/libmodulemd-2.11.2
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/breathe
-	dev-python/sphinx
-	virtual/pkgconfig
-	test? (
-		app-arch/rpm
-		app-arch/createrepo_c
-		dev-util/cppunit
-	)
-"
-
-PATCHES=(
-	# Prevent test suite from writing to system files.
-	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
-	# bug #939518
-	"${FILESDIR}/${PN}-5.2.6.0-remove-buggy-tests.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Replace hardcoded TMPDIR.
-	sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die
-	# remove -Werror{,=unused-result}; bug 936870
-	sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HTML=OFF
-		-DWITH_PERL5=OFF
-		-DWITH_PYTHON3=OFF
-		-DWITH_RUBY=OFF
-		-DWITH_ZCHUNK=OFF
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_TRANSLATIONS=$(usex nls)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	cmake_src_compile doc-man
-}

diff --git a/sys-apps/dnf5/dnf5-5.2.8.1.ebuild b/sys-apps/dnf5/dnf5-5.2.8.1.ebuild
deleted file mode 100644
index 0ee66c37a..000000000
--- a/sys-apps/dnf5/dnf5-5.2.8.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command-line package manager"
-HOMEPAGE="https://github.com/rpm-software-management/dnf5"
-SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="nls systemd test"
-PROPERTIES="test_network"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/rpm-4.17.0
-	dev-cpp/sdbus-c++:0/1
-	dev-cpp/toml11
-	>=dev-db/sqlite-3.35.0:3
-	>=dev-libs/glib-2.46.0:2
-	dev-libs/json-c:=
-	dev-libs/libfmt:=
-	>=dev-libs/librepo-1.17.1
-	>=dev-libs/libsolv-0.7.25
-	dev-libs/libxml2
-	sys-apps/util-linux
-	>=sys-libs/libmodulemd-2.11.2
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/breathe
-	dev-python/sphinx
-	virtual/pkgconfig
-	test? (
-		app-arch/rpm
-		app-arch/createrepo_c
-		dev-util/cppunit
-	)
-"
-
-PATCHES=(
-	# Prevent test suite from writing to system files.
-	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
-	# bug #939518
-	"${FILESDIR}/${PN}-5.2.6.0-remove-buggy-tests.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Replace hardcoded TMPDIR.
-	sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die
-	# remove -Werror{,=unused-result}; bug 936870
-	sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HTML=OFF
-		-DWITH_PERL5=OFF
-		-DWITH_PYTHON3=OFF
-		-DWITH_RUBY=OFF
-		-DWITH_ZCHUNK=OFF
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_TRANSLATIONS=$(usex nls)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	cmake_src_compile doc-man
-}

diff --git a/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch b/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch
deleted file mode 100644
index f07af504a..000000000
--- a/sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Those tests causes a use-after-free.
-https://bugs.gentoo.org/939518
-https://github.com/rpm-software-management/dnf5/issues/1692
-diff --git a/test/dnf5-plugins/copr_plugin/CMakeLists.txt b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
-index 2a99f6c6..ce87b437 100644
---- a/test/dnf5-plugins/copr_plugin/CMakeLists.txt
-+++ b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
-@@ -24,5 +24,3 @@ target_link_libraries(run_tests_copr PRIVATE ${JSONC_LIBRARIES})
- 
- add_compile_definitions(TEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
- 
--add_test(NAME test_copr COMMAND run_tests_copr)
--set_tests_properties(test_copr PROPERTIES RUN_SERIAL TRUE)
-diff --git a/test/libdnf5-cli/CMakeLists.txt b/test/libdnf5-cli/CMakeLists.txt
-index e37cbfa5..02722d40 100644
---- a/test/libdnf5-cli/CMakeLists.txt
-+++ b/test/libdnf5-cli/CMakeLists.txt
-@@ -19,4 +19,3 @@ target_link_directories(run_tests_cli PRIVATE ${CMAKE_BINARY_DIR}/libdnf5)
- target_link_libraries(run_tests_cli PRIVATE stdc++ libdnf5_static libdnf5-cli cppunit test_shared)
- 
- 
--add_test(NAME test_libdnf_cli COMMAND run_tests_cli)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-02-07 16:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-07 16:17 [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/files/, sys-apps/dnf5/ Takuya Wakazono
  -- strict thread matches above, loose matches on Subject: below --
2024-11-14 11:59 Takuya Wakazono

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox