diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch index 4b1431b4587..5399a5e1886 100644 --- a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch +++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch @@ -1,4 +1,4 @@ -From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001 +From bcaa0cb78866289af9094a77e1f9017a4a0a32a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 7 Oct 2021 18:04:15 +0200 @@ -9,7 +9,7 @@ Subject: [PATCH 1/3] don't run tests unless asked 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 9c840c4..d4c241e 100644 +index 44913bd..5c35bf9 100644 --- a/Makefile +++ b/Makefile @@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN) @@ -40,5 +40,5 @@ index 9c840c4..d4c241e 100644 install_scripts: ## Install scipts -- -2.35.1 +2.38.1 diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch index 3d3b7fe2229..18ad2847708 100644 --- a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch +++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch @@ -1,4 +1,4 @@ -From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001 +From e76b016fd0ac8a76545e4ce499d4c7d0e1cc35e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 7 Oct 2021 18:05:15 +0200 @@ -11,7 +11,7 @@ likely not be upstreamable. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index d4c241e..2694e78 100644 +index 5c35bf9..c1a9b8c 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service @@ -29,9 +29,9 @@ index d4c241e..2694e78 100644 install_scripts: scripts - install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd + install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd - install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample + install -Dm644 scripts/beesd.conf.sample $(DESTDIR)$(ETC_PREFIX)/bees/beesd.conf.sample ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),) install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service -- -2.35.1 +2.38.1 diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch index 30f75846075..ede8e5a7e4f 100644 --- a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch +++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch @@ -1,4 +1,4 @@ -From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001 +From ff9b371363f809298ca3ce8a886943b246b1dfa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 7 Oct 2021 18:06:54 +0200 @@ -13,13 +13,13 @@ that whoever wants to continue on it doesn't have to start from scratch. 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/makeflags b/makeflags -index c5b6951..29e0430 100644 +index e008011..da4f5f7 100644 --- a/makeflags +++ b/makeflags @@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64 BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS) - BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS) + BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast -Wno-missing-field-initializers $(CXXFLAGS) + +BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD) +BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD) @@ -50,5 +50,5 @@ index ae66a7c..3c70244 100644 %.txt: % Makefile FORCE ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC) -- -2.35.1 +2.38.1 diff --git a/srcpkgs/bees/patches/fix-build.patch b/srcpkgs/bees/patches/fix-build.patch deleted file mode 100644 index 3799e27e32a..00000000000 --- a/srcpkgs/bees/patches/fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/fiemap.cc -+++ b/src/fiemap.cc -@@ -28,7 +28,8 @@ main(int argc, char **argv) - if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); } - if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); } - if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); } -- fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start); -+ using FU = decltype(fm.fm_length); -+ fm.fm_length = min(FU(fm.fm_length), FU(FIEMAP_MAX_OFFSET - fm.fm_start)); - uint64_t stop_at = fm.fm_start + fm.fm_length; - uint64_t last_byte = fm.fm_start; - do { diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series index 068ccfc2db8..d9a2837128f 100644 --- a/srcpkgs/bees/patches/series +++ b/srcpkgs/bees/patches/series @@ -1,3 +1,2 @@ 0001-don-t-run-tests-unless-asked.patch 0002-move-sbin-into-bin.patch -fix-build.patch diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template index 5c16864c71e..9cd43f1d827 100644 --- a/srcpkgs/bees/template +++ b/srcpkgs/bees/template @@ -1,6 +1,6 @@ # Template file for 'bees' pkgname=bees -version=0.7.2 +version=0.8 revision=1 archs="~*-musl" build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-or-later" homepage="https://github.com/Zygo/bees" distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz" -checksum=371d03a0008e2ba284e315f645148272a968f7bdbc1d0aeb6c4aeff3a82801a0 +checksum=3efb1a7290b014b8dd0cb64ce98382c2bde1f9ccf649e1b4fc86f27ffa42edea if [ "$CROSS_BUILD" ]; then # Tests don't work properly with cross compilation, because it doesn't