8 files changed, 32 insertions, 42 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9c44cfb037d7..22d64f59d0ca 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c871862a7299..6b73333c311b 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -19,5 +19,5 @@ DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a9
 DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
 EBUILD bareos-17.2.10.ebuild 10243 BLAKE2B fd52bf443eab0b6b6f6610fced73f14f43ded6c13b5010b32a986129e20433b57bbdf33bbe1e365ad0cfd6dc2c9ec98ac15a065c83f66d17968464a9bce9f961 SHA512 a2c9dc80ae3894a22cc0c3c4769b8a4d680a807a2531c2807a25184f229661b2a6f5afcd87827966e239bfac78484275c0c95b4e1444d8aea2f90dc39458c569
 EBUILD bareos-18.2.10.ebuild 11298 BLAKE2B 4df50a376a19f744188b8742f2ee0c4d4e559b02392caea1b1de7c4c1180b06e4ea5ac93e2610538a803ba00c0092bdd04016f790000fd2f9bd92acf364ff0c6 SHA512 0809bb8ece48e8cbdd30a8145fba6474c3291f7aff4197a7e221c6b94f9f9e5d3ba3272f9e0c83da01562071ecc85b9cd6be012bc6e47409b21d6788cc1a0828
-EBUILD bareos-19.2.9.ebuild 10924 BLAKE2B 7ed3781f4bd5e27455dca9485d6fe2cdf28d1fdec7b6f38e6fcd7430481359cf10e5f6be3f27986f556aff55cff20f1bab3a55597c09a1e902793232db7f4e2e SHA512 e6c06012495478d0b8140bf979637d52da60fd3b1e6289e1f5d56741679dac272c40394137bf3b988cef105141b302ee3fa290908b71b3926527721db213113a
+EBUILD bareos-19.2.9-r1.ebuild 10940 BLAKE2B 2c541ca61ee7e44e00f3cbbef8f8dcac5723e13391575c76f320dfbe38c96840bb210ca349ad8ed159da81db91f9bf6a33217da6d3ae8ac1a62061fff8ae4741 SHA512 75efb6c3c295d5b01731bbba25d671b58938f5485e1f6672cc003ba2a282ecd876838e24ca59213fc657d7a1f04de387527088b94aac864d457719a223d96ff4
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-19.2.9.ebuild b/app-backup/bareos/bareos-19.2.9-r1.ebuild
index e2d48fb23962..1c9bdced2c67 100644
--- a/app-backup/bareos/bareos-19.2.9.ebuild
+++ b/app-backup/bareos/bareos-19.2.9-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-any-r1 systemd cmake
+inherit python-any-r1 systemd cmake tmpfiles
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
@@ -330,14 +330,15 @@ src_install() {
 	diropts -m0755
 	keepdir /var/log/bareos
 
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
 
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
 }
 
 pkg_postinst() {
+	tmpfiles_process bareos.conf
+
 	if use clientonly; then
 		fowners root:bareos /var/lib/bareos
 	else
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index de1299814bad..7e30c8262fdb 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,9 +2,8 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-AUX borgmatic-1.5.16-tests_no_vim_dep.patch 1364 BLAKE2B c88361ff0c9a1fcb40e7d26e9c341ad69e7311bf6441b46cc835d62d39156b0f98ade91f03c6051782a8ccec9eab566867db9b38c7ceb7dc6db0c3875e31e7a6 SHA512 b23624f2da4531f51306893dd23c0bf97e310295006d0829bd880f7aa1798c6f6392759acd023d789c3de00d71ac27d285ab663be567cffe66d67651a4decce2
 DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
-DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B 14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168 SHA512 c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444
+DIST borgmatic-1.5.17.tar.gz 276954 BLAKE2B 45d0458377d4825b84b5a535a28e15c3204479cd0faa349ac16cf59262bc1ad00ebf83c6309d85d4e9e168a1b1173e887c8d1185d509b5dc16d3d6026d0f0dec SHA512 740c8f5de9cbb4980295e435f40d0bd239341f22849081d5616e151d8545118f64f5369dce4203d200910a23d5074b765b1a8cf8e9b515967143ba42bd489fc3
 EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f
-EBUILD borgmatic-1.5.16.ebuild 2163 BLAKE2B b38b58c6c9b616536e321358ad77613e59ecebc836df3444017a0c5c801a71f3bfe0646610d655c99f802ed63fe7f6cdce7509dbd1e7f44a025afa01347ac498 SHA512 c79717361295aeae8e1b8afc976f4e3072df410d997bc4c0caa1aa70df4ba7e280b66fff09ce387af8be8b66b4ded0ecf51b7de956b205900d35068f5b6d0e91
+EBUILD borgmatic-1.5.17.ebuild 2085 BLAKE2B cf922f6563d7f616655d40e94c353d1bc6a30cf3374fc5582c23de01fa74713e498cc0258ae8c64bea069f67ac4c673301645eef0d860b2f2380dcf5d93e654d SHA512 5174e82bc75772b3d0bbff2e27dad25ab065704236f75f93fa2af79049506b84d84946009498de81acc5d8562489b02450edb1b7b172ea2451c78009c3618b2e
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.16.ebuild b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
index faca0182b6c8..a9f759659cf1 100644
--- a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
@@ -36,7 +36,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
 	"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
 	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.16-tests_no_vim_dep.patch  # already merged upstream
 )
 
 distutils_enable_tests pytest
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
deleted file mode 100644
index 492743e36e04..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e8b8d86592565acde1ac6e7809947b8a761f2f91 Mon Sep 17 00:00:00 2001
-From: Marek Szuba <marek.szuba@cern.ch>
-Date: Tue, 27 Jul 2021 13:46:51 +0100
-Subject: [PATCH] tests/integration/test_execute: use plain Python rather than
- xxd
-
-Removes this test's dependencies on vim and /dev/urandom.
-
-Signed-off-by: Marek Szuba <marek.szuba@cern.ch>
----
- tests/integration/test_execute.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py
-index 6dc6467..3b9bef9 100644
---- a/tests/integration/test_execute.py
-+++ b/tests/integration/test_execute.py
-@@ -1,5 +1,6 @@
- import logging
- import subprocess
-+import sys
- 
- import pytest
- from flexmock import flexmock
-@@ -134,7 +135,8 @@ def test_log_outputs_vents_other_processes_when_one_exits():
-     flexmock(module).should_receive('command_for_process').and_return('grep')
- 
-     process = subprocess.Popen(
--        ['xxd', '-l', '40000', '-p', '/dev/urandom'], stdout=subprocess.PIPE, stderr=subprocess.PIPE
-+        [sys.executable, '-c', "import random, string; print(''.join(random.choice(string.ascii_letters) for _ in range(40000)))"],
-+        stdout=subprocess.PIPE, stderr=subprocess.PIPE
-     )
-     other_process = subprocess.Popen(
-         ['true'], stdin=process.stdout, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index a2531e990a72..c2d5aa9cdbd4 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,3 +1,4 @@
 DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c
 EBUILD untangle-https-backup-0.0.10-r1.ebuild 587 BLAKE2B 1f7c2f49672fae952eccc95071d5014ffef2c617bd28ccb26e957d24137a13de3df857e7c1139851d7462220cfa036eaeb9b2bae8fc4ef86d5191e48678c39c1 SHA512 f8b37a6bae206561241753bffb67825472e6fec868a0b9c68c021068052d462e781c866aff9cb9c194f3602a8806b4b362dda3612166c00cd8310c02f5137f19
+EBUILD untangle-https-backup-0.0.10-r2.ebuild 609 BLAKE2B c5d3a0f68d685127623d7cca4990d3a52e0047b8e57705f12ebd96afa6305662f9ac9a7fc63a275700485781cf349f10937393ce1403b5dedd2d6a14bd04bf55 SHA512 8ce69a6da903ddf50fe4f9a113b1c36a31d3781234436a49561f60144b07f62da789d86457e4d8ae814f4b0a1010d784fa5179a8f5ceea378dbce0075bf3c96c
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild
new file mode 100644
index 000000000000..545420087d2b
--- /dev/null
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 python3_10 )
+PYTHON_REQ_USE="ssl(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Back up Untangle configurations via the web admin UI"
+HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+	doman "doc/man8/${PN}.8"
+	dodoc "doc/${PN}.example.ini"
+}