[arch-commits] Commit in yubico-pam/repos/community-x86_64 (3 files)

[Christian Hesse]

    Date: Thursday, April 5, 2018 @ 18:36:15
  Author: eworm
Revision: 314455

archrelease: copy trunk to community-x86_64

Added:
  yubico-pam/repos/community-x86_64/0001-util-make-sure-to-close-the-authfile-before-returnin.patch
    (from rev 314454, yubico-pam/trunk/0001-util-make-sure-to-close-the-authfile-before-returnin.patch)
  yubico-pam/repos/community-x86_64/PKGBUILD
    (from rev 314454, yubico-pam/trunk/PKGBUILD)
Deleted:
  yubico-pam/repos/community-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-util-make-sure-to-close-the-authfile-before-returnin.patch |   26 ++
 PKGBUILD                                                        |   92 +++++-----
 2 files changed, 76 insertions(+), 42 deletions(-)

Copied: yubico-pam/repos/community-x86_64/0001-util-make-sure-to-close-the-authfile-before-returnin.patch (from rev 314454, yubico-pam/trunk/0001-util-make-sure-to-close-the-authfile-before-returnin.patch)
===================================================================
--- 0001-util-make-sure-to-close-the-authfile-before-returnin.patch	                        (rev 0)
+++ 0001-util-make-sure-to-close-the-authfile-before-returnin.patch	2018-04-05 18:36:15 UTC (rev 314455)
@@ -0,0 +1,26 @@
+From 0f6ceabab0a8849b47f67d727aa526c2656089ba Mon Sep 17 00:00:00 2001
+From: Klas Lindfors <klas at yubico.com>
+Date: Tue, 3 Apr 2018 09:19:53 +0200
+Subject: [PATCH 1/1] util: make sure to close the authfile before returning
+ success
+
+fixes #136
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ util.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util.c b/util.c
+index 6cb4a79..32bca06 100644
+--- a/util.c
++++ b/util.c
+@@ -167,6 +167,8 @@ check_user_token (const char *authfile,
+ 		{
+ 		  if(verbose)
+ 		      D (debug_file, "Match user/token as %s/%s", username, otp_id);
++
++		  fclose(opwfile);
+ 		  return AUTH_FOUND;
+ 		}
+ 	    }

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-05 18:36:06 UTC (rev 314454)
+++ PKGBUILD	2018-04-05 18:36:15 UTC (rev 314455)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <mail at eworm.de>
-
-pkgname=yubico-pam
-_shortname=pam_yubico
-pkgver=2.25
-pkgrel=1
-pkgdesc='Yubico YubiKey PAM module'
-arch=('x86_64')
-url='https://github.com/Yubico/yubico-pam'
-license=('BSD')
-depends=('pam' 'yubico-c-client' 'yubikey-personalization' 'json-c')
-checkdepends=('perl-net-ldap-server')
-provides=("${_shortname}")
-conflicts=("${_shortname}")
-validpgpkeys=('0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A') # Klas Lindfors <klas at yubico.com>
-source=("https://developers.yubico.com/${pkgname}/Releases/${_shortname}-${pkgver}.tar.gz"{,.sig})
-sha256sums=('624a5754d82665f6ba5f2e012f57cb41ea9bf61781ed2272dba49dffb4704e36'
-            'SKIP')
-
-build() {
-	cd "${_shortname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "${_shortname}-${pkgver}"
-
-	make check
-}
-
-package() {
-	cd "${_shortname}-${pkgver}"
-
-	install -D -m0644 COPYING "${pkgdir}/usr/share/licenses/yubico-pam/COPYING"
-	install -D -m0644 README "${pkgdir}/usr/share/doc/yubico-pam/README"
-	make DESTDIR="${pkgdir}/" install
-}
-

Copied: yubico-pam/repos/community-x86_64/PKGBUILD (from rev 314454, yubico-pam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-04-05 18:36:15 UTC (rev 314455)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+
+pkgname=yubico-pam
+_shortname=pam_yubico
+pkgver=2.25
+pkgrel=2
+pkgdesc='Yubico YubiKey PAM module'
+arch=('x86_64')
+url='https://github.com/Yubico/yubico-pam'
+license=('BSD')
+depends=('pam' 'yubico-c-client' 'yubikey-personalization' 'json-c')
+checkdepends=('perl-net-ldap-server')
+provides=("${_shortname}")
+conflicts=("${_shortname}")
+validpgpkeys=('0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A') # Klas Lindfors <klas at yubico.com>
+source=("https://developers.yubico.com/${pkgname}/Releases/${_shortname}-${pkgver}.tar.gz"{,.sig}
+        '0001-util-make-sure-to-close-the-authfile-before-returnin.patch')
+sha256sums=('624a5754d82665f6ba5f2e012f57cb41ea9bf61781ed2272dba49dffb4704e36'
+            'SKIP'
+            '1b044b779cb08d3a02fea7a62203b494fec621f74a47f27a085b06c22cbe8c88')
+
+prepare() {
+	cd "${_shortname}-${pkgver}"
+
+	patch -Np1 < "${srcdir}"/0001-util-make-sure-to-close-the-authfile-before-returnin.patch
+}
+
+build() {
+	cd "${_shortname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "${_shortname}-${pkgver}"
+
+	make check
+}
+
+package() {
+	cd "${_shortname}-${pkgver}"
+
+	install -D -m0644 COPYING "${pkgdir}/usr/share/licenses/yubico-pam/COPYING"
+	install -D -m0644 README "${pkgdir}/usr/share/doc/yubico-pam/README"
+	make DESTDIR="${pkgdir}/" install
+}
+