* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/files/, sys-fs/duperemove/
@ 2017-09-02 9:20 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-09-02 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 43a25b2ec519c451a224020b42ce96a45bf782c6
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Thu Aug 17 16:50:46 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 09:17:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a25b2e
sys-fs/duperemove: fix sysmacros.h error w/ new sys-libs/glibc
Taken from https://github.com/markfasheh/duperemove/pull/169
Bug: https://bugs.gentoo.org/607376
Closes: https://github.com/gentoo/gentoo/pull/5464
sys-fs/duperemove/duperemove-0.11_beta4.ebuild | 2 ++
sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild b/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
index d3ed853c233..6b7691b19fa 100644
--- a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
+++ b/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${P/_/.}
+PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
+
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
}
diff --git a/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch b/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
new file mode 100644
index 00000000000..6355f5e9146
--- /dev/null
+++ b/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
@@ -0,0 +1,10 @@
+--- a/dbfile.c 2016-09-27 22:28:49.000000000 +0200
++++ b/dbfile.c 2017-08-17 18:23:30.768591897 +0200
+@@ -8,6 +8,7 @@
+ #include <inttypes.h>
+ #include <stddef.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+
+ #include "csum.h"
+ #include "filerec.h"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/files/, sys-fs/duperemove/
@ 2023-12-21 10:47 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-12-21 10:47 UTC (permalink / raw
To: gentoo-commits
commit: f5df70c470972483be366ff835191d1644fca984
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 10:45:04 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 10:47:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5df70c4
sys-fs/duperemove: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-fs/duperemove/Manifest | 2 --
sys-fs/duperemove/duperemove-0.12.ebuild | 33 ------------------
sys-fs/duperemove/duperemove-0.14-r1.ebuild | 39 ----------------------
.../files/duperemove-0.14-wformat-security.patch | 25 --------------
4 files changed, 99 deletions(-)
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index b2a614a195f3..36168fc8f9ef 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1 @@
-DIST duperemove-0.12.gh.tar.gz 162458 BLAKE2B 53dae9df2b45cb9ede8041e8a7a827c22c725da51d6df74acc96b464d4bfcc3a14b8adcd4b9ada68e2cf1411a5f015be27476e088a655998b0cc9d1f19acfae8 SHA512 7b5f464615f4ba850733657239dd4d68120d592424b6be56687b7ad4f6fd2dee67fd7729a1cd47c803dd77864dee033d8eef2f7f6774dc0f657b0d52aeb5559c
DIST duperemove-0.14.1.gh.new.tar.gz 167968 BLAKE2B 74d5ed6c452a24103d9ca0050ee1d1fdbb4eb4df5c2e86f84e6a1c70abf54d2caf27597d2088a5130d696bebaf07f93dd5f47e9c414af9ce3d19f096b872a02a SHA512 16af9fb002d6e51ce469869507d5d4b8f9576620746337252ad733e6f74ae275c1e83da6af1c203543b9d19890180952d87f9fad4a02d4c4e0a25577ce569191
-DIST duperemove-0.14.gh.new.tar.gz 167912 BLAKE2B 819a86d8846106b701164425080f33e69e6239b7c7fe5df560fdb700b7d1275491d4a53c9f8e91fb29dc5c6381ba8a3f0a202f4cde5dadb4ebce328edd5d3764 SHA512 e193af84e729eb1bfb1cd1c5b965243bbefb93e0cba192ef5389916093dc84ad9e793031ecca06dc1173a673282aa16beb4d956b1a9acfc68d15d89798067d22
diff --git a/sys-fs/duperemove/duperemove-0.12.ebuild b/sys-fs/duperemove/duperemove-0.12.ebuild
deleted file mode 100644
index 98450e01418f..000000000000
--- a/sys-fs/duperemove/duperemove-0.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove/"
-SRC_URI="
- https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz
- -> ${P/_/.}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-src_compile() {
- emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.14-r1.ebuild b/sys-fs/duperemove/duperemove-0.14-r1.ebuild
deleted file mode 100644
index e08d9f8519fa..000000000000
--- a/sys-fs/duperemove/duperemove-0.14-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove/"
-# XXX: drop .new on bump after 0.14, added for respin
-SRC_URI="
- https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz
- -> ${P/_/.}.gh.new.tar.gz
-"
-S=${WORKDIR}/${P/_/.}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
- dev-db/sqlite:3
- dev-libs/glib:2
-"
-RDEPEND="
- ${DEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-wformat-security.patch
-)
-
-src_compile() {
- emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/files/duperemove-0.14-wformat-security.patch b/sys-fs/duperemove/files/duperemove-0.14-wformat-security.patch
deleted file mode 100644
index 43c946ca35fe..000000000000
--- a/sys-fs/duperemove/files/duperemove-0.14-wformat-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/markfasheh/duperemove/commit/5cbcc65254cf684b4281b278b5ee38c82d0a3ee5
-
-From 5cbcc65254cf684b4281b278b5ee38c82d0a3ee5 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Mon, 20 Nov 2023 21:09:58 +0000
-Subject: [PATCH] util.c: make debug helper `-Wformat-security`-clean
-
-Without the change `gcc-14` fails the build with `-Werror=format-security`
-as:
-
- util.c:340:25: error: format not a string literal and no format arguments [-Werror=format-security]
- 340 | fprintf(stream, buf);
- | ^~~
-
-It's a harmless warning as `UUID` has a well-defined set of characters.
-But `fputs()` expresses intent more directly to print the string as is.
---- a/util.c
-+++ b/util.c
-@@ -337,5 +337,5 @@ void debug_print_uuid(FILE *stream, uuid_t uuid)
- {
- char buf[37];
- uuid_unparse(uuid, buf);
-- fprintf(stream, buf);
-+ fputs(buf, stream);
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/files/, sys-fs/duperemove/
@ 2025-02-23 17:27 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2025-02-23 17:27 UTC (permalink / raw
To: gentoo-commits
commit: d771dcad6a9825e4fca917b41569fde6b63389d2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 17:23:16 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 17:23:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d771dcad
sys-fs/duperemove: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-fs/duperemove/Manifest | 1 -
sys-fs/duperemove/duperemove-0.14.1-r1.ebuild | 40 ----------------------
.../duperemove/files/duperemove-0.14.1-32bit.patch | 37 --------------------
3 files changed, 78 deletions(-)
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index c1cfb6c6d4eb..2e9f725c272b 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,2 +1 @@
-DIST duperemove-0.14.1.gh.new.tar.gz 167968 BLAKE2B 74d5ed6c452a24103d9ca0050ee1d1fdbb4eb4df5c2e86f84e6a1c70abf54d2caf27597d2088a5130d696bebaf07f93dd5f47e9c414af9ce3d19f096b872a02a SHA512 16af9fb002d6e51ce469869507d5d4b8f9576620746337252ad733e6f74ae275c1e83da6af1c203543b9d19890180952d87f9fad4a02d4c4e0a25577ce569191
DIST duperemove-0.15.gh.tar.gz 119848 BLAKE2B 4b0455b34e3e5c1d002a39ade1b8abcd8a04b50ae7178b575218735e5529c0639f852dd433db1863c31fe14089e01bbc69fb202687d8a691c5a1f4de6f6b499a SHA512 e6d6e658c0175e74d706f9d4cbbeaa7bcad1b554eb60805415a948af63c78b6982cea6be6d48c15ddf14595a5b061d7794014eb1e8b71fab2041fc57e676c881
diff --git a/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
deleted file mode 100644
index 30aacbdaf841..000000000000
--- a/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove/"
-# XXX: drop .new on bump after 0.14, added for respin
-SRC_URI="
- https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz
- -> ${P/_/.}.gh.new.tar.gz
-"
-S=${WORKDIR}/${P/_/.}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
- dev-db/sqlite:3
- dev-libs/glib:2
-"
-RDEPEND="
- ${DEPEND}
-"
-
-PATCHES=(
- # https://github.com/markfasheh/duperemove/issues/344
- "${FILESDIR}/${P}-32bit.patch"
-)
-
-src_compile() {
- emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
deleted file mode 100644
index 6e2ebf79f063..000000000000
--- a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9e97c827707e9d709180a12ddfa16527e36fc676 Mon Sep 17 00:00:00 2001
-From: Alexandre Bruyelles <git@jack.fr.eu.org>
-Date: Sun, 12 May 2024 19:45:52 +0200
-Subject: [PATCH] fiemap: fiemap_count_shared: use coherent parameter size
-
-Fixes https://github.com/markfasheh/duperemove/issues/344
-
-Signed-off-by: Alexandre Bruyelles <git@jack.fr.eu.org>
----
- fiemap.c | 2 +-
- fiemap.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fiemap.c b/fiemap.c
-index aa61114431bd..655797dc4d91 100644
---- a/fiemap.c
-+++ b/fiemap.c
-@@ -98,7 +98,7 @@ struct fiemap *do_fiemap(int fd)
- return fiemap;
- }
-
--int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared)
-+int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared)
- {
- _cleanup_(freep) struct fiemap *fiemap = NULL;
- struct fiemap_extent *extent;
-diff --git a/fiemap.h b/fiemap.h
-index f9eb17b9aa4a..1918c6e96322 100644
---- a/fiemap.h
-+++ b/fiemap.h
-@@ -26,5 +26,5 @@ struct fiemap *do_fiemap(int fd);
- /*
- * Count how much of the area between start_off and end_off is shared.
- */
--int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared);
-+int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared);
- #endif /* __FIEMAP_H__ */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-23 17:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-23 17:27 [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/files/, sys-fs/duperemove/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 10:47 Michał Górny
2017-09-02 9:20 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox