From 864f958d3851665e42db5b64d935cba7e9923448 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Mon, 7 Mar 2022 10:36:34 +0100
Subject: [PATCH 01/15] aurutils: 8

---
 .SRCINFO           |  6 +++---
 PKGBUILD           |  4 ++--
 aurutils.changelog | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3ee35b3..b12c842 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 7.2
+	pkgver = 8
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-7.2.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/7.2.tar.gz
-	sha256sums = f7968625c4cf39592c40beebc64fd8c6295a9ad8f3edcdfda67d8d4fed16cb63
+	source = aurutils-8.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.tar.gz
+	sha256sums = 56ae3a79147b7663b31b6e3a6791717398915bfffdb23f4af907d4472f5bfca7
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 0886f66..b923736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=7.2
+pkgver=8
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('f7968625c4cf39592c40beebc64fd8c6295a9ad8f3edcdfda67d8d4fed16cb63')
+sha256sums=('56ae3a79147b7663b31b6e3a6791717398915bfffdb23f4af907d4472f5bfca7')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index 16c0d48..b1462a6 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,42 @@
+## 8
+
+* `aur-chroot`
+
+The `aur-chroot` command-line was changed so that `--create`, `--build` and
+`--update` can be used in a single command. Command-line arguments are now
+exclusively used for packages passed to `mkarchroot` and `arch-nspawn`.
+To set `makechrootpkg` options, the new `--margs` and `--cargs` options are
+available. As `aur-build --margs`, these take a comma-delimited string and
+can be specified multiple times. (Issues: #950, #807)
+
+The `--packagelist` command is now deprecated. The container path can be
+retrieved with the `--path` option, e.g for use with `makepkg --config`.
+
+* `aur-build`
+  + Consider all repositories (`Usage = Install`) for local repository upgrade (#956)
+
+* `aur-srcver`
+  + add `--buildscript`
+  + deprecate `-E` / `--env`
+    - `get_full_version` from `libmakepkg` is now used after running `makepkg`
+  + take arguments from `stdin` if `-` is specified
+
+* `aurvcs.7`
+  + run `aur-fetch` and `aur-view` before `aur-srcver`
+  + sample code remaned to `aur-sync-devel`
+
+## 7.2
+
+* `aur-search`
+  + add `OptDepends` to `--info` output (#945)
+  + handle empty keywords in `--info` output (#946)
+
+* `aur-depends`
+  + add `--optdepends` (#945)
+
+* `aur-sync`
+  + add `--optdepends` (#945)
+
 ## 7.1
 
 * `aur-build`

From 4f87036a3838def76534a82aa1d6f4aad88abb51 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Wed, 9 Mar 2022 13:53:25 +0100
Subject: [PATCH 02/15] aurutils: 8.1

---
 .SRCINFO           | 6 +++---
 PKGBUILD           | 4 ++--
 aurutils.changelog | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b12c842..36463f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 8
+	pkgver = 8.1
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-8.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.tar.gz
-	sha256sums = 56ae3a79147b7663b31b6e3a6791717398915bfffdb23f4af907d4472f5bfca7
+	source = aurutils-8.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.1.tar.gz
+	sha256sums = 19efcaba7f56d3fd3e1130d5092e41ac73e623f075e741aca893b0e3adeae2f1
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index b923736..65a4ca0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=8
+pkgver=8.1
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('56ae3a79147b7663b31b6e3a6791717398915bfffdb23f4af907d4472f5bfca7')
+sha256sums=('19efcaba7f56d3fd3e1130d5092e41ac73e623f075e741aca893b0e3adeae2f1')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index b1462a6..33bbb75 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,8 @@
+## 8.1
+
+* `aur-srcver`
+  + fix directory to source the build script from (#958)
+
 ## 8
 
 * `aur-chroot`

From 04b353aa805821b0a3875b7e7bae00db48f97be2 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Wed, 9 Mar 2022 15:10:43 +0100
Subject: [PATCH 03/15] aurutils: 8.1.1

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 36463f1..6894dc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 8.1
+	pkgver = 8.1.1
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-8.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.1.tar.gz
-	sha256sums = 19efcaba7f56d3fd3e1130d5092e41ac73e623f075e741aca893b0e3adeae2f1
+	source = aurutils-8.1.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.1.1.tar.gz
+	sha256sums = 79bd38b159788fdb37831e368fa9d4649767b0c30aac388b03633363f45e4c17
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 65a4ca0..1a2d428 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=8.1
+pkgver=8.1.1
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('19efcaba7f56d3fd3e1130d5092e41ac73e623f075e741aca893b0e3adeae2f1')
+sha256sums=('79bd38b159788fdb37831e368fa9d4649767b0c30aac388b03633363f45e4c17')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'

From 9b7bfdb34184bc1060e8fe14d18ca9382e5b2caf Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Sun, 13 Mar 2022 16:20:25 +0100
Subject: [PATCH 04/15] aurutils: 8.3

---
 .SRCINFO           |  6 +++---
 PKGBUILD           |  4 ++--
 aurutils.changelog | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 6894dc5..9c6c451 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 8.1.1
+	pkgver = 8.3
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-8.1.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.1.1.tar.gz
-	sha256sums = 79bd38b159788fdb37831e368fa9d4649767b0c30aac388b03633363f45e4c17
+	source = aurutils-8.3.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.3.tar.gz
+	sha256sums = c6f9523d4e8b199bc813037f5452d5711ef05111d6035f6d8d11ebe50d0ca2cd
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 1a2d428..ff93e62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=8.1.1
+pkgver=8.3
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('79bd38b159788fdb37831e368fa9d4649767b0c30aac388b03633363f45e4c17')
+sha256sums=('c6f9523d4e8b199bc813037f5452d5711ef05111d6035f6d8d11ebe50d0ca2cd')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index 33bbb75..279d0c1 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,27 @@
+## 8.3
+
+* `aur-fetch`
+  + add `--revision`
+  + add `--no-patch`
+
+* `aur-repo`
+  + add `--field`
+
+* `examples`
+  + add `vercmp-devel`, `sync-list`
+  + rename `aur-sync-devel` to `sync-devel`
+
+## 8.2
+
+* `aur-srcver`
+  + add separator before first failed package
+
+* `aur-fetch`
+  + handle empty `git` repositories (#959)
+
+* `man7`
+  + remove `aurvcs.7`, move `aur-sync-devel` to `examples`
+
 ## 8.1
 
 * `aur-srcver`

From 1497a1de98efb5fd3a4e3174285fad79880f86a5 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Sun, 13 Mar 2022 16:41:55 +0100
Subject: [PATCH 05/15] aurutils: 8.3.1

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 9c6c451..35c4419 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 8.3
+	pkgver = 8.3.1
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-8.3.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.3.tar.gz
-	sha256sums = c6f9523d4e8b199bc813037f5452d5711ef05111d6035f6d8d11ebe50d0ca2cd
+	source = aurutils-8.3.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.3.1.tar.gz
+	sha256sums = 3740525913ace9387329922f364ad1cffbd1a53e2ea8bc156761765bb3f093e7
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index ff93e62..588937a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=8.3
+pkgver=8.3.1
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('c6f9523d4e8b199bc813037f5452d5711ef05111d6035f6d8d11ebe50d0ca2cd')
+sha256sums=('3740525913ace9387329922f364ad1cffbd1a53e2ea8bc156761765bb3f093e7')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'

From fcebb84410a0de4f411aa295c621f376feab4f92 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Tue, 29 Mar 2022 17:35:00 +0200
Subject: [PATCH 06/15] aurutils: 9

---
 .SRCINFO           |  6 +++---
 PKGBUILD           |  4 ++--
 aurutils.changelog | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 35c4419..f6115b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 8.3.1
+	pkgver = 9
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-8.3.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/8.3.1.tar.gz
-	sha256sums = 3740525913ace9387329922f364ad1cffbd1a53e2ea8bc156761765bb3f093e7
+	source = aurutils-9.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.tar.gz
+	sha256sums = 87529b220c0a1a61b5e3f1eeee334fc91948846e932eba09e4f5a07ebf83b8db
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 588937a..2807132 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=8.3.1
+pkgver=9
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('3740525913ace9387329922f364ad1cffbd1a53e2ea8bc156761765bb3f093e7')
+sha256sums=('87529b220c0a1a61b5e3f1eeee334fc91948846e932eba09e4f5a07ebf83b8db')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index 279d0c1..b4b5fb6 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,23 @@
+## 9
+
+* `examples`
+  + add `chroot-batch`
+
+* `lib`
+  + add `aur-build--pkglist`
+
+* `aur-build`
+  + add `--dry-run`
+  + redirect `makepkg -od` output (`--pkgver`) to stderr
+  + sign existing packages (#967)
+
+* `aur-fetch`
+  + add `--no-pager` to the `git log` command (#969)
+  + `--existing`: clone instead of skip targets if they exist
+
+* `aur-sync`
+  + redirect `aur-fetch` output to stderr (#974)
+
 ## 8.3
 
 * `aur-fetch`

From c65beaa33f1865ffb468386a8b9684e04a530210 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Tue, 5 Apr 2022 15:32:42 +0200
Subject: [PATCH 07/15] aurutils: 9.2

---
 .SRCINFO           |  6 +++---
 PKGBUILD           |  4 ++--
 aurutils.changelog | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f6115b2..1be98c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9
+	pkgver = 9.2
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.tar.gz
-	sha256sums = 87529b220c0a1a61b5e3f1eeee334fc91948846e932eba09e4f5a07ebf83b8db
+	source = aurutils-9.2.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.2.tar.gz
+	sha256sums = 5944110ca98411ab0be5fdbbde0237b6ac646dce4e8bf3847d172b92d00cd69b
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 2807132..f71a1c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9
+pkgver=9.2
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('87529b220c0a1a61b5e3f1eeee334fc91948846e932eba09e4f5a07ebf83b8db')
+sha256sums=('5944110ca98411ab0be5fdbbde0237b6ac646dce4e8bf3847d172b92d00cd69b')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index b4b5fb6..f0a1ef7 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,35 @@
+## 9.2
+
+* `aur-build`
+  + deprecate `--results`
+  + retrieve repository before setting `--chroot` paths
+  + unset `PKGEXT` when using `--chroot`
+
+* `aur-search`
+  + use OSC8 terminal hyperlinks (#849)
+
+## 9.1
+
+`aur-build` now uses `setpriv(1)` to run unprivileged commands (`makepkg`, `gpg`,
+`repo-add`) when `AUR_ASROOT` is combined with `--user`. This change has no
+effect when running `aur-build` as a regular user.
+
+Usage:
+
+  $ sudo env AUR_ASROOT=1 aur build --chroot --user <build_user> ...
+
+The above works with `--chroot` (`makechrootpkg -U`). Environment variables in
+the root environment are preserved for user commands, similar to `runuser -c`.
+Host builds using `makepkg --syncdeps` to install dependencies require further
+configuration.
+
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ WARNING!                                                                     │
+│                                                                              │
+│ Running `aur-build` as root is experimental and disabled by default. If your │
+│ install breaks, you get to keep both pieces.                                 │
+└──────────────────────────────────────────────────────────────────────────────┘
+
 ## 9
 
 * `examples`

From 284f3e0c7e839a6ba1831a659eaf45412a7109ff Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Tue, 5 Apr 2022 17:54:16 +0200
Subject: [PATCH 08/15] aurutils: 9.2.1

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 1be98c2..f951867 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.2
+	pkgver = 9.2.1
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.2.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.2.tar.gz
-	sha256sums = 5944110ca98411ab0be5fdbbde0237b6ac646dce4e8bf3847d172b92d00cd69b
+	source = aurutils-9.2.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.2.1.tar.gz
+	sha256sums = ae6db08fe9957ff9d705c5f6288658210f462ee13f57d796795872236b0bcab2
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index f71a1c8..d31ca63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.2
+pkgver=9.2.1
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('5944110ca98411ab0be5fdbbde0237b6ac646dce4e8bf3847d172b92d00cd69b')
+sha256sums=('ae6db08fe9957ff9d705c5f6288658210f462ee13f57d796795872236b0bcab2')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'

From 8dec9ce9e31cc4ca5d61f844a42a0467735b9aff Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Tue, 5 Apr 2022 21:37:02 +0200
Subject: [PATCH 09/15] aurutils: 9.3

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f951867..c9b0ab5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.2.1
+	pkgver = 9.3
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.2.1.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.2.1.tar.gz
-	sha256sums = ae6db08fe9957ff9d705c5f6288658210f462ee13f57d796795872236b0bcab2
+	source = aurutils-9.3.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.3.tar.gz
+	sha256sums = ff4f3e76e208da445c8528af6b11e43fb98c64dd1bf0a70a522373e35330221e
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index d31ca63..01b9122 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.2.1
+pkgver=9.3
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('ae6db08fe9957ff9d705c5f6288658210f462ee13f57d796795872236b0bcab2')
+sha256sums=('ff4f3e76e208da445c8528af6b11e43fb98c64dd1bf0a70a522373e35330221e')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'

From 7a35b6659584d17b43e7a36967266e9eb2a551b2 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Wed, 6 Apr 2022 20:24:02 +0200
Subject: [PATCH 10/15] aurutils: 9.4

---
 .SRCINFO           |  6 +++---
 PKGBUILD           |  4 ++--
 aurutils.changelog | 12 +++++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index c9b0ab5..b528f2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.3
+	pkgver = 9.4
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.3.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.3.tar.gz
-	sha256sums = ff4f3e76e208da445c8528af6b11e43fb98c64dd1bf0a70a522373e35330221e
+	source = aurutils-9.4.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.4.tar.gz
+	sha256sums = 30211952a20fa3e9c10d95ead79cfa0fa2c08f25c3411f9ca49b4a691cdc0728
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 01b9122..faa3e05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.3
+pkgver=9.4
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('ff4f3e76e208da445c8528af6b11e43fb98c64dd1bf0a70a522373e35330221e')
+sha256sums=('30211952a20fa3e9c10d95ead79cfa0fa2c08f25c3411f9ca49b4a691cdc0728')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index f0a1ef7..3352729 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,8 +1,18 @@
+## 9.4
+
+* `aur-build`
+  + revert "retrieve local repository before setting --chroot paths"
+
+## 9.3
+
+* `examples`
+  + rework `sync-list`
+
 ## 9.2
 
 * `aur-build`
   + deprecate `--results`
-  + retrieve repository before setting `--chroot` paths
+  + retrieve local repository before setting `--chroot` paths
   + unset `PKGEXT` when using `--chroot`
 
 * `aur-search`

From f34649bbf0ba26630407c575402af7754e99a715 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Fri, 8 Apr 2022 15:50:27 +0200
Subject: [PATCH 11/15] aurutils: 9.5

---
 .SRCINFO           | 6 +++---
 PKGBUILD           | 4 ++--
 aurutils.changelog | 9 +++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b528f2b..a2fe110 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.4
+	pkgver = 9.5
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.4.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.4.tar.gz
-	sha256sums = 30211952a20fa3e9c10d95ead79cfa0fa2c08f25c3411f9ca49b4a691cdc0728
+	source = aurutils-9.5.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.5.tar.gz
+	sha256sums = fa748cc8babd3f1e5ddfcc48633ebc51ad8c2120024e74f430e89b618f539e53
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index faa3e05..1a8ddf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.4
+pkgver=9.5
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('30211952a20fa3e9c10d95ead79cfa0fa2c08f25c3411f9ca49b4a691cdc0728')
+sha256sums=('fa748cc8babd3f1e5ddfcc48633ebc51ad8c2120024e74f430e89b618f539e53')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index 3352729..f46d654 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,12 @@
+## 9.5
+
+* `aur-build`
+  + add `--results-append`
+  + write results file as build user
+
+* `aur-query`
+  + support `--type=suggest`
+
 ## 9.4
 
 * `aur-build`

From 60edc67461a834299ae6d1444f69b19f0d189588 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Thu, 14 Apr 2022 20:35:29 +0200
Subject: [PATCH 12/15] aurutils: 9.6

---
 .SRCINFO           | 6 +++---
 PKGBUILD           | 4 ++--
 aurutils.changelog | 9 +++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a2fe110..13b0806 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.5
+	pkgver = 9.6
 	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
@@ -17,7 +17,7 @@ pkgbase = aurutils
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.5.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.5.tar.gz
-	sha256sums = fa748cc8babd3f1e5ddfcc48633ebc51ad8c2120024e74f430e89b618f539e53
+	source = aurutils-9.6.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.6.tar.gz
+	sha256sums = 825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 1a8ddf6..1068f4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.5
+pkgver=9.6
 pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
@@ -10,7 +10,7 @@ license=('custom:ISC')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('fa748cc8babd3f1e5ddfcc48633ebc51ad8c2120024e74f430e89b618f539e53')
+sha256sums=('825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
diff --git a/aurutils.changelog b/aurutils.changelog
index f46d654..cd67d00 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,12 @@
+## 9.6
+
+* `aur-pkglist`
+  + add `AUR_METADEST` (directory where metadata archives are stored)
+  + add `--quiet`
+
+* `aur-fetch`
+  + write `git-merge` to `results_file` if the command is run
+
 ## 9.5
 
 * `aur-build`

From c82ab162285526d91bde1964c1a6398ba2462987 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Thu, 28 Apr 2022 15:28:17 +0200
Subject: [PATCH 13/15] aurutils: 9.6-2

---
 .SRCINFO |  8 +++++++-
 PKGBUILD | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 13b0806..3829511 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
 	pkgver = 9.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
 	changelog = aurutils.changelog
@@ -18,6 +18,12 @@ pkgbase = aurutils
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
 	source = aurutils-9.6.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.6.tar.gz
+	source = 0001-sync-tsort-exit.patch::https://github.com/AladW/aurutils/commit/6f56ae7e4df06a0142d8970275986754041955c4.patch
+	source = 0002-sync-filter-deps.patch::https://github.com/AladW/aurutils/commit/3c818fccc3b431d7aea4198e82cd1ccda1e43e5c.patch
+	source = 0003-fetch-git-checkout.patch::https://github.com/AladW/aurutils/commit/c9e57188b5bb356b2373bc087474e2e68872505d.patch
 	sha256sums = 825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954
+	sha256sums = 2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e
+	sha256sums = 695d1b77c67ac87304445b593a2d6b0600adf076d81ed007af3f1c26ea9a8539
+	sha256sums = cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65
 
 pkgname = aurutils
diff --git a/PKGBUILD b/PKGBUILD
index 1068f4e..92607c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,22 @@
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
 pkgver=9.6
-pkgrel=1
+pkgrel=2
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
 arch=('any')
 license=('custom:ISC')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
+_backports=("0001-sync-tsort-exit.patch::$url/commit/6f56ae7e4df06a0142d8970275986754041955c4.patch"
+            "0002-sync-filter-deps.patch::$url/commit/3c818fccc3b431d7aea4198e82cd1ccda1e43e5c.patch"
+            "0003-fetch-git-checkout.patch::$url/commit/c9e57188b5bb356b2373bc087474e2e68872505d.patch")
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
+        "${_backports[@]}")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954')
+sha256sums=('825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954'
+            '2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e'
+            '695d1b77c67ac87304445b593a2d6b0600adf076d81ed007af3f1c26ea9a8539'
+            'cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
@@ -20,6 +27,9 @@ optdepends=('bash-completion: bash completion'
 
 prepare() {
     cd "$pkgname-$pkgver"
+    for _b in "${_backports[@]}"; do
+        git apply "$srcdir/${_b%%::*}"
+    done
 }
 
 build() {

From 7fd0a0f4cdf7ad041080b28ab74ba83e30ad41b1 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Thu, 28 Apr 2022 17:21:37 +0200
Subject: [PATCH 14/15] aurutils: 9.6-3

Do not patch changelog (merge conflict between 9.x and 10)
---
 .SRCINFO                      | 10 ++--
 0001-sync-tsort-exit.patch    | 27 +++++++++++
 0002-sync-filter-deps.patch   | 91 +++++++++++++++++++++++++++++++++++
 0003-fetch-git-checkout.patch | 33 +++++++++++++
 PKGBUILD                      | 12 ++---
 5 files changed, 162 insertions(+), 11 deletions(-)
 create mode 100644 0001-sync-tsort-exit.patch
 create mode 100644 0002-sync-filter-deps.patch
 create mode 100644 0003-fetch-git-checkout.patch

diff --git a/.SRCINFO b/.SRCINFO
index 3829511..8816494 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
 	pkgver = 9.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
 	changelog = aurutils.changelog
@@ -18,12 +18,12 @@ pkgbase = aurutils
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
 	source = aurutils-9.6.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.6.tar.gz
-	source = 0001-sync-tsort-exit.patch::https://github.com/AladW/aurutils/commit/6f56ae7e4df06a0142d8970275986754041955c4.patch
-	source = 0002-sync-filter-deps.patch::https://github.com/AladW/aurutils/commit/3c818fccc3b431d7aea4198e82cd1ccda1e43e5c.patch
-	source = 0003-fetch-git-checkout.patch::https://github.com/AladW/aurutils/commit/c9e57188b5bb356b2373bc087474e2e68872505d.patch
+	source = 0001-sync-tsort-exit.patch
+	source = 0002-sync-filter-deps.patch
+	source = 0003-fetch-git-checkout.patch
 	sha256sums = 825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954
 	sha256sums = 2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e
-	sha256sums = 695d1b77c67ac87304445b593a2d6b0600adf076d81ed007af3f1c26ea9a8539
+	sha256sums = a65dace12d686d8a77380af9875af5633c2fd12e6c6ed8802a202e22861b77c0
 	sha256sums = cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65
 
 pkgname = aurutils
diff --git a/0001-sync-tsort-exit.patch b/0001-sync-tsort-exit.patch
new file mode 100644
index 0000000..d15d8a1
--- /dev/null
+++ b/0001-sync-tsort-exit.patch
@@ -0,0 +1,27 @@
+From 6f56ae7e4df06a0142d8970275986754041955c4 Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@archlinux.org>
+Date: Thu, 21 Apr 2022 19:11:27 +0200
+Subject: [PATCH] sync: preserve tsort exit status
+
+Regression in commit 01af4500d77ac1bce6105089603051b4ad554c92
+---
+ lib/aur-sync | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/aur-sync b/lib/aur-sync
+index f2cf93d07..248a0565e 100755
+--- a/lib/aur-sync
++++ b/lib/aur-sync
+@@ -355,6 +355,12 @@ cut -f1-3 depends | tr_ver 2 | select_ignores 2 filter - | lib32 - >graph_0
+ # (e.g. sort -u) with checks for cycles done at build-time.
+ select_pkgbase graph_0 graph_0 | tee graph | tsort | tac >queue
+ 
++# XXX: preserve tsort exit status
++if (( PIPESTATUS[2] )); then
++    error '%s: dependency cycle detected' "$argv0"
++    exit 22
++fi
++
+ if [[ -s queue ]]; then
+     cd_safe "$AURDEST"
+ else
diff --git a/0002-sync-filter-deps.patch b/0002-sync-filter-deps.patch
new file mode 100644
index 0000000..11e322f
--- /dev/null
+++ b/0002-sync-filter-deps.patch
@@ -0,0 +1,91 @@
+From 3c818fccc3b431d7aea4198e82cd1ccda1e43e5c Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@archlinux.org>
+Date: Thu, 28 Apr 2022 14:44:28 +0200
+Subject: [PATCH] sync: filter dependency graph by pkgname, not depends
+
+Before filtering, the dependency graph is in the format:
+
+  $pkgname  $depends    $pkgbase
+
+Since revision 01af4500d77ac1bce6105089603051b4ad554c92, this graph is
+filtered (e.g. by packages already in the local repository) by $depends.
+In some cases, this does not filter all targets.
+
+For example, when uprading r-cli and r-testthat, aur-sync would build 7
+targets instead of 2:
+
+  # cut -f1-3 $tmp/depends
+  ...
+  r-tibble r-vctrs r-tibble
+  r-pillar r-vctrs r-pillar
+  r-vctrs r-vctrs r-vctrs
+  r-vctrs r r-vctrs
+  r-vctrs r-cli r-vctrs
+  r-vctrs r-glue  r-vctrs
+  r-vctrs r-rlang r-vctrs
+  ...
+
+  # after filtering r-vctrs from $2
+  # r-vctrs is still a target!
+  ...
+  r-vctrs r r-vctrs
+  r-vctrs r-cli r-vctrs
+  r-vctrs r-glue  r-vctrs
+  r-vctrs r-rlang r-vctrs
+  ...
+---
+ lib/aur-sync               | 16 ++++++++--------
+ makepkg/aurutils.changelog |  3 ++-
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/lib/aur-sync b/lib/aur-sync
+index 6bb0d5559..6d3e93a4e 100755
+--- a/lib/aur-sync
++++ b/lib/aur-sync
+@@ -44,21 +44,21 @@ select_pkgbase() {
+ # argv[1]: $1 pkgname (possibly empty, #910)
+ # argv[2]: $1 pkgname $2 pkgver
+ select_ignores() {
+-    awk -v target="$1" 'ARGV[1] == FILENAME {
++    awk 'ARGV[1] == FILENAME {
+         map[$1] = 1
+         next
+     }
+-    !($target in map) {
++    !($1 in map) {
+         print
+-    }' "${@:2}"
++    }' "$@"
+ }
+ 
+ # argv[1]: $1 pkgname $2 depends[<>=]
+ tr_ver() {
+-    awk -v target="$1" '{
+-        sub(/[<>=].*/, "", $target)
++    awk '{
++        sub(/[<>=].*/, "", $2)
+         print
+-    }' "${@:2}"
++    }' "$@"
+ }
+ 
+ complement() {
+@@ -285,7 +285,7 @@ fi >&2
+ 
+ # db_info: $1 pkgname $2 pkgver
+ ( set -o pipefail
+-  aur repo "${repo_args[@]}" --list -d "$db_name" -r "$db_root" | select_ignores 1 igni -
++  aur repo "${repo_args[@]}" --list -d "$db_name" -r "$db_root" | select_ignores igni -
+ ) >db_info
+ 
+ { if (( $# )); then
+@@ -344,7 +344,7 @@ cut -f2,5 --complement depends | sort -u >pkginfo
+ } >filter
+ 
+ # $1 pkgname $2 depends $3 pkgbase, filter by $2 (depends and self)
+-cut -f1-3 depends | tr_ver 2 | select_ignores 2 filter - | lib32 - >graph_0
++cut -f1-3 depends | tr_ver | select_ignores filter - | lib32 - >graph_0
+ 
+ # XXX a flat file is needed for aur-{graph,fetch,view}. `ninja` requires the
+ # build files to be present before dependency resolution (with `ninja -n`) can
+
diff --git a/0003-fetch-git-checkout.patch b/0003-fetch-git-checkout.patch
new file mode 100644
index 0000000..86a3efe
--- /dev/null
+++ b/0003-fetch-git-checkout.patch
@@ -0,0 +1,33 @@
+From c9e57188b5bb356b2373bc087474e2e68872505d Mon Sep 17 00:00:00 2001
+From: Alad Wenter <alad@archlinux.org>
+Date: Thu, 28 Apr 2022 15:16:31 +0200
+Subject: [PATCH] fetch: use git-checkout instead of git-merge for empty
+ working tree
+
+---
+ lib/aur-fetch | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/lib/aur-fetch b/lib/aur-fetch
+index a21a8a130..104be7794 100755
+--- a/lib/aur-fetch
++++ b/lib/aur-fetch
+@@ -147,16 +147,12 @@ fi | while read -r pkg; do
+                 results 'fetch' "${prev_head:-0}" "$fetch_head" "$PWD/$pkg" "$results_file"
+             fi
+         else
++            error '%s: %s: failed to %s repository' "$argv0" "$pkg" fetch
+             exit 1
+         fi
+ 
+-        # If the index has no commits, merge from upstream and move to the next package.
+         if [[ ! $prev_head ]]; then
+-            git merge 'origin/master'
+-
+-            if [[ -v results_file ]]; then
+-                results 'merge' '0' "$fetch_head" "$PWD/$pkg" "$results_file"
+-            fi
++            git checkout 'master'
+             continue
+         fi
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 92607c1..fbed118 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,21 @@
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
 pkgver=9.6
-pkgrel=2
+pkgrel=3
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
 arch=('any')
 license=('custom:ISC')
-_backports=("0001-sync-tsort-exit.patch::$url/commit/6f56ae7e4df06a0142d8970275986754041955c4.patch"
-            "0002-sync-filter-deps.patch::$url/commit/3c818fccc3b431d7aea4198e82cd1ccda1e43e5c.patch"
-            "0003-fetch-git-checkout.patch::$url/commit/c9e57188b5bb356b2373bc087474e2e68872505d.patch")
+_backports=("0001-sync-tsort-exit.patch"
+            "0002-sync-filter-deps.patch"
+            "0003-fetch-git-checkout.patch")
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
         "${_backports[@]}")
 changelog=aurutils.changelog
 install=aurutils.install
 sha256sums=('825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954'
             '2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e'
-            '695d1b77c67ac87304445b593a2d6b0600adf076d81ed007af3f1c26ea9a8539'
+            'a65dace12d686d8a77380af9875af5633c2fd12e6c6ed8802a202e22861b77c0'
             'cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65')
 depends=('git' 'jq' 'pacutils' 'curl' 'expect')
 optdepends=('bash-completion: bash completion'
@@ -28,7 +28,7 @@ optdepends=('bash-completion: bash completion'
 prepare() {
     cd "$pkgname-$pkgver"
     for _b in "${_backports[@]}"; do
-        git apply "$srcdir/${_b%%::*}"
+        patch -p1 < "$srcdir/$_b"
     done
 }
 

From eed5f3d39673908b09f8ba7fe1f51167e08bf5f4 Mon Sep 17 00:00:00 2001
From: Alad Wenter <alad@archlinux.org>
Date: Sun, 10 Jul 2022 14:44:52 +0200
Subject: [PATCH 15/15] aurutils: 10b

---
 .SRCINFO                      | 15 ++----
 0001-sync-tsort-exit.patch    | 27 -----------
 0002-sync-filter-deps.patch   | 91 -----------------------------------
 0003-fetch-git-checkout.patch | 33 -------------
 PKGBUILD                      | 24 ++-------
 aurutils.changelog            | 55 +++++++++++++++++++++
 6 files changed, 64 insertions(+), 181 deletions(-)
 delete mode 100644 0001-sync-tsort-exit.patch
 delete mode 100644 0002-sync-filter-deps.patch
 delete mode 100644 0003-fetch-git-checkout.patch

diff --git a/.SRCINFO b/.SRCINFO
index 8816494..8529f8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aurutils
 	pkgdesc = helper tools for the arch user repository
-	pkgver = 9.6
-	pkgrel = 3
+	pkgver = 10b
+	pkgrel = 1
 	url = https://github.com/AladW/aurutils
 	install = aurutils.install
 	changelog = aurutils.changelog
@@ -11,19 +11,12 @@ pkgbase = aurutils
 	depends = jq
 	depends = pacutils
 	depends = curl
-	depends = expect
 	optdepends = bash-completion: bash completion
 	optdepends = zsh: zsh completion
 	optdepends = devtools: aur-chroot
 	optdepends = vifm: default pager
 	optdepends = ninja: aur-sync ninja support
-	source = aurutils-9.6.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/9.6.tar.gz
-	source = 0001-sync-tsort-exit.patch
-	source = 0002-sync-filter-deps.patch
-	source = 0003-fetch-git-checkout.patch
-	sha256sums = 825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954
-	sha256sums = 2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e
-	sha256sums = a65dace12d686d8a77380af9875af5633c2fd12e6c6ed8802a202e22861b77c0
-	sha256sums = cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65
+	source = aurutils-10b.tar.gz::https://github.com/AladW/aurutils/archive/refs/tags/10b.tar.gz
+	sha256sums = f66cdb98149365ec520003875762dca527c28d75ea7744a6cfe0a9aa8b94c806
 
 pkgname = aurutils
diff --git a/0001-sync-tsort-exit.patch b/0001-sync-tsort-exit.patch
deleted file mode 100644
index d15d8a1..0000000
--- a/0001-sync-tsort-exit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6f56ae7e4df06a0142d8970275986754041955c4 Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad@archlinux.org>
-Date: Thu, 21 Apr 2022 19:11:27 +0200
-Subject: [PATCH] sync: preserve tsort exit status
-
-Regression in commit 01af4500d77ac1bce6105089603051b4ad554c92
----
- lib/aur-sync | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lib/aur-sync b/lib/aur-sync
-index f2cf93d07..248a0565e 100755
---- a/lib/aur-sync
-+++ b/lib/aur-sync
-@@ -355,6 +355,12 @@ cut -f1-3 depends | tr_ver 2 | select_ignores 2 filter - | lib32 - >graph_0
- # (e.g. sort -u) with checks for cycles done at build-time.
- select_pkgbase graph_0 graph_0 | tee graph | tsort | tac >queue
- 
-+# XXX: preserve tsort exit status
-+if (( PIPESTATUS[2] )); then
-+    error '%s: dependency cycle detected' "$argv0"
-+    exit 22
-+fi
-+
- if [[ -s queue ]]; then
-     cd_safe "$AURDEST"
- else
diff --git a/0002-sync-filter-deps.patch b/0002-sync-filter-deps.patch
deleted file mode 100644
index 11e322f..0000000
--- a/0002-sync-filter-deps.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 3c818fccc3b431d7aea4198e82cd1ccda1e43e5c Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad@archlinux.org>
-Date: Thu, 28 Apr 2022 14:44:28 +0200
-Subject: [PATCH] sync: filter dependency graph by pkgname, not depends
-
-Before filtering, the dependency graph is in the format:
-
-  $pkgname  $depends    $pkgbase
-
-Since revision 01af4500d77ac1bce6105089603051b4ad554c92, this graph is
-filtered (e.g. by packages already in the local repository) by $depends.
-In some cases, this does not filter all targets.
-
-For example, when uprading r-cli and r-testthat, aur-sync would build 7
-targets instead of 2:
-
-  # cut -f1-3 $tmp/depends
-  ...
-  r-tibble r-vctrs r-tibble
-  r-pillar r-vctrs r-pillar
-  r-vctrs r-vctrs r-vctrs
-  r-vctrs r r-vctrs
-  r-vctrs r-cli r-vctrs
-  r-vctrs r-glue  r-vctrs
-  r-vctrs r-rlang r-vctrs
-  ...
-
-  # after filtering r-vctrs from $2
-  # r-vctrs is still a target!
-  ...
-  r-vctrs r r-vctrs
-  r-vctrs r-cli r-vctrs
-  r-vctrs r-glue  r-vctrs
-  r-vctrs r-rlang r-vctrs
-  ...
----
- lib/aur-sync               | 16 ++++++++--------
- makepkg/aurutils.changelog |  3 ++-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/lib/aur-sync b/lib/aur-sync
-index 6bb0d5559..6d3e93a4e 100755
---- a/lib/aur-sync
-+++ b/lib/aur-sync
-@@ -44,21 +44,21 @@ select_pkgbase() {
- # argv[1]: $1 pkgname (possibly empty, #910)
- # argv[2]: $1 pkgname $2 pkgver
- select_ignores() {
--    awk -v target="$1" 'ARGV[1] == FILENAME {
-+    awk 'ARGV[1] == FILENAME {
-         map[$1] = 1
-         next
-     }
--    !($target in map) {
-+    !($1 in map) {
-         print
--    }' "${@:2}"
-+    }' "$@"
- }
- 
- # argv[1]: $1 pkgname $2 depends[<>=]
- tr_ver() {
--    awk -v target="$1" '{
--        sub(/[<>=].*/, "", $target)
-+    awk '{
-+        sub(/[<>=].*/, "", $2)
-         print
--    }' "${@:2}"
-+    }' "$@"
- }
- 
- complement() {
-@@ -285,7 +285,7 @@ fi >&2
- 
- # db_info: $1 pkgname $2 pkgver
- ( set -o pipefail
--  aur repo "${repo_args[@]}" --list -d "$db_name" -r "$db_root" | select_ignores 1 igni -
-+  aur repo "${repo_args[@]}" --list -d "$db_name" -r "$db_root" | select_ignores igni -
- ) >db_info
- 
- { if (( $# )); then
-@@ -344,7 +344,7 @@ cut -f2,5 --complement depends | sort -u >pkginfo
- } >filter
- 
- # $1 pkgname $2 depends $3 pkgbase, filter by $2 (depends and self)
--cut -f1-3 depends | tr_ver 2 | select_ignores 2 filter - | lib32 - >graph_0
-+cut -f1-3 depends | tr_ver | select_ignores filter - | lib32 - >graph_0
- 
- # XXX a flat file is needed for aur-{graph,fetch,view}. `ninja` requires the
- # build files to be present before dependency resolution (with `ninja -n`) can
-
diff --git a/0003-fetch-git-checkout.patch b/0003-fetch-git-checkout.patch
deleted file mode 100644
index 86a3efe..0000000
--- a/0003-fetch-git-checkout.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c9e57188b5bb356b2373bc087474e2e68872505d Mon Sep 17 00:00:00 2001
-From: Alad Wenter <alad@archlinux.org>
-Date: Thu, 28 Apr 2022 15:16:31 +0200
-Subject: [PATCH] fetch: use git-checkout instead of git-merge for empty
- working tree
-
----
- lib/aur-fetch | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/lib/aur-fetch b/lib/aur-fetch
-index a21a8a130..104be7794 100755
---- a/lib/aur-fetch
-+++ b/lib/aur-fetch
-@@ -147,16 +147,12 @@ fi | while read -r pkg; do
-                 results 'fetch' "${prev_head:-0}" "$fetch_head" "$PWD/$pkg" "$results_file"
-             fi
-         else
-+            error '%s: %s: failed to %s repository' "$argv0" "$pkg" fetch
-             exit 1
-         fi
- 
--        # If the index has no commits, merge from upstream and move to the next package.
-         if [[ ! $prev_head ]]; then
--            git merge 'origin/master'
--
--            if [[ -v results_file ]]; then
--                results 'merge' '0' "$fetch_head" "$PWD/$pkg" "$results_file"
--            fi
-+            git checkout 'master'
-             continue
-         fi
- 
diff --git a/PKGBUILD b/PKGBUILD
index fbed118..242ae1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,23 @@
 # Maintainer: Alad Wenter <https://github.com/AladW>
 # Co-Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
 pkgname=aurutils
-pkgver=9.6
-pkgrel=3
+pkgver=10b
+pkgrel=1
 pkgdesc='helper tools for the arch user repository'
 url='https://github.com/AladW/aurutils'
 arch=('any')
 license=('custom:ISC')
-_backports=("0001-sync-tsort-exit.patch"
-            "0002-sync-filter-deps.patch"
-            "0003-fetch-git-checkout.patch")
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-        "${_backports[@]}")
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz")
 changelog=aurutils.changelog
 install=aurutils.install
-sha256sums=('825d6ab3d66faf84ee3856e677de138dcdb3af2a5c38164f69601ee0a4e96954'
-            '2f0e039c6544dc2204dbb25f15f2c3fcefbc742a196fedb60925b7dc3311665e'
-            'a65dace12d686d8a77380af9875af5633c2fd12e6c6ed8802a202e22861b77c0'
-            'cca4ea1456d1cd8cde333d7e60c0749c9bc2c78b4f4b3eda751432cc3555aa65')
-depends=('git' 'jq' 'pacutils' 'curl' 'expect')
+sha256sums=('f66cdb98149365ec520003875762dca527c28d75ea7744a6cfe0a9aa8b94c806')
+depends=('git' 'jq' 'pacutils' 'curl')
 optdepends=('bash-completion: bash completion'
             'zsh: zsh completion'
             'devtools: aur-chroot'
             'vifm: default pager'
             'ninja: aur-sync ninja support')
 
-prepare() {
-    cd "$pkgname-$pkgver"
-    for _b in "${_backports[@]}"; do
-        patch -p1 < "$srcdir/$_b"
-    done
-}
-
 build() {
     cd "$pkgname-$pkgver"
     make AURUTILS_VERSION="$pkgver"
diff --git a/aurutils.changelog b/aurutils.changelog
index cd67d00..79f62d3 100644
--- a/aurutils.changelog
+++ b/aurutils.changelog
@@ -1,3 +1,58 @@
+## 10
+
+* `aur`
+  + support environment files (`$AUR_ENV`, defaults to `$XDG_CONFIG_HOME/aurutils/env`)
+  + add `--env`
+
+* `aur-build`
+  + use `AUR_PACMAN_AUTH` as elevation command (prior: `PACMAN_AUTH`)
+  + use `$PWD` as default value for `$LOGDEST`
+  + bug fixes for gpg signing (`--sign`)
+
+* `aur-chroot`
+  + use `AUR_PACMAN_AUTH` as elevation command (prior: `PACMAN_AUTH`)
+
+* `aur-fetch`
+  + `--sync=auto`: run `git-merge` instead of `git-reset`
+    - add `--ff`, `--ff-only`, `--no-ff`, `--no-commit` options
+    - fix a bug where setting `aurutils.rebase` affected unrelated targets
+    - set default author for merge commits to `aurutils@localhost`
+  + `--sync=auto` now preserves local changes by default
+    - `--discard` (`-f`) resets the branch on new upstream commits
+  + add `--reset`, `--rebase`, `--auto` (`--sync=reset`, `--sync=rebase`, `--sync=auto`)
+  + support multiple branches, with commits merged from `origin/master`
+
+* `aur-pkglist`
+  + output is now independent of command-line argument order
+  + deprecate `-I`, `-S`, `-u`
+    - renamed to: `-i` (`--info`), `-s` (`--search`) `-q` (`--quiet`)
+  + deprecate `-J` (`--json`)
+    - behaves like `--plain`, remove pretty-printing with `jq`
+  + add `--systime`
+
+* `aur-repo`
+  + `-q` now applies to `--list` and `--upgrades`
+  + add `--list-attr`
+  + deprecate `--status-file`
+
+* `aur-search`
+  + add `--color` (`auto`, `always`, `none`)
+
+* `aur-srcver`
+  + remove `-E`, `--env` (deprecated in v8)
+
+* `aur-sync`
+  + use pkgspec `<REPOSITORY>/<PACKAGE>` format for `--ignore-file`
+    - support for sections (introduced with v6.3) is removed (#880)
+    - <PACKAGE> ignores apply to all local repositories
+  + add `--rebase`, `--reset` options for `aur-fetch`
+  + exit 22 on dependency cycles (v7 regression)
+  + filter dependency graph by pkgname, not depends (v7 regression)
+  + store `build.ninja` files in `$XDG_RUNTIME_DIR/aurutils`
+
+* `completions`
+  + major overhaul of zsh completions (#990)
+
 ## 9.6
 
 * `aur-pkglist`