public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/, sys-fs/duperemove/files/
@ 2018-09-06 21:22 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2018-09-06 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ac89044fb97344578813ecda30e493c770a6e9e0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 20:54:41 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 21:22:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac89044f

sys-fs/duperemove: Clean old up

 sys-fs/duperemove/Manifest                         |  2 --
 sys-fs/duperemove/duperemove-0.10.ebuild           | 33 ---------------------
 sys-fs/duperemove/duperemove-0.11_beta4.ebuild     | 34 ----------------------
 .../files/duperemove-0.11_beta4-sysmacros.patch    | 10 -------
 4 files changed, 79 deletions(-)

diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index e1eda63cf72..b6a7f81bb59 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1 @@
-DIST duperemove-0.10.tar.gz 95656 BLAKE2B d52916f21f48a929db98a4cb132b41030b4f8b884851242690aad8b0b4faef12bb176aee51bb16cab940495d033b2467e0572e0b54d9533c920b8da4d3a1f719 SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1
-DIST duperemove-0.11.beta4.tar.gz 114532 BLAKE2B 76301204c87c0978421ede7652dbb9cbc273f5ef4a99c709517b1421ec7bb94bafed9465a744c9a42c74c6ee936de1a1e5510a58ed36c7ec783436cefeacec69 SHA512 e3879f558026a11d34c996243eeeab267bebec508a0bafa76ad563fe81c3bf911650745f27bd449c4d788c302b08324bb780e4d86dc5996678e06a1df233a286
 DIST duperemove-0.11.tar.gz 115307 BLAKE2B 39fa9f80c017583c8943a5cddd1c69f38216adad26548c248e1877548717995d7b80f03f0e1c1515648aaad90996c80c224bb36fa27f13fe14fb22a123facf48 SHA512 b1bc2beb92223f9b46f8838e2f983ec763a9dff302f4202a34cc5e10591b985519f0464b6eba566c56872e671ba80583c7fdf4a232325086141d011384a286cf

diff --git a/sys-fs/duperemove/duperemove-0.10.ebuild b/sys-fs/duperemove/duperemove-0.10.ebuild
deleted file mode 100644
index fc9db47deae..00000000000
--- a/sys-fs/duperemove/duperemove-0.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# includes code from libbloom, xxhash (BSD-2)
-# includes code from polarssl (GPL-2+)
-LICENSE="GPL-2 GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	local -x LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}

diff --git a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild b/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
deleted file mode 100644
index 281d0698988..00000000000
--- a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
-
-# includes code from libbloom, xxhash (BSD-2)
-# includes code from polarssl (GPL-2+)
-LICENSE="GPL-2 GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}

diff --git a/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch b/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
deleted file mode 100644
index 6355f5e9146..00000000000
--- a/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/, sys-fs/duperemove/files/
@ 2023-10-23  1:44 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-10-23  1:44 UTC (permalink / raw
  To: gentoo-commits

commit:     9d5e256f7ced00e674bfcb69b463d6a753e16202
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 01:23:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 01:23:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5e256f

sys-fs/duperemove: fix musl build

Closes: https://bugs.gentoo.org/916078
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/duperemove/duperemove-0.13.ebuild           |  4 ++++
 sys-fs/duperemove/files/duperemove-0.13-musl.patch | 23 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/sys-fs/duperemove/duperemove-0.13.ebuild b/sys-fs/duperemove/duperemove-0.13.ebuild
index 82e6d1da0fdb..f984cc9d8e66 100644
--- a/sys-fs/duperemove/duperemove-0.13.ebuild
+++ b/sys-fs/duperemove/duperemove-0.13.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P/_/.}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 src_compile() {
 	emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
 }

diff --git a/sys-fs/duperemove/files/duperemove-0.13-musl.patch b/sys-fs/duperemove/files/duperemove-0.13-musl.patch
new file mode 100644
index 000000000000..2fbf6782579f
--- /dev/null
+++ b/sys-fs/duperemove/files/duperemove-0.13-musl.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/916078
+https://github.com/markfasheh/duperemove/issues/310
+https://github.com/markfasheh/duperemove/commit/b275a365545a45f317280153a43bf02a55f89de6
+
+From b275a365545a45f317280153a43bf02a55f89de6 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Thu, 12 Oct 2023 08:37:47 +0000
+Subject: [PATCH] dbfile: include <sys/types.h> for dev_t
+
+fixes build on musl
+
+closes #310
+--- a/dbfile.h
++++ b/dbfile.h
+@@ -5,6 +5,7 @@
+ #include <stdint.h>
+ #include <sqlite3.h>
+ #include <stdbool.h>
++#include <sys/types.h>
+ #include "util.h"
+ 
+ struct filerec;
+


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

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/, sys-fs/duperemove/files/
@ 2023-11-21 18:06 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-11-21 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     826a1d8d0047d01e84de3784f3f03f6842151764
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 18:04:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 18:05:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826a1d8d

sys-fs/duperemove: 0.14 was respun

Changes are as expected.

Bug: https://github.com/markfasheh/duperemove/issues/330
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/duperemove/Manifest                         |  1 +
 sys-fs/duperemove/duperemove-0.14-r1.ebuild        | 39 ++++++++++++++++++++++
 .../files/duperemove-0.14-wformat-security.patch   | 25 ++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 5601fe4b57c2..1560fd7824c9 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1,4 @@
 DIST duperemove-0.12.gh.tar.gz 162458 BLAKE2B 53dae9df2b45cb9ede8041e8a7a827c22c725da51d6df74acc96b464d4bfcc3a14b8adcd4b9ada68e2cf1411a5f015be27476e088a655998b0cc9d1f19acfae8 SHA512 7b5f464615f4ba850733657239dd4d68120d592424b6be56687b7ad4f6fd2dee67fd7729a1cd47c803dd77864dee033d8eef2f7f6774dc0f657b0d52aeb5559c
 DIST duperemove-0.13.gh.tar.gz 165454 BLAKE2B 8bfac3448b5ee8842be77b0ac969439197050d3ef4b245be85a918353c966e56d7b7505e004af830caca50732d1227795769d803640f422a1bed8ca299802e75 SHA512 e24fa9f658acf1c1badd797af719f81250861b9af4595cf96aa3583fe558a2fba7390bc06184f6a4b6c76be3c8b214d6a6ead8b0de6914a5e1df053d5e7e24e7
+DIST duperemove-0.14.gh.new.tar.gz 167912 BLAKE2B 819a86d8846106b701164425080f33e69e6239b7c7fe5df560fdb700b7d1275491d4a53c9f8e91fb29dc5c6381ba8a3f0a202f4cde5dadb4ebce328edd5d3764 SHA512 e193af84e729eb1bfb1cd1c5b965243bbefb93e0cba192ef5389916093dc84ad9e793031ecca06dc1173a673282aa16beb4d956b1a9acfc68d15d89798067d22
 DIST duperemove-0.14.gh.tar.gz 167844 BLAKE2B 3f489ca29e3417cacb186fe5d93de2d1a1052a1fc04811c8853e30430e883daaa8cce9262efbe3d6535295cc53904c2c996fda397b24601a045907c9035f6601 SHA512 3a205d2cbf92a3d9a0f48d276a153b2259514cbb2a5911d63830cc145711118642329f164464ebd6639b764a624c8f9e59b19779a36155f5709f45e59689c008

diff --git a/sys-fs/duperemove/duperemove-0.14-r1.ebuild b/sys-fs/duperemove/duperemove-0.14-r1.ebuild
new file mode 100644
index 000000000000..e08d9f8519fa
--- /dev/null
+++ b/sys-fs/duperemove/duperemove-0.14-r1.ebuild
@@ -0,0 +1,39 @@
+# 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
new file mode 100644
index 000000000000..43c946ca35fe
--- /dev/null
+++ b/sys-fs/duperemove/files/duperemove-0.14-wformat-security.patch
@@ -0,0 +1,25 @@
+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] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/, sys-fs/duperemove/files/
@ 2024-05-13 12:38 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-05-13 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     06f0223d5bc847992d64beab1d511540eabe3a11
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 12:31:16 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 13 12:37:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f0223d

sys-fs/duperemove: Backport a type fix for 32-bit systems

Closes: https://bugs.gentoo.org/928358
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...e-0.14.1.ebuild => duperemove-0.14.1-r1.ebuild} |  7 +++-
 .../duperemove/files/duperemove-0.14.1-32bit.patch | 37 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/sys-fs/duperemove/duperemove-0.14.1.ebuild b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
similarity index 83%
rename from sys-fs/duperemove/duperemove-0.14.1.ebuild
rename to sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
index 8ce73d66e3e1..30aacbdaf841 100644
--- a/sys-fs/duperemove/duperemove-0.14.1.ebuild
+++ b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,11 @@ 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"
 }

diff --git a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
new file mode 100644
index 000000000000..6e2ebf79f063
--- /dev/null
+++ b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
@@ -0,0 +1,37 @@
+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] 4+ messages in thread

end of thread, other threads:[~2024-05-13 12:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-23  1:44 [gentoo-commits] repo/gentoo:master commit in: sys-fs/duperemove/, sys-fs/duperemove/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-05-13 12:38 Michał Górny
2023-11-21 18:06 Sam James
2018-09-06 21:22 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