Daniel M. Capella pushed to branch main at Arch Linux / Packaging / Packages /
borgmatic
Commits:
4720508f by Daniel M. Capella at 2024-11-04T17:36:53-05:00
upgpkg: 1.9.0-2: Make systemd encrypted credentials opt-in
- - - - -
3 changed files:
- .SRCINFO
- + 0001-Comment-out-encrypted-credentials.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = borgmatic
pkgdesc = Simple, configuration-driven backup software for servers and
workstations
pkgver = 1.9.0
- pkgrel = 1
+ pkgrel = 2
url = https://torsion.org/borgmatic
arch = any
license = GPL-3.0-or-later
@@ -23,6 +23,8 @@ pkgbase = borgmatic
optdepends = apprise: for Apprise notifications
optdepends = python-pyfuse3: for mount action
source =
git+https://projects.torsion.org/borgmatic-collective/borgmatic.git#tag=1.9.0
+ source = 0001-Comment-out-encrypted-credentials.patch
b2sums =
8e4e618408660fc91b83667f0a5e38fc96b0ef0487db78253b81afe8ad8fcdffcbbc0bad00083885966ea875cc5047d0a1f8fd9b0d2a3588e8a60542a2ebf7b3
+ b2sums =
53bf49630e91a7aba1bb3a75fea1a1f8b994eb91f8fac1f047e523a1025475101ddea4d0ba917b57f5eff6a6709bbc3a4b45f4e239801c43bc491260bed6a7ca
pkgname = borgmatic
=====================================
0001-Comment-out-encrypted-credentials.patch
=====================================
@@ -0,0 +1,28 @@
+From 50472ab8ccdc14a16b4d4a59a7a695f226fb7d80 Mon Sep 17 00:00:00 2001
+From: "Daniel M. Capella" <[email protected]>
+Date: Sun, 3 Nov 2024 19:09:45 -0500
+Subject: [PATCH] Comment out encrypted credentials
+
+Make this opt-in. The service errors out if credentials are not found.
+---
+ sample/systemd/borgmatic.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sample/systemd/borgmatic.service
b/sample/systemd/borgmatic.service
+index a3391c32..e5092646 100644
+--- a/sample/systemd/borgmatic.service
++++ b/sample/systemd/borgmatic.service
+@@ -11,8 +11,8 @@ Documentation=https://torsion.org/borgmatic/
+ Type=oneshot
+
+ # Load encrypted credentials.
+-LoadCredentialEncrypted=borgmatic:/etc/credstore.encrypted/borgmatic/
+-LoadCredentialEncrypted=borgmatic.pw
++# LoadCredentialEncrypted=borgmatic:/etc/credstore.encrypted/borgmatic/
++# LoadCredentialEncrypted=borgmatic.pw
+
+ # Security settings for systemd running as root, optional but recommended to
improve security. You
+ # can disable individual settings if they cause problems for your use case.
For more details, see
+--
+2.47.0
+
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
pkgname=borgmatic
pkgver=1.9.0
-pkgrel=1
+pkgrel=2
pkgdesc='Simple, configuration-driven backup software for servers and
workstations'
arch=(any)
url=https://torsion.org/borgmatic
@@ -38,12 +38,19 @@ optdepends=(
'apprise: for Apprise notifications'
'python-pyfuse3: for mount action'
)
-source=("git+https://projects.torsion.org/borgmatic-collective/borgmatic.git#tag=$pkgver";)
-b2sums=('8e4e618408660fc91b83667f0a5e38fc96b0ef0487db78253b81afe8ad8fcdffcbbc0bad00083885966ea875cc5047d0a1f8fd9b0d2a3588e8a60542a2ebf7b3')
+source=(
+
"git+https://projects.torsion.org/borgmatic-collective/borgmatic.git#tag=$pkgver";
+ 0001-Comment-out-encrypted-credentials.patch
+)
+b2sums=('8e4e618408660fc91b83667f0a5e38fc96b0ef0487db78253b81afe8ad8fcdffcbbc0bad00083885966ea875cc5047d0a1f8fd9b0d2a3588e8a60542a2ebf7b3'
+
'53bf49630e91a7aba1bb3a75fea1a1f8b994eb91f8fac1f047e523a1025475101ddea4d0ba917b57f5eff6a6709bbc3a4b45f4e239801c43bc491260bed6a7ca')
prepare() {
cd $pkgname
sed -i 's,root/.local,usr,' sample/systemd/borgmatic{,-user}.service
+
+ # https://projects.torsion.org/borgmatic-collective/borgmatic/pulls/929
+ patch --forward --strip=1
--input=../0001-Comment-out-encrypted-credentials.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/borgmatic/-/commit/4720508f14d07ed6f3fa261f65a6c8d1aa644354
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/borgmatic/-/commit/4720508f14d07ed6f3fa261f65a6c8d1aa644354
You're receiving this email because of your account on gitlab.archlinux.org.
