rpms/pam_pkcs11/devel pam_pkcs11.spec, 1.11, 1.12 rh_pam_pkcs11.conf, 1.2, 1.3 rh_pkcs11_eventmgr.conf, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 24 23:22:21 UTC 2006
Author: rrelyea
Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16794
Modified Files:
pam_pkcs11.spec rh_pam_pkcs11.conf rh_pkcs11_eventmgr.conf
Log Message:
use $LIB to allow dl_open to select the corrrect library on the platform.
Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pam_pkcs11.spec 22 Aug 2006 00:10:03 -0000 1.11
+++ pam_pkcs11.spec 24 Aug 2006 23:22:18 -0000 1.12
@@ -6,7 +6,7 @@
Name: pam_pkcs11
Version: 0.5.3
-Release: 11
+Release: 12
Summary: PKCS #11/NSS PAM login module
Group: System Environment/Base
@@ -92,9 +92,7 @@
# set up config files
#
install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-sed -e 's;$_libdir;'%{_libdir}';g' %{SOURCE1} > $RPM_BUILD_ROOT/tmp_conf
-install -m 644 $RPM_BUILD_ROOT/tmp_conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
-rm -f $RPM_BUILD_ROOT/tmp_conf
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.conf
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
#
# clean up those files that aren't part of this package
@@ -147,7 +145,11 @@
%doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
%changelog
-* Mon Aug 21 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-10
+* Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-12
+- use $LIB so the config file works for multi archs on the
+- same machine
+
+* 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
Index: rh_pam_pkcs11.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pam_pkcs11.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rh_pam_pkcs11.conf 22 Aug 2006 00:10:03 -0000 1.2
+++ rh_pam_pkcs11.conf 24 Aug 2006 23:22:18 -0000 1.3
@@ -30,7 +30,7 @@
use_pkcs11_module = coolkey;
pkcs11_module coolkey {
- module = $_libdir/libcoolkeypk11.so;
+ module = /usr/$LIB/libcoolkeypk11.so;
description = "Cool Key"
# Slot-number to use. One for the first, two for the second and so
# on. The default value is zero which means to use the first slot
@@ -61,7 +61,7 @@
}
pkcs11_module opensc {
- module = $_libdir/opensc-pkcs11.so;
+ module = /usr/$LIB/opensc-pkcs11.so;
description = "OpenSC PKCS#11 module";
# Slot-number to use. One for the first, two for the second and so
# on. The default value is zero which means to use the first slot
@@ -92,7 +92,7 @@
# Default pkcs11 module
pkcs11_module default {
- module = $_libdir/pam_pkcs11/pkcs11_module.so;
+ module = /usr/$LIB/pam_pkcs11/pkcs11_module.so;
description = "Default pkcs#11 module";
slot_num = 0;
ca_dir = /etc/pam_pkcs11/cacerts;
@@ -127,13 +127,13 @@
# value as module search path
# TODO:
# This is not still functional: use absolute pathnames or LD_LIBRARY_PATH
- mapper_search_path = $_libdir/pam_pkcs11;
+ mapper_search_path = /usr/$LIB/pam_pkcs11;
#
# Generic certificate contents mapper
mapper generic {
debug = true;
- module = $_libdir/pam_pkcs11/generic_mapper.so;
+ module = /usr/$LIB/pam_pkcs11/generic_mapper.so;
# ignore letter case on match/compare
ignorecase = false;
# Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid"
@@ -148,7 +148,7 @@
# provided file stores one or more "Subject -> login" lines
mapper subject {
debug = false;
- # module = $_libdir/pam_pkcs11/subject_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/subject_mapper.so;
module = internal;
ignorecase = false;
mapfile = file:///etc/pam_pkcs11/subject_mapping;
@@ -157,13 +157,13 @@
# Search public keys from $HOME/.ssh/authorized_keys to match users
mapper openssh {
debug = false;
- module = $_libdir/pam_pkcs11/openssh_mapper.so;
+ module = /usr/$LIB/pam_pkcs11/openssh_mapper.so;
}
# Search certificates from $HOME/.eid/authorized_certificates to match users
mapper opensc {
debug = false;
- module = $_libdir/pam_pkcs11/opensc_mapper.so;
+ module = /usr/$LIB/pam_pkcs11/opensc_mapper.so;
}
# Certificate Common Name ( CN ) to getpwent() mapper
@@ -171,13 +171,13 @@
debug = false;
ignorecase = false;
module = internal;
- # module = $_libdir/pam_pkcs11/pwent_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/pwent_mapper.so;
}
# Null ( no map ) mapper. when user as finder matchs to NULL or "nobody"
mapper null {
debug = false;
- # module = $_libdir/pam_pkcs11/null_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/null_mapper.so;
module = internal ;
# select behavior: always match, or always fail
default_match = false;
@@ -188,7 +188,7 @@
# Directory ( ldap style ) mapper
mapper ldap {
debug = false;
- module = $_libdir/pam_pkcs11/ldap_mapper.so;
+ module = /usr/$LIB/pam_pkcs11/ldap_mapper.so;
# where base directory resides
basedir = /etc/pam_pkcs11/mapdir;
# hostname of ldap server
@@ -213,7 +213,7 @@
mapper cn {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/cn_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/cn_mapper.so;
ignorecase = true;
mapfile = file:///etc/pam_pkcs11/cn_map;
}
@@ -222,7 +222,7 @@
mapper mail {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/mail_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/mail_mapper.so;
# Declare mapfile or
# leave empty "" or "none" to use no map
mapfile = file:///etc/pam_pkcs11/mail_mapping;
@@ -239,7 +239,7 @@
mapper ms {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/ms_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/ms_mapper.so;
ignorecase = false;
ignoredomain = false;
domain = "domain.com";
@@ -249,7 +249,7 @@
mapper krb {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/krb_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/krb_mapper.so;
ignorecase = false;
mapfile = "none";
}
@@ -258,7 +258,7 @@
mapper uid {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/uid_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/uid_mapper.so;
ignorecase = false;
mapfile = "none";
}
@@ -267,7 +267,7 @@
mapper digest {
debug = false;
module = internal;
- # module = $_libdir/pam_pkcs11/digest_mapper.so;
+ # module = /usr/$LIB/pam_pkcs11/digest_mapper.so;
# algorithm used to evaluate certificate digest
# Select one of:
# "null","md2","md4","md5","sha","sha1","dss","dss1","ripemd160"
Index: rh_pkcs11_eventmgr.conf
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/rh_pkcs11_eventmgr.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rh_pkcs11_eventmgr.conf 5 Jul 2006 21:48:16 -0000 1.1
+++ rh_pkcs11_eventmgr.conf 24 Aug 2006 23:22:18 -0000 1.2
@@ -16,7 +16,7 @@
expire_time = 0;
# pkcs11 module to use
- pkcs11_module = /usr/lib/libcoolkeypk11.so;
+ pkcs11_module = /usr/$LIB/libcoolkeypk11.so;
#
# list of events and actions
More information about the fedora-cvs-commits
mailing list