Sunday, January 01, 2023

sysutils/bupstash: pull two upstream fixes

--ignore-permission-errors didn't work in all cases, so I fixed one.

Testing my PR on top of 0.12.0 as well and not just master revealed
another bug, which lead to truncated filenames.

This is fixed in master already.

Do not wait for another release and apply both now, so backups no longer
abort or corrupt in those use cases.

Works as expected together with the cli-tests diff I just sent.
All 57 (58 with this diff) tests pass on amd64.

Feedback? Objection? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bupstash/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 8 Nov 2022 16:14:42 -0000 1.13
+++ Makefile 1 Jan 2023 18:42:41 -0000
@@ -2,7 +2,7 @@ COMMENT = encrypted and deduplicated ba

V = 0.12.0
DISTNAME = bupstash-v${V}
-PKGNAME = bupstash-${V}
+PKGNAME = bupstash-${V}pl1

CATEGORIES = sysutils

@@ -15,9 +15,22 @@ PERMIT_PACKAGE = Yes

WANTLIB = ${MODCARGO_WANTLIB} m sodium

+MODCARGO_DIST_SUBDIR = cargo
+DIST_SUBDIR = bupstash
MASTER_SITES = https://github.com/andrewchambers/bupstash/releases/download/v${V}/
DISTFILES = ${DISTNAME}-man${EXTRACT_SUFX} \
${DISTNAME}-src+deps${EXTRACT_SUFX}
+
+MASTER_SITES0 = https://github.com/andrewchambers/bupstash/
+PATCH_DIST_STRIP = -p1
+# backport "Fix index paths during put of paths in '/'." fix for
+# "Paths broken when adding multiple subdirs of /"
+# https://github.com/andrewchambers/bupstash/issues/359
+PATCHFILES += trim-{commit/}a73fd83.patch:0
+# pending "Honour --ignore-permission-errors for all path elements"
+# https://github.com/andrewchambers/bupstash/pull/363
+PATCHFILES += ignore-eacces-{commit/}8bf5bd1.patch:0
+PATCHFILES += ignore-eacces-test-{commit/}290768c.patch:0

MODULES = devel/cargo
MODCARGO_RUSTFLAGS = -C debuginfo=0
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/bupstash/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 8 Nov 2022 16:14:42 -0000 1.10
+++ distinfo 1 Jan 2023 18:42:44 -0000
@@ -1,4 +1,10 @@
-SHA256 (bupstash-v0.12.0-man.tar.gz) = v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
-SHA256 (bupstash-v0.12.0-src+deps.tar.gz) = 4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
-SIZE (bupstash-v0.12.0-man.tar.gz) = 21237
-SIZE (bupstash-v0.12.0-src+deps.tar.gz) = 15987395
+SHA256 (bupstash/bupstash-v0.12.0-man.tar.gz) = v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
+SHA256 (bupstash/bupstash-v0.12.0-src+deps.tar.gz) = 4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
+SHA256 (bupstash/ignore-eacces-8bf5bd1.patch) = KyfE75X2ZiDJh/gLsvoON4FxAvNxBvNtaJd8/fYBqGo=
+SHA256 (bupstash/ignore-eacces-test-290768c.patch) = yUlAOZYXXfFLtWXsLJWqfAN2igxY7J49q+0vjR6pfBg=
+SHA256 (bupstash/trim-a73fd83.patch) = Df+WDuKqZb+OvfhnEH18KS0x7VJL/KfflBrMkJK4lLU=
+SIZE (bupstash/bupstash-v0.12.0-man.tar.gz) = 21237
+SIZE (bupstash/bupstash-v0.12.0-src+deps.tar.gz) = 15987395
+SIZE (bupstash/ignore-eacces-8bf5bd1.patch) = 1823
+SIZE (bupstash/ignore-eacces-test-290768c.patch) = 1526
+SIZE (bupstash/trim-a73fd83.patch) = 1565

No comments:

Post a Comment