diff --git a/archlinux/howdy/.SRCINFO b/archlinux/howdy/.SRCINFO index b1a0539..cf7022d 100644 --- a/archlinux/howdy/.SRCINFO +++ b/archlinux/howdy/.SRCINFO @@ -1,29 +1,24 @@ 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 = python2-sphinx makedepends = cmake makedepends = pkgfile depends = opencv 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.0.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 - sha256sums = 5bac0f32cff1358ee06d2d33a50c3cbbb5f06973747343193ce7d9926c53de23 + sha256sums = f3f48599f78fd82b049539fcfc34de25c9435cad732697bdda94e85352964794 sha256sums = abb1f61041e434465855ce81c2bd546e830d28bcbed8d27ffbe5bb408b11553a sha256sums = db9e9e40f092c118d5eb3e643935b216838170793559515541c56a2b50d9fc84 sha256sums = 6e787bbebf5c9efdb793f6cd1f023230c4413306605f24f299f12869f95aa472 diff --git a/archlinux/howdy/PKGBUILD b/archlinux/howdy/PKGBUILD index eb4a141..1740ccb 100644 --- a/archlinux/howdy/PKGBUILD +++ b/archlinux/howdy/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Kelley McChesney pkgname=howdy -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="Windows Hello for Linux" arch=('x86_64') @@ -15,26 +15,21 @@ depends=( 'hdf5' 'pam-python' 'python3' - 'python-pillow' 'python-dlib' - 'python-face_recognition' - 'python-face_recognition_models' - 'python-click' 'python-numpy' ) makedepends=( - 'python2-sphinx' 'cmake' 'pkgfile' ) 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" ) -sha256sums=('5bac0f32cff1358ee06d2d33a50c3cbbb5f06973747343193ce7d9926c53de23' +sha256sums=('f3f48599f78fd82b049539fcfc34de25c9435cad732697bdda94e85352964794' 'abb1f61041e434465855ce81c2bd546e830d28bcbed8d27ffbe5bb408b11553a' 'db9e9e40f092c118d5eb3e643935b216838170793559515541c56a2b50d9fc84' '6e787bbebf5c9efdb793f6cd1f023230c4413306605f24f299f12869f95aa472') diff --git a/archlinux/pam-python/.SRCINFO b/archlinux/pam-python/.SRCINFO index f29de0a..5c0ebb7 100644 --- a/archlinux/pam-python/.SRCINFO +++ b/archlinux/pam-python/.SRCINFO @@ -1,19 +1,16 @@ pkgbase = pam-python pkgdesc = Python for PAM - pkgver = 1.0.6 + pkgver = 1.0.8 pkgrel = 1 url = https://github.com/boltgolt/howdy arch = x86_64 license = MIT - makedepends = python2-sphinx + makedepends = python-sphinx makedepends = cmake + depends = pam 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.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 943b4cc..1d2dbd8 100644 --- a/archlinux/pam-python/PKGBUILD +++ b/archlinux/pam-python/PKGBUILD @@ -1,41 +1,41 @@ # Maintainer: boltgolt # Maintainer: Kelley McChesney pkgname=pam-python -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Python for PAM" arch=('x86_64') url="https://github.com/boltgolt/howdy" license=('MIT') depends=( + 'pam' 'python2' ) makedepends=( - 'python2-sphinx' + 'python-sphinx' '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 -i'' 's|sphinx-build|sphinx-build2|g' doc/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" } diff --git a/src/config.ini b/src/config.ini index a4f69c8..2179fd1 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 diff --git a/src/pam.py b/src/pam.py index e843cd8..5dd3c5d 100644 --- a/src/pam.py +++ b/src/pam.py @@ -60,7 +60,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