From 09ef2ecbf93b1043be8ab05aa4452ba602649b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20G=C3=B3rczewski?= <rafalgorczewski@gmail.com>
Date: Thu, 5 Nov 2020 04:55:14 +0100
Subject: [PATCH 1/7] python2-sphinx replaced with python-sphinx

---
 archlinux/howdy/.SRCINFO      | 2 +-
 archlinux/howdy/PKGBUILD      | 2 +-
 archlinux/pam-python/.SRCINFO | 2 +-
 archlinux/pam-python/PKGBUILD | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archlinux/howdy/.SRCINFO b/archlinux/howdy/.SRCINFO
index b1a0539..5bf1e5a 100644
--- a/archlinux/howdy/.SRCINFO
+++ b/archlinux/howdy/.SRCINFO
@@ -5,7 +5,7 @@ pkgbase = howdy
 	url = https://github.com/boltgolt/howdy
 	arch = x86_64
 	license = MIT
-	makedepends = python2-sphinx
+	makedepends = python-sphinx
 	makedepends = cmake
 	makedepends = pkgfile
 	depends = opencv
diff --git a/archlinux/howdy/PKGBUILD b/archlinux/howdy/PKGBUILD
index eb4a141..5820eef 100644
--- a/archlinux/howdy/PKGBUILD
+++ b/archlinux/howdy/PKGBUILD
@@ -23,7 +23,7 @@ depends=(
 	'python-numpy'
 )
 makedepends=(
-	'python2-sphinx'
+	'python-sphinx'
 	'cmake'
 	'pkgfile'
 )
diff --git a/archlinux/pam-python/.SRCINFO b/archlinux/pam-python/.SRCINFO
index f29de0a..0cf89dd 100644
--- a/archlinux/pam-python/.SRCINFO
+++ b/archlinux/pam-python/.SRCINFO
@@ -5,7 +5,7 @@ pkgbase = pam-python
 	url = https://github.com/boltgolt/howdy
 	arch = x86_64
 	license = MIT
-	makedepends = python2-sphinx
+	makedepends = python-sphinx
 	makedepends = cmake
 	depends = python2
 	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.6-1/pam-python-1.0.6.tar.gz
diff --git a/archlinux/pam-python/PKGBUILD b/archlinux/pam-python/PKGBUILD
index 943b4cc..429fe8b 100644
--- a/archlinux/pam-python/PKGBUILD
+++ b/archlinux/pam-python/PKGBUILD
@@ -11,7 +11,7 @@ depends=(
   'python2'
 )
 makedepends=(
-  'python2-sphinx'
+  'python-sphinx'
   'cmake'
 )
 source=(
@@ -25,7 +25,7 @@ prepare() {
   sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/setup.py
   sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/test.py
   sed -i'' 's|LIBDIR ?= /lib/security|LIBDIR ?= /usr/lib/security|g' src/Makefile
-  sed -i'' 's|sphinx-build|sphinx-build2|g' doc/Makefile
+  sed -i'' 's|sphinx-build|sphinx-build|g' doc/Makefile
 }
 
 build() {

From c80d2d459395a212676fbed1b4e2155870f367db Mon Sep 17 00:00:00 2001
From: Franklyn Tackitt <franklyn@tackitt.net>
Date: Thu, 3 Dec 2020 07:54:01 -0700
Subject: [PATCH 2/7] Bump AUR to 2.6.1

---
 archlinux/howdy/.SRCINFO      |  7 +++----
 archlinux/howdy/PKGBUILD      |  5 ++---
 archlinux/pam-python/.SRCINFO | 10 +++-------
 archlinux/pam-python/PKGBUILD |  3 ++-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/archlinux/howdy/.SRCINFO b/archlinux/howdy/.SRCINFO
index 5bf1e5a..f091ff2 100644
--- a/archlinux/howdy/.SRCINFO
+++ b/archlinux/howdy/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = howdy
 	pkgdesc = Windows Hello for Linux
-	pkgver = 2.6.0
+	pkgver = 2.6.1
 	pkgrel = 1
 	url = https://github.com/boltgolt/howdy
 	arch = x86_64
 	license = MIT
-	makedepends = python-sphinx
 	makedepends = cmake
 	makedepends = pkgfile
 	depends = opencv
@@ -19,11 +18,11 @@ pkgbase = howdy
 	depends = python-click
 	depends = python-numpy
 	backup = usr/lib/security/howdy/config.ini
-	source = https://github.com/boltgolt/howdy/archive/v2.6.0.tar.gz
+	source = https://github.com/boltgolt/howdy/archive/v2.6.1.tar.gz
 	source = https://github.com/davisking/dlib-models/raw/master/dlib_face_recognition_resnet_model_v1.dat.bz2
 	source = https://github.com/davisking/dlib-models/raw/master/mmod_human_face_detector.dat.bz2
 	source = https://github.com/davisking/dlib-models/raw/master/shape_predictor_5_face_landmarks.dat.bz2
-	sha256sums = 5bac0f32cff1358ee06d2d33a50c3cbbb5f06973747343193ce7d9926c53de23
+	sha256sums = f3f48599f78fd82b049539fcfc34de25c9435cad732697bdda94e85352964794
 	sha256sums = abb1f61041e434465855ce81c2bd546e830d28bcbed8d27ffbe5bb408b11553a
 	sha256sums = db9e9e40f092c118d5eb3e643935b216838170793559515541c56a2b50d9fc84
 	sha256sums = 6e787bbebf5c9efdb793f6cd1f023230c4413306605f24f299f12869f95aa472
diff --git a/archlinux/howdy/PKGBUILD b/archlinux/howdy/PKGBUILD
index 5820eef..00f7cc2 100644
--- a/archlinux/howdy/PKGBUILD
+++ b/archlinux/howdy/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Kelley McChesney <kelley@kelleymcchesney.us>
 
 pkgname=howdy
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="Windows Hello for Linux"
 arch=('x86_64')
@@ -23,7 +23,6 @@ depends=(
 	'python-numpy'
 )
 makedepends=(
-	'python-sphinx'
 	'cmake'
 	'pkgfile'
 )
@@ -34,7 +33,7 @@ source=(
 	"https://github.com/davisking/dlib-models/raw/master/mmod_human_face_detector.dat.bz2"
 	"https://github.com/davisking/dlib-models/raw/master/shape_predictor_5_face_landmarks.dat.bz2"
 )
-sha256sums=('5bac0f32cff1358ee06d2d33a50c3cbbb5f06973747343193ce7d9926c53de23'
+sha256sums=('f3f48599f78fd82b049539fcfc34de25c9435cad732697bdda94e85352964794'
             'abb1f61041e434465855ce81c2bd546e830d28bcbed8d27ffbe5bb408b11553a'
             'db9e9e40f092c118d5eb3e643935b216838170793559515541c56a2b50d9fc84'
             '6e787bbebf5c9efdb793f6cd1f023230c4413306605f24f299f12869f95aa472')
diff --git a/archlinux/pam-python/.SRCINFO b/archlinux/pam-python/.SRCINFO
index 0cf89dd..268fe1e 100644
--- a/archlinux/pam-python/.SRCINFO
+++ b/archlinux/pam-python/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pam-python
 	pkgdesc = Python for PAM
-	pkgver = 1.0.6
+	pkgver = 1.0.7
 	pkgrel = 1
 	url = https://github.com/boltgolt/howdy
 	arch = x86_64
@@ -8,12 +8,8 @@ pkgbase = pam-python
 	makedepends = python-sphinx
 	makedepends = cmake
 	depends = python2
-	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.6-1/pam-python-1.0.6.tar.gz
-	source = https://sourceforge.net/p/pam-python/tickets/_discuss/thread/5dc8cfd5/5839/attachment/pam-python-1.0.6-fedora.patch
-	source = https://sourceforge.net/p/pam-python/tickets/_discuss/thread/5dc8cfd5/5839/attachment/pam-python-1.0.6-gcc8.patch
-	sha256sums = 0ef4dda35da14088afb1640266415730a6e0274bea934917beb5aca90318f853
-	sha256sums = acb9d1b5cf7cad73d5524334b7954431bb9b90f960980378c538907e468c34b5
-	sha256sums = 02dd9a4d8ec921ff9a2408183f290f08102e3f9e0151786ae7220a4d550bfe24
+	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.7-1/pam-python-1.0.7.tar.gz
+	sha256sums = 96ce72fe355b03b87c0eb540ecef06f33738f98f56581e81eb5bffbad1a47e07
 
 pkgname = pam-python
 
diff --git a/archlinux/pam-python/PKGBUILD b/archlinux/pam-python/PKGBUILD
index 429fe8b..35f5011 100644
--- a/archlinux/pam-python/PKGBUILD
+++ b/archlinux/pam-python/PKGBUILD
@@ -25,7 +25,7 @@ prepare() {
   sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/setup.py
   sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/test.py
   sed -i'' 's|LIBDIR ?= /lib/security|LIBDIR ?= /usr/lib/security|g' src/Makefile
-  sed -i'' 's|sphinx-build|sphinx-build|g' doc/Makefile
+  sed -n '/^License/,/^--$/p' README.txt | grep -v -e '^License' -e '^-\+' > $srcdir/LICENSE
 }
 
 build() {
@@ -38,4 +38,5 @@ package() {
   # Installing pam-python
   cd "$srcdir/pam-python-$pkgver"
   PREFIX=/usr make DESTDIR="$pkgdir/" install
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

From 608b6d0f2c62f8718a8ad2ef4cc5c7b5e19bf134 Mon Sep 17 00:00:00 2001
From: Franklyn Tackitt <franklyn@tackitt.net>
Date: Thu, 3 Dec 2020 09:13:18 -0700
Subject: [PATCH 3/7] Add pam to pam-python dependencies

---
 archlinux/pam-python/.SRCINFO | 1 +
 archlinux/pam-python/PKGBUILD | 1 +
 2 files changed, 2 insertions(+)

diff --git a/archlinux/pam-python/.SRCINFO b/archlinux/pam-python/.SRCINFO
index 268fe1e..9ef98e7 100644
--- a/archlinux/pam-python/.SRCINFO
+++ b/archlinux/pam-python/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = pam-python
 	license = MIT
 	makedepends = python-sphinx
 	makedepends = cmake
+	depends = pam
 	depends = python2
 	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.7-1/pam-python-1.0.7.tar.gz
 	sha256sums = 96ce72fe355b03b87c0eb540ecef06f33738f98f56581e81eb5bffbad1a47e07
diff --git a/archlinux/pam-python/PKGBUILD b/archlinux/pam-python/PKGBUILD
index 35f5011..79c79f1 100644
--- a/archlinux/pam-python/PKGBUILD
+++ b/archlinux/pam-python/PKGBUILD
@@ -8,6 +8,7 @@ arch=('x86_64')
 url="https://github.com/boltgolt/howdy"
 license=('MIT')
 depends=(
+  'pam'
   'python2'
 )
 makedepends=(

From ecdd977e5a3f37831022ecf3c1f3fa651c3406cf Mon Sep 17 00:00:00 2001
From: Jellyfrog <Jellyfrog@users.noreply.github.com>
Date: Sat, 2 Jan 2021 23:19:29 +0100
Subject: [PATCH 4/7] Remove unneeded dependencies from Arch Linux

---
 archlinux/howdy/.SRCINFO | 6 +-----
 archlinux/howdy/PKGBUILD | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/archlinux/howdy/.SRCINFO b/archlinux/howdy/.SRCINFO
index f091ff2..cf7022d 100644
--- a/archlinux/howdy/.SRCINFO
+++ b/archlinux/howdy/.SRCINFO
@@ -11,14 +11,10 @@ pkgbase = howdy
 	depends = hdf5
 	depends = pam-python
 	depends = python3
-	depends = python-pillow
 	depends = python-dlib
-	depends = python-face_recognition
-	depends = python-face_recognition_models
-	depends = python-click
 	depends = python-numpy
 	backup = usr/lib/security/howdy/config.ini
-	source = https://github.com/boltgolt/howdy/archive/v2.6.1.tar.gz
+	source = howdy-2.6.1.tar.gz::https://github.com/boltgolt/howdy/archive/v2.6.1.tar.gz
 	source = https://github.com/davisking/dlib-models/raw/master/dlib_face_recognition_resnet_model_v1.dat.bz2
 	source = https://github.com/davisking/dlib-models/raw/master/mmod_human_face_detector.dat.bz2
 	source = https://github.com/davisking/dlib-models/raw/master/shape_predictor_5_face_landmarks.dat.bz2
diff --git a/archlinux/howdy/PKGBUILD b/archlinux/howdy/PKGBUILD
index 00f7cc2..1740ccb 100644
--- a/archlinux/howdy/PKGBUILD
+++ b/archlinux/howdy/PKGBUILD
@@ -15,11 +15,7 @@ depends=(
 	'hdf5'
 	'pam-python'
 	'python3'
-	'python-pillow'
 	'python-dlib'
-	'python-face_recognition'
-	'python-face_recognition_models'
-	'python-click'
 	'python-numpy'
 )
 makedepends=(
@@ -28,7 +24,7 @@ makedepends=(
 )
 backup=('usr/lib/security/howdy/config.ini')
 source=(
-	"https://github.com/boltgolt/howdy/archive/v${pkgver}.tar.gz"
+	"$pkgname-$pkgver.tar.gz::https://github.com/boltgolt/howdy/archive/v${pkgver}.tar.gz"
 	"https://github.com/davisking/dlib-models/raw/master/dlib_face_recognition_resnet_model_v1.dat.bz2"
 	"https://github.com/davisking/dlib-models/raw/master/mmod_human_face_detector.dat.bz2"
 	"https://github.com/davisking/dlib-models/raw/master/shape_predictor_5_face_landmarks.dat.bz2"

From 66e9de8b1113797cabbc3712875cb886ce6a6fa1 Mon Sep 17 00:00:00 2001
From: Jellyfrog <Jellyfrog@users.noreply.github.com>
Date: Sun, 3 Jan 2021 01:25:25 +0100
Subject: [PATCH 5/7] Update pam-python to 1.0.8

---
 archlinux/pam-python/.SRCINFO |  6 +++---
 archlinux/pam-python/PKGBUILD | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/archlinux/pam-python/.SRCINFO b/archlinux/pam-python/.SRCINFO
index 9ef98e7..5c0ebb7 100644
--- a/archlinux/pam-python/.SRCINFO
+++ b/archlinux/pam-python/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pam-python
 	pkgdesc = Python for PAM
-	pkgver = 1.0.7
+	pkgver = 1.0.8
 	pkgrel = 1
 	url = https://github.com/boltgolt/howdy
 	arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = pam-python
 	makedepends = cmake
 	depends = pam
 	depends = python2
-	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.7-1/pam-python-1.0.7.tar.gz
-	sha256sums = 96ce72fe355b03b87c0eb540ecef06f33738f98f56581e81eb5bffbad1a47e07
+	source = https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.8-1/pam-python-1.0.8.tar.gz
+	sha256sums = fc69d7717db0509111500a81053487fa7684e1be3b7d0ae2b51970b6fdc918f6
 
 pkgname = pam-python
 
diff --git a/archlinux/pam-python/PKGBUILD b/archlinux/pam-python/PKGBUILD
index 79c79f1..1d2dbd8 100644
--- a/archlinux/pam-python/PKGBUILD
+++ b/archlinux/pam-python/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: boltgolt <boltgolt@gmail.com>
 # Maintainer: Kelley McChesney <kelley@kelleymcchesney.us>
 pkgname=pam-python
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Python for PAM"
 arch=('x86_64')
@@ -16,28 +16,26 @@ makedepends=(
   'cmake'
 )
 source=(
-  "https://downloads.sourceforge.net/project/pam-python/pam-python-1.0.7-1/pam-python-1.0.7.tar.gz"
+  "https://downloads.sourceforge.net/project/${pkgname}/pam-python-${pkgver}-1/${pkgname}-${pkgver}.tar.gz"
 )
-sha256sums=('96ce72fe355b03b87c0eb540ecef06f33738f98f56581e81eb5bffbad1a47e07')
+sha256sums=('fc69d7717db0509111500a81053487fa7684e1be3b7d0ae2b51970b6fdc918f6')
 
 prepare() {
   # Preparing pam-python to be installed
-  cd "$srcdir/pam-python-$pkgver"
-  sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/setup.py
-  sed -i'' 's|#!/usr/bin/python -W default|#!/usr/bin/python2 -W default|g' src/test.py
+  cd "$srcdir/$pkgname-$pkgver"
   sed -i'' 's|LIBDIR ?= /lib/security|LIBDIR ?= /usr/lib/security|g' src/Makefile
   sed -n '/^License/,/^--$/p' README.txt | grep -v -e '^License' -e '^-\+' > $srcdir/LICENSE
 }
 
 build() {
   # Building pam-python
-  cd "$srcdir/pam-python-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   PREFIX=/usr make
 }
 
 package() {
   # Installing pam-python
-  cd "$srcdir/pam-python-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   PREFIX=/usr make DESTDIR="$pkgdir/" install
   install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

From e4ecd242f8053dfb7430ae462aa58dc2d5e4c9f8 Mon Sep 17 00:00:00 2001
From: Nick Clark <64603152+nickrbclark@users.noreply.github.com>
Date: Wed, 10 Feb 2021 09:12:15 -0500
Subject: [PATCH 6/7] Update config.ini to include timeout_notice config option

Defaults to true to maintain current default behavior.
---
 src/config.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/config.ini b/src/config.ini
index 4b694bf..8f9f33b 100644
--- a/src/config.ini
+++ b/src/config.ini
@@ -5,6 +5,9 @@
 # Print that face detection is being attempted
 detection_notice = false
 
+# Print that face detection has timed out
+timeout_notice = true
+
 # Do not print anything when a face verification succeeds
 no_confirmation = false
 

From 7a701c40084824dd336acd199b066fb7e892fac6 Mon Sep 17 00:00:00 2001
From: Nick Clark <64603152+nickrbclark@users.noreply.github.com>
Date: Wed, 10 Feb 2021 09:13:57 -0500
Subject: [PATCH 7/7] Update pam.py to respect timeout_notice config option

---
 src/pam.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pam.py b/src/pam.py
index 08cccef..b695915 100644
--- a/src/pam.py
+++ b/src/pam.py
@@ -54,7 +54,8 @@ def doAuth(pamh):
 
 	# Status 11 means we exceded the maximum retry count
 	elif status == 11:
-		pamh.conversation(pamh.Message(pamh.PAM_ERROR_MSG, "Face detection timeout reached"))
+		if config.getboolean("core", "timeout_notice"):
+			pamh.conversation(pamh.Message(pamh.PAM_ERROR_MSG, "Face detection timeout reached"))
 		syslog.syslog(syslog.LOG_INFO, "Failure, timeout reached")
 		syslog.closelog()
 		return pamh.PAM_AUTH_ERR