From 8eccda982236f2cfe9188bdcaffd9168134f39a9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Jan 2023 13:58:28 +0000 Subject: gentoo auto-resync : 27:01:2023 - 13:58:28 --- app-misc/Manifest.gz | Bin 49765 -> 49766 bytes app-misc/rdfind/Manifest | 3 ++ .../files/rdfind-1.5.0-configure-nettle.patch | 23 +++++++++++++ app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch | 35 +++++++++++++++++++ app-misc/rdfind/rdfind-1.5.0-r1.ebuild | 37 +++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch create mode 100644 app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch create mode 100644 app-misc/rdfind/rdfind-1.5.0-r1.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 6a10ebb762fd..822cf15825d2 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest index d7ee2464c61f..52374c0e97c7 100644 --- a/app-misc/rdfind/Manifest +++ b/app-misc/rdfind/Manifest @@ -1,4 +1,7 @@ +AUX rdfind-1.5.0-configure-nettle.patch 877 BLAKE2B 805bd6ac55fefad6de8b6ab772da22d099ed60224c69965dd18b9bdf5cd460db23fb9aa11ccc45c3e944b0ea1a2356ae65915e14d028fbaa5db596d9c9de9119 SHA512 f88567af4df32470ed2b1e2d310d047e8945984204a1d075309610d5a60e4c45e055843a663b85f5d56b688aec10796fa0d24fb1cc9168e54264eadbe7ebd76b +AUX rdfind-1.5.0-gcc-13.patch 1055 BLAKE2B 2508b977bd3ad65cce435d4d987af843ecd2435d422252c1ac44353fe1ee4b4e4c0fd25b8b415d270e6f63440d0618b14548fc35d91433ce979e20d3f4415dc7 SHA512 0310cb32ea88da84b20f52162ebc6b4e87d45be9187bc2e59054c8577a35c4e2dbbf54329677e3b5c32801705ac4a0ec32a39e0474d4bcd83ae41e473170a0bd AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6aa61cfcbc0c0fbde595330e12160572dd00b9bd4be3bf7f80bcf5b6eaef58adf211b1e5ad2e44c8ed46451a7d684e6b4dcce519150 SHA512 cfae0145b4b657060d465dbd841f3b5e3260cb4a63bfe4706038810b64020f4b8067fc3d5607a9c1480527378d45f4b7aa56a67178d720af318b584968ca17e6 DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495 +EBUILD rdfind-1.5.0-r1.ebuild 794 BLAKE2B dec79cdb1aa6d588ce9b28ebd33508d545ac5a137704685a412a40737bbab46a1c98fad4d96f05796f3d6291bf384c2adf617093317478b9fc1ee0d86c0cfd61 SHA512 ca20fb4d840ece7f9a4f3f5b4e6b4df8c97307d097286fb52cc22d73eef71be9ca103ff5b644ab74a8474b1368f3725f42a666d61d5c6a506e13f2d88eed40e7 EBUILD rdfind-1.5.0.ebuild 702 BLAKE2B a49a5d26b9ecd34a66e7fb7dd50e7999c13a684310553042755fc8c42661bd92ff0a44c075f20505ce1308e31f323cefa51b0e5d85343cd0346bbebd9de7b4e5 SHA512 51de6b38a3b72aff83b3424f59bbcbf41939847409429b6e01a7742cba765b3cc015587108ac8f8b6a40d04373711dd50996a1e15ee2b4d6aab0b9794d56aecc MISC metadata.xml 841 BLAKE2B 32b8bde4c5907e3c1cf8cbecf78f1c10c9fe49efc9ce5748af35815c7d5a5ab958a440c6da5d7680f52d72ab200230813f33a54503edc274cd6d588716ee153b SHA512 bd25cb0e6341ef0202ed7c9b23db2de735818c3eb31b557145a12dca62cbe7298db4e7ad13b7f3c899055b51db13264a77a9eaf378e89e5f62886237e93bd142 diff --git a/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch b/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch new file mode 100644 index 000000000000..d95fde911a00 --- /dev/null +++ b/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch @@ -0,0 +1,23 @@ +https://github.com/pauldreik/rdfind/pull/115 + +From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 1 Sep 2022 13:13:50 -0700 +Subject: [PATCH] configure: Fix check for AC_CHECK_LIB + +Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main() +which is not in nettle library + +Signed-off-by: Khem Raj +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ERROR([ + On Debian-ish systems, use "apt-get install nettle-dev" to get a system + wide nettle install. + ])]) +-AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([ ++AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([ + Could not link to libnettle. Please install nettle + first. If you have already done so; please run ldconfig + as root or check whether the path libnettle was installed + diff --git a/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch b/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch new file mode 100644 index 000000000000..1597b89d7119 --- /dev/null +++ b/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch @@ -0,0 +1,35 @@ +https://github.com/pauldreik/rdfind/pull/129 + +(drop limits bit as we already had a patch for that) + +From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 25 Jan 2023 21:12:47 -0800 +Subject: [PATCH] include standard headers and + +gcc 13 moved some includes around and as a result is no longer +transitively included [1]. Explicitly include it for uint64_t. + +Fixes errors like below + +../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std' + 225 | o.maximumfilesize = std::numeric_limits::max(); + | ^~~~~~~~~~~~~~ + +... + +| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj +--- a/Fileinfo.hh ++++ b/Fileinfo.hh +@@ -8,6 +8,7 @@ + #define Fileinfo_hh + + #include ++#include + #include + + // os specific headers diff --git a/app-misc/rdfind/rdfind-1.5.0-r1.ebuild b/app-misc/rdfind/rdfind-1.5.0-r1.ebuild new file mode 100644 index 000000000000..47ff98c85d67 --- /dev/null +++ b/app-misc/rdfind/rdfind-1.5.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Find duplicate files based on their content" +HOMEPAGE="https://github.com/pauldreik/rdfind" +SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-releases-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/nettle:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/autoconf-archive" + +PATCHES=( + "${FILESDIR}/${PN}-1.5.0_include-limits-header.patch" + "${FILESDIR}/${PN}-1.5.0-configure-nettle.patch" + "${FILESDIR}/${PN}-1.5.0-gcc-13.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_test() { + # Bug 840544 + local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}" + addpredict / + default +} -- cgit v1.2.3