rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-config.patch, NONE, 1.1 pam_pkcs11.spec, 1.3, 1.4 pam_pkcs11-0.5.2-badstatic.patch, 1.1, NONE pam_pkcs11-0.5.3-examples.patch, 1.1, NONE pam_pkcs11-0.5.3-genmapper-config.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/pam_pkcs11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3956

Modified Files:
	pam_pkcs11.spec 
Added Files:
	pam_pkcs11-0.5.3-config.patch 
Removed Files:
	pam_pkcs11-0.5.2-badstatic.patch 
	pam_pkcs11-0.5.3-examples.patch 
	pam_pkcs11-0.5.3-genmapper-config.patch 
Log Message:
* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-3
- Fix up opensc-pkcs11.so location to match OpenSC 0.10.0.
- More default config improvements.
- Drop unused "badstatic" patch.


pam_pkcs11-0.5.3-config.patch:

--- NEW FILE pam_pkcs11-0.5.3-config.patch ---
--- pam_pkcs11-0.5.3/etc/mail_mapping.example~	2005-09-12 12:12:55.000000000 +0300
+++ pam_pkcs11-0.5.3/etc/mail_mapping.example	2005-11-12 11:37:53.000000000 +0200
@@ -1,7 +1,8 @@
 # mapping file for Certificate E-email
 # format: email -> login
 #
-jantonio at dit.upm.es -> jantonio
-juan_a_mtnez at yahoo.es -> jantonio
-jonsito at terra.es -> jantonio
-pjpg at dit.upm.es -> pjpg
+# Examples:
+# jantonio at dit.upm.es -> jantonio
+# juan_a_mtnez at yahoo.es -> jantonio
+# jonsito at terra.es -> jantonio
+# pjpg at dit.upm.es -> pjpg
--- pam_pkcs11-0.5.3/etc/pam_pkcs11.conf.example~	2005-09-12 12:12:55.000000000 +0300
+++ pam_pkcs11-0.5.3/etc/pam_pkcs11.conf.example	2005-11-12 11:36:13.000000000 +0200
@@ -8,8 +8,8 @@
   # Allow empty passwords
   nullok = true;
 
-  # Enable debugging support.
-  debug = true; 
+  # Enable debugging support?
+  debug = false;
 
   # Do not prompt the user for the passwords but take them from the
   # PAM_ items instead.
@@ -99,7 +99,8 @@
   # Generic certificate contents mapper
   mapper generic {
         debug = true;
-        module = /usr/lib/pam_pkcs11/generic_mapper.so;
+        # module = /usr/lib/pam_pkcs11/generic_mapper.so;
+        module = internal;
         # ignore letter case on match/compare
         ignorecase = false;
         # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid"
@@ -181,7 +182,7 @@
 	module = internal;
 	# module = /usr/lib/pam_pkcs11/cn_mapper.so;
 	ignorecase = true;
-	# mapfile = file:///etc/pam_pkcs11/cn_map;
+	# mapfile = file:///etc/pam_pkcs11/cn_mapping;
 	mapfile = "none";
   }
 
--- pam_pkcs11-0.5.3/etc/digest_mapping.example~	2005-09-12 12:12:55.000000000 +0300
+++ pam_pkcs11-0.5.3/etc/digest_mapping.example	2005-11-12 11:37:53.000000000 +0200
@@ -1,4 +1,5 @@
 # Mapping for certificate sha1 digest
 # Format: Cert SHA1 digest (hexdot) -> login
 #
-90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio
+# Example:
+# 90:17:64:09:4C:42:D6:9C:91:52:7F:1C:86:00:23:DC:BB:5D:27:50 -> jantonio
--- pam_pkcs11-0.5.3/etc/subject_mapping.example~	2005-09-12 12:12:55.000000000 +0300
+++ pam_pkcs11-0.5.3/etc/subject_mapping.example	2005-11-12 11:37:53.000000000 +0200
@@ -1,4 +1,5 @@
 # Mapping file for Certificate Subject
 # format: Certificate Subject -> login
 #
-/C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio
+# Example:
+# /C=ES/O=FNMT/OU=FNMT Clase 2 CA/OU=500051483/CN=NOMBRE MARTINEZ CASTA\xF1O JUAN ANTONIO - NIF 50431138G -> jantonio


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_pkcs11.spec	2 Nov 2005 19:44:30 -0000	1.3
+++ pam_pkcs11.spec	14 Nov 2005 18:25:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PKCS #11 PAM login module
 
 Group:          System Environment/Base
@@ -10,11 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://www.opensc.org/pam_pkcs11/ticket/11
 Patch0:         %{name}-0.5.3-pcsc120.patch
-Patch1:         %{name}-0.5.2-badstatic.patch
 # http://www.opensc.org/pam_pkcs11/ticket/9
-Patch2:         %{name}-0.5.3-examples.patch
 # http://www.opensc.org/pam_pkcs11/ticket/10
-Patch3:         %{name}-0.5.3-genmapper-config.patch
+Patch1:         %{name}-0.5.3-config.patch
 
 BuildRequires:  pam-devel, openssl-devel, openldap-devel
 %{?_with_curl:BuildRequires: curl-devel}
@@ -50,9 +48,7 @@
 if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
 %patch0
 fi
-#patch1 -p1
-%patch2
-%patch3
+%patch1 -p1
 
 grep -rlF /etc/pam_pkcs11/pkcs11_module.so * \
 | xargs sed -i -e \
@@ -61,6 +57,10 @@
 grep -rlF /etc/pam_pkcs11 * \
 | xargs sed -i -e 's|/etc/pam_pkcs11|%{_sysconfdir}/pki/pam_pkcs11|g'
 
+# Adjust opensc-pkcs11.so location for OpenSC 0.10.0.
+grep -rlF /usr/lib/pkcs11/opensc * \
+| xargs sed -i -e 's|/usr/lib/pkcs11/opensc|%{_libdir}/opensc|g'
+
 grep -rl '/usr/lib\b' * | xargs sed -i -e 's|/usr/lib\b|%{_libdir}|g'
 
 
@@ -126,6 +126,11 @@
 
 
 %changelog
+* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-3
+- Fix up opensc-pkcs11.so location to match OpenSC 0.10.0.
+- More default config improvements.
+- Drop unused "badstatic" patch.
+
 * Mon Oct 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-2
 - Obsolete pam_opensc < 0.10.0.
 


--- pam_pkcs11-0.5.2-badstatic.patch DELETED ---


--- pam_pkcs11-0.5.3-examples.patch DELETED ---


--- pam_pkcs11-0.5.3-genmapper-config.patch DELETED ---