Arch Linux User Repository

Hi,

These two patches will bump the version to latest and remove a fix no longer required as fixed upstream.

From 23213660b001f012e0a7e29ea4cda6fa777996de Mon Sep 17 00:00:00 2001
From: Robert Greener <me@r0bert.dev>
Date: Sun, 14 Aug 2022 10:04:00 +0100
Subject: [PATCH 1/2] Bump version to 0.32.3

Signed-off-by: Robert Greener <me@r0bert.dev>
---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 4194072..ea7ef82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = btrbk
    pkgdesc = Backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations
-   pkgver = 0.32.2
+   pkgver = 0.32.3
    pkgrel = 1
    url = https://digint.ch/btrbk
    arch = any
@@ -12,7 +12,7 @@ pkgbase = btrbk
    optdepends = mbuffer: --progress support and add buffering to send-stream
    optdepends = sudo: support for the btrfs-progs-sudo backend
    options = !makeflags
-   source = https://digint.ch/download/btrbk/releases/btrbk-0.32.2.tar.xz
-   b2sums = f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c
+   source = https://digint.ch/download/btrbk/releases/btrbk-0.32.3.tar.xz
+   b2sums = f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf

 pkgname = btrbk
diff --git a/PKGBUILD b/PKGBUILD
index 0850408..72d8deb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Michael Duell < mail at akurei dot me >
 # Contributor: Myles English <myles at rockhead dot biz>
 pkgname=btrbk
-pkgver=0.32.2
+pkgver=0.32.3
 pkgrel=1
 pkgdesc="Backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations"
 url="https://digint.ch/btrbk"
@@ -20,4 +20,4 @@ package() {
   make DESTDIR="${pkgdir}" BINDIR="/usr/bin" install
 }

-b2sums=('f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c')
+b2sums=('f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf')
-- 
2.37.2

From c05b513674e142682f82b1cbeba439ec2ec00e3e Mon Sep 17 00:00:00 2001
From: Robert Greener <me@r0bert.dev>
Date: Sun, 14 Aug 2022 10:04:43 +0100
Subject: [PATCH 2/2] Remove !makeflags as option.

This has been fixed upstream as https://github.com/digint/btrbk/pull/341
has been merged.

Signed-off-by: Robert Greener <me@r0bert.dev>
---
 .SRCINFO | 1 -
 PKGBUILD | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ea7ef82..430f30e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = btrbk
    optdepends = openssh: remote backup support,
    optdepends = mbuffer: --progress support and add buffering to send-stream
    optdepends = sudo: support for the btrfs-progs-sudo backend
-   options = !makeflags
    source = https://digint.ch/download/btrbk/releases/btrbk-0.32.3.tar.xz
    b2sums = f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf

diff --git a/PKGBUILD b/PKGBUILD
index 72d8deb..1713beb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,6 @@ arch=('any')
 license=('GPL3')
 depends=('perl' 'btrfs-progs')
 makedepends=('asciidoctor')
-options=('!makeflags') # temporary fix for https://github.com/digint/btrbk/pull/341
 optdepends=('openssh: remote backup support',
         'mbuffer: --progress support and add buffering to send-stream'
         'sudo: support for the btrfs-progs-sudo backend')
-- 
2.37.2

The conflicts=('btrbk-git') line should be removed (if putting a conflict anywhere it should be on the VCS version of a package instead, with a conflict on the non-VCS variant).
Also, maybe add optdepends=('sudo: support for the btrfs-progs-sudo backend')?

@willemw Thank you, removed.

Please remove "conflicts=('btrbk-git')" according to the guidelines ("... you do not need to specify that conflicting package in your conflicts array").

@MountainX No, sorry. Don't know if they exist. It would be great if those landed upstream. If not, another AUR package would probably the better solution (btrbk-pacman-hooks) or something akin.

conflicts=('btrbk-git') is not necessary.

@akurei thank you for maintaining this package. Do you know if any pacman hooks exist for btrbk that could replace Arch Linux - snap-pac 2.3.1-2 (any)? If they don't exist, I volunteer to help someone create & test them.

Fixed here. As soon as upstream releases a fix I will adapt the PKGBUILD again. Thanks @xiretza @Kr1ss

The package should therefore specify otions=(!makeflags). Citing from PKGBUILD(5), "More useful in its negative form !makeflags with select packages that have problems building with custom makeflags such as -j2 (or higher)."