upgpkg: python-validity 0.14-1

upstream release

3 files changed, 8 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68dd37651fd1..e7484ee84e23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-validity
 	pkgdesc = Validity fingerprint sensor driver
-	pkgver = 0.12
-	pkgrel = 5
+	pkgver = 0.14
+	pkgrel = 1
 	url = https://github.com/uunicorn/python-validity
 	arch = any
 	license = MIT
@@ -17,9 +17,7 @@ pkgbase = python-validity
 	depends = fprintd-clients
 	provides = python-validity
 	conflicts = python-validity
-	source = https://github.com/uunicorn/python-validity/archive/0.12.tar.gz
-	source = 0001-update-dbus-loader-Remove-Loader-from-safe_load.patch
-	md5sums = 1e7cb6079b95541dd2dd898c868ec107
-	md5sums = ff4cb9a27f8bc75e8a2afbc6fc897c7f
+	source = python-validity-0.14.tar.gz::https://github.com/uunicorn/python-validity/archive/0.14.tar.gz
+	md5sums = 3fe3078341979ab82cdeb2b7a38f180a
 
 pkgname = python-validity
diff --git a/0001-update-dbus-loader-Remove-Loader-from-safe_load.patch b/0001-update-dbus-loader-Remove-Loader-from-safe_load.patch
deleted file mode 100644
index 13de1c6adac5..000000000000
--- a/0001-update-dbus-loader-Remove-Loader-from-safe_load.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8d4a69979cd531f920c9073855fbcb0ca5b81bf1 Mon Sep 17 00:00:00 2001
-From: Takeshi HAMASAKI <hmatrjp@users.sourceforge.jp>
-Date: Sat, 14 Aug 2021 08:36:06 +0900
-Subject: [PATCH] update dbus-loader: Remove Loader from safe_load()
-
-As I commented on the commit c0bf88e, https://github.com/uunicorn/python-validity/commit/c0bf88ea050c446dc12d81a0de8d30a4f81cc797
-python3-validity.service does not start, at least on Debian buster, since
-safe_load() does not have arg Loader on its prototype.
-Removing Loader here,
-config = yaml.safe_load(configfd)
-makes it back to normal starting.
----
- dbus_service/dbus-service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbus_service/dbus-service b/dbus_service/dbus-service
-index 7a1a1bc..8655547 100755
---- a/dbus_service/dbus-service
-+++ b/dbus_service/dbus-service
-@@ -242,7 +242,7 @@ def main():
-     # Load and perform basic validation of config file.
-     try:
-         with (args.configpath / 'dbus-service.yaml').open(mode='rt') as configfd:
--            config = yaml.load(configfd)
-+            config = yaml.safe_load(configfd)
-     except FileNotFoundError:
-         # No configuration file. Create default
-         config = {'user_to_sid': {}}
--- 
-2.35.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 3c34bbd15ce0..7ae2f5096829 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: j.r <j.r@jugendhacker.de>
 # Contributor: Matthew Murray <matt@mattmurr.xyz>
 pkgname=python-validity
-pkgver=0.12
-pkgrel=5
+pkgver=0.14
+pkgrel=1
 pkgdesc="Validity fingerprint sensor driver"
 arch=(any)
 license=(MIT)
@@ -12,15 +12,8 @@ makedepends=(python-setuptools)
 conflicts=($pkgname)
 provides=($pkgname)
 url="https://github.com/uunicorn/${pkgname}"
-source=("${url}/archive/${pkgver}.tar.gz"
-        "0001-update-dbus-loader-Remove-Loader-from-safe_load.patch")
-md5sums=('1e7cb6079b95541dd2dd898c868ec107'
-         'ff4cb9a27f8bc75e8a2afbc6fc897c7f')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 -i "$srcdir/0001-update-dbus-loader-Remove-Loader-from-safe_load.patch"
-}
+source=("$pkgname-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz")
+md5sums=('3fe3078341979ab82cdeb2b7a38f180a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver