From ac3e7eaa4021aa47623f08e5353dd9c2c3e8ba2f Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Thu, 10 Oct 2024 22:54:02 +0200
Subject: [PATCH] * update libpwquality to 1.4.5-5.1

---
 libpwquality/.SRCINFO        | 22 ++++++++++++++++++++++
 libpwquality/.nvchecker.toml |  4 ++++
 libpwquality/PKGBUILD        | 36 ++++++++++++++++++++++--------------
 3 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 libpwquality/.SRCINFO
 create mode 100644 libpwquality/.nvchecker.toml

diff --git a/libpwquality/.SRCINFO b/libpwquality/.SRCINFO
new file mode 100644
index 0000000000..3f594a9654
--- /dev/null
+++ b/libpwquality/.SRCINFO
@@ -0,0 +1,22 @@
+pkgbase = libpwquality
+	pkgdesc = Library for password quality checking and generating random passwords
+	pkgver = 1.4.5
+	pkgrel = 5
+	url = https://github.com/libpwquality/libpwquality
+	arch = x86_64
+	arch = powerpc64le
+	arch = powerpc64
+	arch = powerpc
+	arch = riscv64
+	license = BSD-3-Clause OR GPL-2.0-or-later
+	makedepends = git
+	makedepends = python-setuptools
+	depends = cracklib
+	depends = glibc
+	depends = pam
+	optdepends = python: Python bindings
+	backup = etc/security/pwquality.conf
+	source = git+https://github.com/libpwquality/libpwquality.git#tag=libpwquality-1.4.5
+	b2sums = 640d13a93fd577ddd1396e3839f8fef85dbdcfb8f77af1f9817109ae03849e273c97b578de5c210491eb7e2292367e6bc64615315d09bb70c2bc848041f3c9a7
+
+pkgname = libpwquality
diff --git a/libpwquality/.nvchecker.toml b/libpwquality/.nvchecker.toml
new file mode 100644
index 0000000000..c7604ef21b
--- /dev/null
+++ b/libpwquality/.nvchecker.toml
@@ -0,0 +1,4 @@
+[libpwquality]
+source = "git"
+git = "https://github.com/libpwquality/libpwquality.git"
+prefix = "libpwquality-"
diff --git a/libpwquality/PKGBUILD b/libpwquality/PKGBUILD
index 1d079cd067..d32e2678f3 100644
--- a/libpwquality/PKGBUILD
+++ b/libpwquality/PKGBUILD
@@ -4,40 +4,48 @@
 
 pkgname=libpwquality
 pkgver=1.4.5
-pkgrel=5
+pkgrel=5.1
 pkgdesc='Library for password quality checking and generating random passwords'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://github.com/libpwquality/libpwquality'
 license=('BSD-3-Clause OR GPL-2.0-or-later')
-depends=('cracklib' 'glibc' 'pam')
+depends=(
+  cracklib
+  glibc
+  pam
+)
 optdepends=('python: Python bindings')
-makedepends=('python-setuptools')
-backup=('etc/security/pwquality.conf')
-source=("https://github.com/libpwquality/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
-        'libpwquality-setuptools.patch')
-sha256sums=('6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988'
-            'ca488234cca2e7883e987163dfb44a1eda1946ac05895afc7b79d19fc2c7a156')
+makedepends=(
+  git
+  python-setuptools
+)
+backup=(etc/security/pwquality.conf)
+source=("git+https://github.com/libpwquality/libpwquality.git#tag=$pkgname-$pkgver")
+b2sums=(640d13a93fd577ddd1396e3839f8fef85dbdcfb8f77af1f9817109ae03849e273c97b578de5c210491eb7e2292367e6bc64615315d09bb70c2bc848041f3c9a7)
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   # Use setuptools instead of distutils
   # https://github.com/libpwquality/libpwquality/pull/74
-  patch -Np1 -i ../libpwquality-setuptools.patch
+  git cherry-pick -n 7b5e0f0097faebdcc6a8b783237bbba7a983147a
 
   autoreconf -fi
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  cd $pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
   install -dm755 "$pkgdir"/etc/security/pwquality.conf.d
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" COPYING
 }