Download raw body.
REMOVE sysutils/bupstash
Remove bupstash. Backup software handles critical data and therefore
requires a healthy and actively maintained upstream. With upstream
development inactive since June 2023, there is insufficient confidence
in its long-term maintenance, compatibility, and security.
https://github.com/andrewchambers/bupstash
OK?
diff --git devel/quirks/Makefile devel/quirks/Makefile
index 3030bb56dc3..d55b1acff71 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.227
+PKGNAME = quirks-7.228
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 2305d4c7a0d..ac069839696 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -638,6 +638,7 @@ setup_obsolete_reason(
3 => 'awscli-plugin-endpoint',
1 => 'gemini-cli',
16 => 'secrets',
+ 3 => 'bupstash',
);
# beware, if ports with an RDEP on Python 3 are removed, they need to be listed
# as @conflict/pkgpath in lang/python/3 and not here, otherwise an update from a
diff --git sysutils/Makefile sysutils/Makefile
index 7fd9f9b8ff7..126617cd295 100644
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -36,7 +36,6 @@
SUBDIR += broot
SUBDIR += btop
SUBDIR += bubblemon-dockapp
- SUBDIR += bupstash
SUBDIR += burp
SUBDIR += cdist
SUBDIR += cdrtools
diff --git sysutils/bupstash/Makefile sysutils/bupstash/Makefile
deleted file mode 100644
index 38a45f2c3e2..00000000000
--- sysutils/bupstash/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-COMMENT = encrypted and deduplicated backup tool
-
-V = 0.12.0
-DISTNAME = bupstash-v${V}
-PKGNAME = bupstash-${V}pl1
-REVISION = 0
-
-CATEGORIES = sysutils
-
-HOMEPAGE = https://bupstash.io/
-
-MAINTAINER = Bjorn Ketelaars <bket@openbsd.org>
-
-# MIT
-PERMIT_PACKAGE = Yes
-
-WANTLIB = ${MODCARGO_WANTLIB} m sodium
-
-MODCARGO_DIST_SUBDIR = cargo
-DIST_SUBDIR = bupstash
-SITES = https://github.com/andrewchambers/bupstash/releases/download/v${V}/
-DISTFILES = ${DISTNAME}-man${EXTRACT_SUFX} \
- ${DISTNAME}-src+deps${EXTRACT_SUFX}
-
-SITES.p = 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.p += trim-{commit/}a73fd83.patch
-# pending "Honour --ignore-permission-errors for all path elements"
-# https://github.com/andrewchambers/bupstash/pull/363
-PATCHFILES.p += ignore-eacces-{commit/}8bf5bd1.patch
-PATCHFILES.p += ignore-eacces-test-{commit/}290768c.patch
-
-MODULES = devel/cargo \
- lang/python
-
-MODCARGO_RUSTFLAGS = -C debuginfo=0
-
-MODPY_RUNDEP = No
-MODPY_BUILDDEP = No
-MODPY_ADJ_FILES = cli-tests/mk-random-dir.py
-
-LIB_DEPENDS = security/libsodium
-TEST_DEPENDS = devel/bats \
- sysutils/coreutils \
- sysutils/truncate \
- textproc/gdiff \
- textproc/jq
-
-SEPARATE_BUILD = Yes
-
-WRKDIST = ${WRKDIR}
-
-do-test:
- ${MODCARGO_TEST_TARGET}
- # GNU `head -c', `cmp --silent', `truncate'
-.for prog in head cmp truncate
- ln -sf /usr/local/bin/g${prog} ${WRKDIR}/bin/${prog}
-.endfor
- env PATH=${WRKBUILD}/target/release:${PORTPATH} \
- bats --timing ${WRKSRC}/cli-tests/
-
-post-install:
-.for m in 1 7
- ${INSTALL_MAN} ${WRKSRC}/*.$m ${PREFIX}/man/man$m/
-.endfor
-
-.include <bsd.port.mk>
diff --git sysutils/bupstash/distinfo sysutils/bupstash/distinfo
deleted file mode 100644
index 612ac3ee288..00000000000
--- sysutils/bupstash/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-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
diff --git sysutils/bupstash/pkg/DESCR sysutils/bupstash/pkg/DESCR
deleted file mode 100644
index 4a140a649f0..00000000000
--- sysutils/bupstash/pkg/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-bupstash is a tool for storing (and retrieving) files and data in an encrypted
-bupstash-repository(7).
-
-Some notable features of bupstash include:
-
-- Automatic deduplication of stored data.
-- Client side encryption of data.
-- Incremental file uploads.
-- A tag based query language.
-- Optional role based encryption and decryption key separation.
-- Remote repositories over ssh.
-- Optional, per ssh key access repository controls.
-- A multi layered approach to security.
-- The bupstash tool itself is divided into subcommands that each have their own
- documentation.
-
-bupstash is beta software, while all efforts are made to keep bupstash bug
-free, we currently recommend using bupstash for making REDUNDANT backups where
-failure can be tolerated; furthermore, users should be aware that the tool is
-unmaintained upstream and may be removed in the future.
diff --git sysutils/bupstash/pkg/PLIST sysutils/bupstash/pkg/PLIST
deleted file mode 100644
index 8d44cbd6f97..00000000000
--- sysutils/bupstash/pkg/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@bin bin/bupstash
-@man man/man1/bupstash-diff.1
-@man man/man1/bupstash-exec-with-locks.1
-@man man/man1/bupstash-gc.1
-@man man/man1/bupstash-get.1
-@man man/man1/bupstash-init.1
-@man man/man1/bupstash-list-contents.1
-@man man/man1/bupstash-list.1
-@man man/man1/bupstash-new-key.1
-@man man/man1/bupstash-new-sub-key.1
-@man man/man1/bupstash-put.1
-@man man/man1/bupstash-recover-removed.1
-@man man/man1/bupstash-restore.1
-@man man/man1/bupstash-rm.1
-@man man/man1/bupstash-serve.1
-@man man/man1/bupstash-sync.1
-@man man/man1/bupstash.1
-@man man/man7/bupstash-authors.7
-@man man/man7/bupstash-keyfiles.7
-@man man/man7/bupstash-query-language.7
-@man man/man7/bupstash-repository.7
REMOVE sysutils/bupstash