From 8058fa47785727cf2ccda375a5bd01677d615ec1 Mon Sep 17 00:00:00 2001
From: Xiao Pan <xyz@flylightning.xyz>
Date: Fri, 21 Mar 2025 23:43:53 -0700
Subject: use patch instead

---
 .../0001-Fix-HOTP-counter-increases.patch          | 25 ++++++++++++++
 any/pass-otp-git/PKGBUILD                          | 39 ++++++++++++++++++++++
 any/pass-otp_fix-hotp-counter-git/PKGBUILD         | 30 -----------------
 3 files changed, 64 insertions(+), 30 deletions(-)
 create mode 100644 any/pass-otp-git/0001-Fix-HOTP-counter-increases.patch
 create mode 100644 any/pass-otp-git/PKGBUILD
 delete mode 100644 any/pass-otp_fix-hotp-counter-git/PKGBUILD

diff --git a/any/pass-otp-git/0001-Fix-HOTP-counter-increases.patch b/any/pass-otp-git/0001-Fix-HOTP-counter-increases.patch
new file mode 100644
index 0000000..897492d
--- /dev/null
+++ b/any/pass-otp-git/0001-Fix-HOTP-counter-increases.patch
@@ -0,0 +1,25 @@
+From 0447ae4fa84def63d6ce97c251ea3fa5af0dcc07 Mon Sep 17 00:00:00 2001
+From: Juan Orti Alcaine <jortialc@redhat.com>
+Date: Sat, 5 Nov 2022 07:45:25 +0100
+Subject: [PATCH] Fix HOTP counter increases
+
+---
+ otp.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/otp.bash b/otp.bash
+index a0688d2..a58a96c 100755
+--- a/otp.bash
++++ b/otp.bash
+@@ -370,7 +370,7 @@ cmd_otp_code() {
+ 
+   if [[ "$otp_type" == "hotp" ]]; then
+     # Increment HOTP counter in-place
+-    local line replaced uri=${otp_uri/&counter=$otp_counter/&counter=$counter}
++    local line replaced uri=${otp_uri/&counter=$otp_counter/"&counter=$counter"}
+     while IFS= read -r line; do
+       [[ "$line" == otpauth://* ]] && line="$uri"
+       [[ -n "$replaced" ]] && replaced+=$'\n'
+-- 
+2.49.0
+
diff --git a/any/pass-otp-git/PKGBUILD b/any/pass-otp-git/PKGBUILD
new file mode 100644
index 0000000..6c25e52
--- /dev/null
+++ b/any/pass-otp-git/PKGBUILD
@@ -0,0 +1,39 @@
+# Contibutor: Morten Linderud <foxboron@archlinux.org>
+# Contibutor: Alexandre Pujol <alexandre@pujol.io>
+
+pkgname='pass-otp-git'
+_pkgname=pass-otp
+pkgver=r136.0447ae4
+pkgrel=2
+# https://github.com/tadfisher/pass-otp/pull/172
+pkgdesc='A pass extension for managing one-time-password (OTP) tokens. With hotp counter fix.'
+arch=('any')
+url='https://github.com/tadfisher/pass-otp'
+license=('GPL3')
+depends=('pass'
+        'oath-toolkit'
+        'qrencode')
+makedepends=('git')
+optdepends=('perl-pass-otp')
+provides=('pass-otp')
+conflicts=('pass-otp')
+# patch from https://github.com/tadfisher/pass-otp/pull/172
+source=("git+$url.git"
+        '0001-Fix-HOTP-counter-increases.patch')
+b2sums=('SKIP'
+        'fb97f0b8049bc8349f0dba20ce7b491b280a140aa1ad4f751aba7fb69a8b95986dda83c5ed698540d56ae47c829200bafd653cc4773bb502d095d2baf3861895')
+
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir/$_pkgname"
+  patch -p1 -i "$srcdir/0001-Fix-HOTP-counter-increases.patch"
+}
+
+package() {
+  cd "$srcdir/$_pkgname"
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+}
diff --git a/any/pass-otp_fix-hotp-counter-git/PKGBUILD b/any/pass-otp_fix-hotp-counter-git/PKGBUILD
deleted file mode 100644
index 0c2897c..0000000
--- a/any/pass-otp_fix-hotp-counter-git/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contibutor: Morten Linderud <foxboron@archlinux.org>
-# Contibutor: Alexandre Pujol <alexandre@pujol.io>
-
-pkgname='pass-otp_fix-hotp-counter-git'
-pkgver=r136.0447ae4
-pkgrel=2
-# https://github.com/tadfisher/pass-otp/pull/172
-pkgdesc='A pass extension for managing one-time-password (OTP) tokens. With hotp counter fix.'
-arch=('any')
-url='https://github.com/jorti/pass-otp'
-license=('GPL3')
-depends=('pass'
-        'oath-toolkit'
-        'qrencode')
-makedepends=('git')
-optdepends=('perl-pass-otp')
-provides=('pass-otp')
-conflicts=('pass-otp')
-source=("git+$url.git#branch=fix-hotp-counter")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/${pkgname%_fix-hotp-counter-git}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-package() {
-  cd "$srcdir/${pkgname%_fix-hotp-counter-git}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-- 
cgit v1.2.3-70-g09d2