From c4f38a20fccd79109863652e82a53005a45116b1 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Sun, 1 Jan 2023 19:29:09 +0000
Subject: [PATCH] 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.

All 57 (58 with this diff) bats(1) tests pass on amd64.

OK bket
---
 sysutils/bupstash/Makefile | 15 ++++++++++++++-
 sysutils/bupstash/distinfo | 14 ++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/sysutils/bupstash/Makefile b/sysutils/bupstash/Makefile
index 34fa698fbfe..411632df069 100644
--- a/sysutils/bupstash/Makefile
+++ b/sysutils/bupstash/Makefile
@@ -2,7 +2,7 @@ COMMENT =		encrypted and deduplicated backup tool
 
 V =			0.12.0
 DISTNAME =		bupstash-v${V}
-PKGNAME =		bupstash-${V}
+PKGNAME =		bupstash-${V}pl1
 
 CATEGORIES =		sysutils
 
@@ -15,10 +15,23 @@ 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 \
 			lang/python
 
diff --git a/sysutils/bupstash/distinfo b/sysutils/bupstash/distinfo
index 2fbe7d74d6a..612ac3ee288 100644
--- a/sysutils/bupstash/distinfo
+++ b/sysutils/bupstash/distinfo
@@ -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