[pam_pkcs11] update to 0.6.8

Fri Feb 21 15:09:00 UTC 2014

commit 392246cd259ac15d3f291a378fcf611a2410223f
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Feb 21 07:09:46 2014 -0800

    update to 0.6.8

 .gitignore      |    1 +
 pam_pkcs11.spec |   68 +++++++++++++++++++++++++++---------------------------
 sources         |    2 +-
 3 files changed, 36 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b2707d1..b73455d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pam_pkcs11-0.6.2.tar.gz
+/pam_pkcs11-0.6.8-63451e9.tar.gz
diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec
index 0855fc6..c848640 100644
--- a/pam_pkcs11.spec
+++ b/pam_pkcs11.spec
@@ -3,21 +3,20 @@
 %global with_curl	1
 %global with_ldap	1
 
+# commit for 0.6.8
+%global commit 63451e9499aa32163337d4f6982ff6924cccd36e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           pam_pkcs11
-Version:        0.6.2
-Release:        11%{?dist}
+Version:        0.6.8
+Release:        1%{?dist}
 Summary:        PKCS #11/NSS PAM login module
-
 Group:          System Environment/Base
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/pam_pkcs11
-Source0: 	http://www.opensc-project.org/files/pam_pkcs11/%{name}-%{version}.tar.gz
+Source0: 	https://github.com/OpenSC/pam_pkcs11/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 Source1:	rh_pam_pkcs11.conf
 Source2:	rh_pkcs11_eventmgr.conf
-patch1:		pam_pkcs11-0.6.2-login_required.patch
-patch2:		pam_pkcs11-0.6.2-pcsc-lite.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
 %{?_with_ldap:BuildRequires: openldap-devel}
@@ -30,6 +29,7 @@ BuildRequires: pcsc-lite-devel
 BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
+BuildRequires: autoconf, automake, libtool
 Provides:       pam_pkcs11 = %{version}-%{release}
 
 %description
@@ -46,9 +46,8 @@ Additional included pam_pkcs11 related tools
 - pkcs11_inspect: Inspect the contents of a certificate
 
 %prep
-%setup -q -n pam_pkcs11-%{version}
-%patch1 -p1 -b .login-required
-%patch2 -p1 -b .pcsc-lite
+%setup -q -n %{name}-%{commit}
+autoreconf -ifv
 
 %build
 
@@ -68,7 +67,7 @@ Additional included pam_pkcs11 related tools
     --with-debug  \
     --disable-dependency-tracking  \
     %{curl_flags} %{ldap_flags} 
-make CFLAGS="$RPM_OPT_FLAGS -O0 -ggdb3" 
+make CFLAGS="$RPM_OPT_FLAGS -ggdb3" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,11 +102,7 @@ rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO ChangeLog NEWS 
 %doc doc/pam_pkcs11.html
 %doc doc/mappers_api.html
@@ -117,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
+%{_bindir}/pkcs11_make_hash_link
 %{_bindir}/pkcs11_eventmgr
 %{_bindir}/pklogin_finder
 %{_bindir}/pkcs11_inspect
@@ -135,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/card_eventmgr.1.gz
 
 %changelog
+* Fri Feb 21 2014 Tom Callaway <spot at fedoraproject.org> - 0.6.8-1
+- update to 0.6.8
+- cleanup spec file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -153,19 +153,19 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Mon May 2 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-5
+* Sun May 2 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-5
 - Sigh, ocsp should be off by default
 
-* Mon May 2 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-4
+* Sun May 2 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-4
 - update config file
 
 * Fri Mar 19 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-3
 - fix missing function
 
-* Wed Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-2
+* Tue Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-2
 - Pick up the latest pam_pkcs11 from upstream
 
-* Wed Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-1
+* Tue Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-1
 - Pick up the latest pam_pkcs11 from upstream
 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -182,13 +182,13 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.3-26
 - Autorebuild for GCC 4.3
 
-* Fri Aug 20 2007 Bob Relyea <rrelyea at redhat.com> - 0.5.3-25
+* Mon Aug 20 2007 Bob Relyea <rrelyea at redhat.com> - 0.5.3-25
 - Update License description to the new Fedora standard
 
 * Thu Mar 08 2007 Florian La Roche <laroche at redhat.com> - 0.5.3-24
 - remove empty rpm scripts
 
-* Sun Oct 13 2006 Jesse Keating <jkeating at redhat.com> - 0.5.3-23
+* Fri Oct 13 2006 Jesse Keating <jkeating at redhat.com> - 0.5.3-23
 - turn OCSP off by default
 
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 0.5.3-22
@@ -206,11 +206,11 @@ rm -rf $RPM_BUILD_ROOT
 - Use pam_syslog rather than syslog (patch by Tmraz).
 - Signal to the user that change password is not supported by pam_pkcs11.
 
-* Wed Sep 14 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-19
+* Thu Sep 14 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-19
 - Fix problem where pin was not being passed in the pam password variable
   correctly. Needed for Kerberos PKInit
 
-* Tue Sep 13 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-18
+* Wed Sep 13 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-18
 - define those apps that we shouldn't login initially with (screen-savers)
 
 * Tue Sep 12 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-17
@@ -222,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Sep 7 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-16
 - make sure we have l10n tools for the build itself
 
-* Mon Sep 1 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-15
+* Fri Sep 1 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-15
 - add l10n support
 - correct mapper order.
 - login should allow SSL Client Auth certs rather than restricting to Email
@@ -247,7 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Aug 21 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-11
 - Handle library paths in config file
 
-* Mon Aug 16 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
+* Wed Aug 16 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
 - remove sceventd
 
 * Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> 0.5.3-9
@@ -278,27 +278,27 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
 - added a simple pkcs11_setup tool
 
-* Thu Jul 18 2006 Robert Relyea  <rrelyea at redhat.com>
+* Tue Jul 18 2006 Robert Relyea  <rrelyea at redhat.com>
 - Fix memory error in card_only.
 - Use the TEXT_INFO field for smart card prompting
 
 * Mon Jul 17 2006 Jesse Keating  <jkeating at redhat.com>  0.5.3-4
 - rebuild
 
-* Thu Jun 10 2006 Robert Relyea  <rrelyea at redhat.com>  0.5.3-3
+* Sat Jun 10 2006 Robert Relyea  <rrelyea at redhat.com>  0.5.3-3
 - Updated to 0.5.3 with card_only and NSS support
 
-* Mon Apr 20 2006 Robert Relyea < rrelyea at redhat.com > 0:0.5.1.-2.exp
+* Thu Apr 20 2006 Robert Relyea < rrelyea at redhat.com > 0:0.5.1.-2.exp
 - Added screenlocking helper support
 
-* Mon Mar 30 2006 Robert Relyea < rrelyea at redhat.com > 0:0.5.1.-1.exp
+* Thu Mar 30 2006 Robert Relyea < rrelyea at redhat.com > 0:0.5.1.-1.exp
 - Added NSS support.
 
 * Mon Jan 30 2006 Robert Relyea < rrelyea at redhat.com > 0:0.5.1.-0.demo
 - include coolkey support
 - added card_only option.
 
-* Thu Sep 7 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.3-2
+* Wed Sep 7 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.3-2
 - Add ldap_mapper.so as separate package, as it depends on external library
 - Changes from FC4 team
 
@@ -306,7 +306,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 0.5.3
 - Remove tools package, and create pcsc one with pcsc-lite dependent files
 
-* Fri Apr 11 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.2-1
+* Mon Apr 11 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.2-1
 - Changed package name to pam_pkcs11
 
 * Fri Apr 8 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.2-0
@@ -318,17 +318,17 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 7 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5.1-0
 - patches to avoid autotools in compile from tgz
 
-* Thu Mar 29 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5-1
+* Tue Mar 29 2005 Juan Antonio Martinez <jonsito at teleline.es 0:0.5-1
 - upgrade to 0.5beta1 version
 - BuildRequires now complains compilation of html manual from xml file
 
-* Thu Feb 28 2005 Juan Antonio Martinez <jonsito at teleline.es> 0:0.4.4-2
+* Mon Feb 28 2005 Juan Antonio Martinez <jonsito at teleline.es> 0:0.4.4-2
 - New pkcs11_eventmgr app in "tools" package
 
 * Thu Feb 24 2005 Juan Antonio Martinez <jonsito at teleline.es> 0:0.4.4-1
 - Fix pcsc-lite dependencies
 
-* Thu Feb 15 2005 Juan Antonio Martinez <jonsito at teleline.es> 0:0.4.4-0
+* Tue Feb 15 2005 Juan Antonio Martinez <jonsito at teleline.es> 0:0.4.4-0
 - Update to 0.4.4b2
 
 * Sun Sep 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3b-0.fdr.1
diff --git a/sources b/sources
index 85ee003..6878a0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68d99525709798b43c8a691e328a5f0a  pam_pkcs11-0.6.2.tar.gz
+78210980353d2e8d5a0549d385193354  pam_pkcs11-0.6.8-63451e9.tar.gz
