rpms/pam_pkcs11/FC-3 pam_pkcs11-0.5.3-config.patch, NONE, 1.1 pam_pkcs11-0.5.3-pcsc120.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_pkcs11.spec, 1.1, 1.2 sources, 1.2, 1.3 pam_pkcs11-0.5.2-badstatic.patch, 1.1, NONE pam_pkcs11-0.5.2-pki.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Nov 14 18:28:07 UTC 2005
- Previous message: 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
- Next message: rpms/pam_pkcs11/FC-4 pam_pkcs11-0.5.3-config.patch, NONE, 1.1 pam_pkcs11-0.5.3-pcsc120.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_pkcs11.spec, 1.1, 1.2 sources, 1.2, 1.3 pam_pkcs11-0.5.2-badstatic.patch, 1.1, NONE pam_pkcs11-0.5.2-pki.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/pam_pkcs11/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3995/FC-3
Modified Files:
.cvsignore pam_pkcs11.spec sources
Added Files:
pam_pkcs11-0.5.3-config.patch pam_pkcs11-0.5.3-pcsc120.patch
Removed Files:
pam_pkcs11-0.5.2-badstatic.patch pam_pkcs11-0.5.2-pki.patch
Log Message:
* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-0
- 0.5.3, patch to compile with pcsc-lite < 1.2.9.
- Fix up opensc-pkcs11.so location to match OpenSC 0.9.6.
- Sync installation layout in config files and on disk.
- Specfile cleanups and maintainability improvements.
- Default config improvements.
- Drop unused "badstatic" patch.
IOW, a sync with the devel branch, without obsoleting pam_opensc and
opensc-pkcs11.so location configured for OpenSC 0.9.6.
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
pam_pkcs11-0.5.3-pcsc120.patch:
--- NEW FILE pam_pkcs11-0.5.3-pcsc120.patch ---
--- src/tools/card_eventmgr.c~ 2005-09-21 00:19:50.000000000 +0300
+++ src/tools/card_eventmgr.c 2005-09-21 00:25:54.000000000 +0300
@@ -311,7 +311,7 @@
LONG rv;
SCARD_READERSTATE_A *rgReaderStates_t = NULL;
DWORD dwReaders, dwReadersOld;
- LPTSTR mszReaders = NULL;
+ char *mszReaders = NULL;
char *ptr, **readers = NULL;
int nbReaders, i;
int first_loop = TRUE;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Aug 2005 03:15:27 -0000 1.2
+++ .cvsignore 14 Nov 2005 18:28:05 -0000 1.3
@@ -1 +1 @@
-pam_pkcs11-0.5.2.tar.gz
+pam_pkcs11-0.5.3.tar.gz
Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/FC-3/pam_pkcs11.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11.spec 29 Aug 2005 03:15:27 -0000 1.1
+++ pam_pkcs11.spec 14 Nov 2005 18:28:05 -0000 1.2
@@ -1,19 +1,22 @@
Name: pam_pkcs11
-Version: 0.5.2
-Release: 2%{?dist}
+Version: 0.5.3
+Release: 0%{?dist}
Summary: PKCS #11 PAM login module
Group: System Environment/Base
License: LGPL
URL: http://www.opensc.org/pam_pkcs11
-Source0: http://oasis.dit.upm.es/~jantonio/pam-pkcs11/downloads/%{name}-%{version}.tar.gz
+Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: pam_pkcs11-0.5.2-pki.patch
-Patch1: pam_pkcs11-0.5.2-badstatic.patch
+# http://www.opensc.org/pam_pkcs11/ticket/11
+Patch0: %{name}-0.5.3-pcsc120.patch
+# http://www.opensc.org/pam_pkcs11/ticket/9
+# http://www.opensc.org/pam_pkcs11/ticket/10
+Patch1: %{name}-0.5.3-config.patch
BuildRequires: pam-devel, openssl-devel, openldap-devel
%{?_with_curl:BuildRequires: curl-devel}
-BuildRequires: libxslt docbook-style-xsl
+BuildRequires: libxslt docbook-style-xsl
Provides: pkcs11_login = %{version}-%{release}
%description
@@ -41,17 +44,27 @@
%prep
%setup -q
-%patch0 -p1
+if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
+%patch0
+fi
%patch1 -p1
-# 64bit arches
-%ifarch ia64 sparc64 alpha ppc64 x86_64
-for i in etc/pam_pkcs11.conf.example etc/pkcs11_eventmgr.conf.example etc/pam.d_login.example src/pam_pkcs11/pam_config.c src/tools/pkcs11_eventmgr.c; do
- sed -i 's/usr\/lib/usr\/lib64/g' $i
-done
-%endif
+
+grep -rlF /etc/pam_pkcs11/pkcs11_module.so * \
+| xargs sed -i -e \
+ 's|/etc/pam_pkcs11/pkcs11_module\.so|%{_libdir}/pam_pkcs11/pkcs11_module.so|g'
+
+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.9.6.
+grep -rlF /usr/lib/opensc-pkcs11.so * | xargs \
+ sed -i -e 's|/usr/lib/opensc-pkcs11.so|%{_libdir}/pkcs11/opensc-pkcs11.so|g'
+
+grep -rl '/usr/lib\b' * | xargs sed -i -e 's|/usr/lib\b|%{_libdir}|g'
%build
+# --disable-static is broken as of 0.5.[23]
%configure --disable-dependency-tracking %{?_with_curl}
make %{?_smp_mflags}
@@ -59,45 +72,41 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
+
# Nuke the static and libtool bits
rm -rf $RPM_BUILD_ROOT%{_libdir}/pam_pkcs11/*.*a
-# 64 bit correction
-%ifarch ia64 sparc64 alpha ppc64 x86_64
-mv $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib64
-%endif
-
-# Nuke %{_datadir}/pam_pkcs11
+# Example configs are installed in-place and some as docs
rm -rf $RPM_BUILD_ROOT%{_datadir}/pam_pkcs11
-# Hardcoded defaults... no sysconfdir
-mkdir -p $RPM_BUILD_ROOT/etc/pki/pkcs11/mapdir
-install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/cacerts
-install -dm 755 $RPM_BUILD_ROOT/etc/pki/pkcs11/crls
-install -m 644 etc/pam_pkcs11.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pam_pkcs11.conf
-install -m 644 etc/card_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/card_eventmgr.conf
-install -m 644 etc/pkcs11_eventmgr.conf.example $RPM_BUILD_ROOT/etc/pki/pkcs11/pkcs11_eventmgr.conf
-install -m 644 etc/digest_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/digest_mapping
-install -m 644 etc/mail_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/mail_mapping
-install -m 644 etc/subject_mapping.example $RPM_BUILD_ROOT/etc/pki/pkcs11/subject_mapping
+install -dm 755 \
+ $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/{cacerts,crls,mapdir}
+for file in card_eventmgr.conf pam_pkcs11.conf pkcs11_eventmgr.conf {digest,mail,subject}_mapping ; do
+ install -pm 644 etc/$file.example \
+ $RPM_BUILD_ROOT%{_sysconfdir}/pki/pam_pkcs11/$file
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO ChangeLog NEWS
-%doc docs/pam_pkcs11.html
-%doc docs/README.autologin
-%doc docs/README.mappers
+%doc doc/pam_pkcs11.html
+%doc doc/README.autologin doc/README.ldap_mapper doc/README.mappers
%doc etc/pam.d_login.example
-%dir %{_sysconfdir}/pki/pkcs11
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/cacerts
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/crls
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/pam_pkcs11.conf
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/digest_mapping
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/mail_mapping
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/subject_mapping
+%dir %{_sysconfdir}/pki/pam_pkcs11
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/cacerts/
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/crls/
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mapdir/
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pam_pkcs11.conf
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/digest_mapping
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/mail_mapping
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/subject_mapping
%{_bindir}/make_hash_link.sh
%{_libdir}/pam_pkcs11/
/%{_lib}/security/pam_pkcs11.so
@@ -105,20 +114,25 @@
%files tools
%defattr(-,root,root,-)
-%dir %{_sysconfdir}/pki/pkcs11
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/card_eventmgr.conf
-%config(noreplace) %{_sysconfdir}/pki/pkcs11/pkcs11_eventmgr.conf
+%doc doc/README.eventmgr
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/card_eventmgr.conf
+%config(noreplace) %{_sysconfdir}/pki/pam_pkcs11/pkcs11_eventmgr.conf
%{_bindir}/card_eventmgr
%{_bindir}/pkcs11_eventmgr
%{_bindir}/pklogin_finder
%{_bindir}/pkcs11_inspect
-%{_mandir}/man1/card_eventmgr.1.gz
-%{_mandir}/man1/pkcs11_eventmgr.1.gz
-%{_mandir}/man1/pkcs11_inspect.1.gz
-%{_mandir}/man1/pklogin_finder.1.gz
-%doc docs/README.eventmgr
+%{_mandir}/man1/*
+
%changelog
+* Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-0
+- 0.5.3, patch to compile with pcsc-lite < 1.2.9.
+- Fix up opensc-pkcs11.so location to match OpenSC 0.9.6.
+- Sync installation layout in config files and on disk.
+- Specfile cleanups and maintainability improvements.
+- Default config improvements.
+- Drop unused "badstatic" patch.
+
* Sun Aug 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.2-2
- don't need the datadir
- 64bit fixups
@@ -131,7 +145,6 @@
- remove BR:automake
- own directories
- use /etc/pki
-- use --disable-static
* Sat Aug 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-1
- minor cleanups (and naming change) for Fedora Extras
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Aug 2005 03:15:27 -0000 1.2
+++ sources 14 Nov 2005 18:28:05 -0000 1.3
@@ -1 +1 @@
-5b5c6ac1c718297fa250d8a5b6e7cb82 pam_pkcs11-0.5.2.tar.gz
+607e3ba84b8938eff20c51c597e522c0 pam_pkcs11-0.5.3.tar.gz
--- pam_pkcs11-0.5.2-badstatic.patch DELETED ---
--- pam_pkcs11-0.5.2-pki.patch DELETED ---
- Previous message: 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
- Next message: rpms/pam_pkcs11/FC-4 pam_pkcs11-0.5.3-config.patch, NONE, 1.1 pam_pkcs11-0.5.3-pcsc120.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_pkcs11.spec, 1.1, 1.2 sources, 1.2, 1.3 pam_pkcs11-0.5.2-badstatic.patch, 1.1, NONE pam_pkcs11-0.5.2-pki.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list