From d740276e7bfd8f1a82b9725848957afc06d457c7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 18 Sep 2022 13:06:37 +0200
Subject: [PATCH] git subrepo pull bluez-utils-compat

subrepo:
  subdir:   "bluez-utils-compat"
  merged:   "c97cb10"
upstream:
  origin:   "https://aur.archlinux.org/bluez-utils-compat"
  branch:   "master"
  commit:   "c97cb10"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
---
 bluez-utils-compat/.SRCINFO | 11 ++++++-----
 bluez-utils-compat/.gitrepo |  4 ++--
 bluez-utils-compat/PKGBUILD | 13 +++++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bluez-utils-compat/.SRCINFO b/bluez-utils-compat/.SRCINFO
index d2fafe0..b09eb98 100644
--- a/bluez-utils-compat/.SRCINFO
+++ b/bluez-utils-compat/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bluez-utils-compat
 	pkgdesc = Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools.
-	pkgver = 5.56
+	pkgver = 5.65
 	pkgrel = 1
 	url = http://www.bluez.org/
 	arch = i686
@@ -17,18 +17,19 @@ pkgbase = bluez-utils-compat
 	makedepends = alsa-lib
 	makedepends = json-c
 	makedepends = ell
+	makedepends = python-docutils
 	depends = dbus
 	depends = systemd
 	depends = glib2
 	optdepends = ell: for btpclient
 	provides = bluez-hcidump
-	provides = bluez-utils=5.56
+	provides = bluez-utils=5.65
 	provides = bluez-hcitool
 	conflicts = bluez-hcidump
 	conflicts = bluez-utils
 	conflicts = bluez-hcitool
-	source = https://www.kernel.org/pub/linux/bluetooth/bluez-5.56.tar.xz
-	sha256sums = 59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d
+	backup = etc/bluetooth/mesh-main.conf
+	source = https://www.kernel.org/pub/linux/bluetooth/bluez-5.65.tar.xz
+	sha256sums = 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4
 
 pkgname = bluez-utils-compat
-
diff --git a/bluez-utils-compat/.gitrepo b/bluez-utils-compat/.gitrepo
index 1b92ff4..bce325e 100644
--- a/bluez-utils-compat/.gitrepo
+++ b/bluez-utils-compat/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/bluez-utils-compat
 	branch = master
-	commit = ce18b1175861ea8c02057739a2608ff751dbf8b6
-	parent = ac4cf800e846b06a3e8f78081ea373296f64db00
+	commit = c97cb104eaccc6c34a6e41ef323fb82c53efd240
+	parent = 0c29097b242ba2347b53bf11421e6602bae89f23
 	method = merge
 	cmdver = 0.4.3
diff --git a/bluez-utils-compat/PKGBUILD b/bluez-utils-compat/PKGBUILD
index c223922..403ec2e 100644
--- a/bluez-utils-compat/PKGBUILD
+++ b/bluez-utils-compat/PKGBUILD
@@ -6,20 +6,21 @@
 
 pkgname='bluez-utils-compat'
 _pkgbase='bluez'
-pkgver=5.56
+pkgver=5.65
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64')
 license=('GPL2')
 pkgdesc="Development and debugging utilities for the bluetooth protocol stack. Includes deprecated tools."
 depends=('dbus' 'systemd' 'glib2')
-makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell')
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell' 'python-docutils')
 optdepends=('ell: for btpclient')
 conflicts=('bluez-hcidump' 'bluez-utils' 'bluez-hcitool')
 provides=('bluez-hcidump' "bluez-utils=${pkgver}" 'bluez-hcitool')
-source=(https://www.kernel.org/pub/linux/bluetooth/"${_pkgbase}-${pkgver}".tar.xz) #{xz,sign}
+backup=('etc/bluetooth/mesh-main.conf')
+source=(https://www.kernel.org/pub/linux/bluetooth/"${_pkgbase}-${pkgver}".tar.xz) #{xz,sign})
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d')
+sha256sums=('2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4')
 #validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org>
 
 build() {
@@ -64,6 +65,10 @@ package() {
   done
 
   rm -rf "${pkgdir}"/usr/lib
+
+  # ship upstream mesh config file
+  install -dm755 "${pkgdir}"/etc/bluetooth
+  install -Dm644 "${srcdir}/${_pkgbase}-${pkgver}"/mesh/mesh-main.conf "${pkgdir}"/etc/bluetooth/mesh-main.conf
   
   # move the hid2hci man page out
   rm "${pkgdir}"/usr/share/man/man1/hid2hci.1