packages: pam-pam_pkcs11/pam-pam_pkcs11.spec, pam-pam_pkcs11/pam-pam_pkcs11...

Wed Aug 11 22:19:31 CEST 2010

Author: qboosh                       Date: Wed Aug 11 20:19:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.6.4
- added pcsc-update patch to build with current pcsc-lite
- added pl.po-update patch instead of old (already merged upstream) pl.po file

---- Files affected:
packages/pam-pam_pkcs11:
   pam-pam_pkcs11.spec (1.8 -> 1.9) , pam-pam_pkcs11-pcsc-update.patch (NONE -> 1.1)  (NEW), pam-pam_pkcs11-pl.po-update.patch (NONE -> 1.1)  (NEW), pam_pkcs11.pl.po (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/pam-pam_pkcs11/pam-pam_pkcs11.spec
diff -u packages/pam-pam_pkcs11/pam-pam_pkcs11.spec:1.8 packages/pam-pam_pkcs11/pam-pam_pkcs11.spec:1.9

--- packages/pam-pam_pkcs11/pam-pam_pkcs11.spec:1.8	Sat Nov  3 03:10:03 2007
+++ packages/pam-pam_pkcs11/pam-pam_pkcs11.spec	Wed Aug 11 22:19:25 2010
@@ -2,26 +2,29 @@
 Summary:	PAM login module that allows a X.509 certificate based user login
 Summary(pl.UTF-8):	ModuÅ‚ PAM umoÅ¼liwiajÄ…cy logowanie siÄ™ w oparciu o certyfikat X.509
 Name:		pam-pam_pkcs11
-Version:	0.6.0
+Version:	0.6.4
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.opensc-project.org/files/pam_pkcs11/pam_pkcs11-%{version}.tar.gz
-# Source0-md5:	5f3be860fa5b630cbce113e4a9bc6996
-Source1:	pam_pkcs11.pl.po
+# Source0-md5:	680be5349314d39f34cab1e04682e915
+#Source1:	pam_pkcs11.pl.po
+Patch0:		%{name}-pcsc-update.patch
+Patch1:		%{name}-pl.po-update.patch
 URL:		http://www.opensc-project.org/pam_pkcs11/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	curl-devel
-BuildRequires:	gettext-devel >= 0.16.1
+BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	libxslt-progs
 BuildRequires:	libtool
 BuildRequires:	openldap-devel >= 2.4.6
 BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
-BuildRequires:	pcsc-lite-devel
+BuildRequires:	pcsc-lite-devel >= 1.6.0
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
+Requires:	pcsc-lite-libs >= 1.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libdir		/%{_lib}
@@ -42,9 +45,9 @@
 
 %prep
 %setup -q -n pam_pkcs11-%{version}
+%patch0 -p1
+%patch1 -p1
 
-cp -f %{SOURCE1} po/pl.po
-sed -i -e 's/"fr"/"fr pl"/' configure.in
 rm -f po/stamp-po
 
 %build
@@ -64,7 +67,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_pkcs11.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.la
+
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_br,pt_BR}
 
 %find_lang pam_pkcs11
 
@@ -74,11 +80,17 @@
 %files -f pam_pkcs11.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO doc/{README.*,*.html,*.css} etc/*.example
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/card_eventmgr
+%attr(755,root,root) %{_bindir}/make_hash_link.sh
+%attr(755,root,root) %{_bindir}/pkcs11_*
+%attr(755,root,root) %{_bindir}/pklogin_finder
 %attr(755,root,root) /%{_lib}/security/pam_pkcs11.so
 %dir %{_libdir}/pam_pkcs11
 %attr(755,root,root) %{_libdir}/pam_pkcs11/*.so
-%{_mandir}/man[18]/*
+%{_mandir}/man1/card_eventmgr.1*
+%{_mandir}/man1/pkcs11_*.1*
+%{_mandir}/man1/pklogin_finder.1*
+%{_mandir}/man8/pam_pkcs11.8*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -86,6 +98,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/08/11 20:19:25  qboosh
+- updated to 0.6.4
+- added pcsc-update patch to build with current pcsc-lite
+- added pl.po-update patch instead of old (already merged upstream) pl.po file
+
 Revision 1.8  2007/11/03 02:10:03  baggins
 - updated openldap BR/R to 2.4.6
 

================================================================
Index: packages/pam-pam_pkcs11/pam-pam_pkcs11-pcsc-update.patch
diff -u /dev/null packages/pam-pam_pkcs11/pam-pam_pkcs11-pcsc-update.patch:1.1
--- /dev/null	Wed Aug 11 22:19:31 2010
+++ packages/pam-pam_pkcs11/pam-pam_pkcs11-pcsc-update.patch	Wed Aug 11 22:19:25 2010
@@ -0,0 +1,11 @@
+--- pam_pkcs11-0.6.4/src/tools/card_eventmgr.c.orig	2010-04-10 16:38:24.000000000 +0200
++++ pam_pkcs11-0.6.4/src/tools/card_eventmgr.c	2010-08-11 20:01:06.582816591 +0200
+@@ -312,7 +312,7 @@
+ int main(int argc, char *argv[]) {
+     int current_reader;
+     LONG rv;
+-    SCARD_READERSTATE_A *rgReaderStates_t = NULL;
++    SCARD_READERSTATE *rgReaderStates_t = NULL;
+     DWORD dwReaders, dwReadersOld;
+     LPSTR mszReaders = NULL;
+     char *ptr, **readers = NULL;

================================================================
Index: packages/pam-pam_pkcs11/pam-pam_pkcs11-pl.po-update.patch
diff -u /dev/null packages/pam-pam_pkcs11/pam-pam_pkcs11-pl.po-update.patch:1.1
--- /dev/null	Wed Aug 11 22:19:31 2010
+++ packages/pam-pam_pkcs11/pam-pam_pkcs11-pl.po-update.patch	Wed Aug 11 22:19:25 2010
@@ -0,0 +1,65 @@
+--- pam_pkcs11-0.6.4/po/pl.po.orig	2010-06-12 17:28:14.000000000 +0200
++++ pam_pkcs11-0.6.4/po/pl.po	2010-08-11 21:48:23.114816591 +0200
+@@ -1,13 +1,13 @@
+ # Polish translation for pam_pkcs11
+ # This file is distributed under the same license as the pam_pkcs11 package.
+-# Jakub Bogusz <qboosh at pld-linux.org>, 2007.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2007-2010.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: pam_pkcs11 0.6.0\n"
++"Project-Id-Version: pam_pkcs11 0.6.4\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2010-06-12 17:28+0200\n"
+-"PO-Revision-Date: 2007-06-14 21:55+0200\n"
++"PO-Revision-Date: 2010-08-11 21:37+0200\n"
+ "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+@@ -15,9 +15,9 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: src/pam_pkcs11/pam_pkcs11.c:289 src/pam_pkcs11/pam_pkcs11.c:386
+-#, fuzzy, c-format
++#, c-format
+ msgid "Please insert your %s or enter your username."
+-msgstr "Proszê w³o¿yæ w³asn± kartê procesorow± lub wpisaæ nazwê u¿ytkownika."
++msgstr "Proszê w³o¿yæ %s lub wpisaæ nazwê u¿ytkownika."
+ 
+ #: src/pam_pkcs11/pam_pkcs11.c:358
+ #, c-format
+@@ -31,7 +31,7 @@
+ #: src/pam_pkcs11/pam_pkcs11.c:408
+ #, c-format
+ msgid "Found the %s."
+-msgstr ""
++msgstr "Znaleziono %s."
+ 
+ #: src/pam_pkcs11/pam_pkcs11.c:430
+ #, c-format
+@@ -41,21 +41,17 @@
+ #: src/pam_pkcs11/pam_pkcs11.c:437
+ #, c-format
+ msgid "%s PIN: "
+-msgstr ""
++msgstr "PIN %s: "
+ 
+ #: src/pam_pkcs11/pam_pkcs11.c:469
+ #, c-format
+ msgid "Enter your %s PIN on the pinpad"
+-msgstr ""
++msgstr "Proszê wprowadziæ PIN %s na klawiaturze czytnika"
+ 
+ #: src/pam_pkcs11/pam_pkcs11.c:766
+ msgid "Cannot change the password on your smart card."
+ msgstr "Nie mo¿na zmieniæ has³a na tej karcie procesorowej."
+ 
+ #: src/pam_pkcs11/pam_config.c:65
+-#, fuzzy
+ msgid "Smart card"
+-msgstr "Karta w³o¿ona."
+-
+-#~ msgid "Smart card password: "
+-#~ msgstr "Has³o do karty: "
++msgstr "Karta procesorowa"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pam-pam_pkcs11/pam-pam_pkcs11.spec?r1=1.8&r2=1.9&f=u

