rpms/opensc/FC-3 opensc-lvalue.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 opensc.spec, 1.3, 1.4 sources, 1.2, 1.3 opensc-build.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue May 17 19:13:26 UTC 2005
Author: scop
Update of /cvs/extras/rpms/opensc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13512
Modified Files:
.cvsignore opensc.spec sources
Added Files:
opensc-lvalue.patch
Removed Files:
opensc-build.patch
Log Message:
0.9.6, cosmetic improvements.
opensc-lvalue.patch:
--- NEW FILE opensc-lvalue.patch ---
Index: src/pam/pam_support.c
===================================================================
--- src/pam/pam_support.c (revision 2139)
+++ src/pam/pam_support.c (revision 2140)
@@ -205,7 +205,8 @@
static void _cleanup(pam_handle_t * pamh, void *x, int error_status)
{
- _pam_delete((char *) x);
+ char *y = (char *) x;
+ _pam_delete(y);
}
/* ************************************************************** *
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2 Feb 2005 23:25:14 -0000 1.2
+++ .cvsignore 17 May 2005 19:13:24 -0000 1.3
@@ -1 +1 @@
-opensc-0.9.4.tar.gz
+opensc-0.9.6.tar.gz
Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/FC-3/opensc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opensc.spec 9 Feb 2005 02:35:04 -0000 1.3
+++ opensc.spec 17 May 2005 19:13:24 -0000 1.4
@@ -5,31 +5,28 @@
%define plugindir %{_libdir}/mozilla/plugins
Name: opensc
-Version: 0.9.4
-Release: 2
-Summary: OpenSC SmartCard library and applications
+Version: 0.9.6
+Release: 1
+Summary: Smart card library and applications
Group: System Environment/Libraries
License: LGPL
URL: http://www.opensc.org/
-Source0: http://www.opensc.org/files/opensc-0.9.4.tar.gz
-Patch0: %{name}-build.patch
+Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz
+Patch0: %{name}-lvalue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
BuildRequires: readline-devel libtermcap-devel openct-devel
BuildRequires: openssl-devel >= 0.9.7a libassuan-devel XFree86-devel
-# libtool (+ pulled in automake and autoconf) for patch0
-BuildRequires: libtool
-Requires: openct
%description
-OpenSC is a package for for accessing SmartCard devices. Basic
+OpenSC is a package for for accessing smart card devices. Basic
functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
-7816-4 compatible SmartCard. Encryption and decryption using private
-keys on the SmartCard is possible with PKCS #15 compatible cards, such
-as the FINEID (Finnish Electronic IDentity) card. Swedish Posten eID
-cards have also been confirmed to work.
+7816-4 compatible smart card. Encryption and decryption using private
+keys on the smart card is possible with PKCS #15 compatible cards,
+such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten
+eID cards have also been confirmed to work.
%package -n mozilla-opensc-signer
Summary: Digital signature plugin for web browsers
@@ -39,16 +36,16 @@
%description -n mozilla-opensc-signer
OpenSC Signer is a plugin for web browsers compatible with Mozilla
plugins that will generate digital signatures using facilities on
-PKI-capable smartcards.
+PKI-capable smart cards.
%package pam
-Summary: OpenSC pluggable authentication module
+Summary: Pluggable authentication module using smart cards
Group: System Environment/Base
Provides: pam_opensc = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description pam
-OpenSC pluggable authentication module implementing smart card support.
+Pluggable authentication module implementing smart card support.
%package devel
Summary: OpenSC development files
@@ -68,10 +65,9 @@
for file in docs/*.1 ; do
iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
done
-sh ./bootstrap # for patch0
-# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
+# Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
sed -i -e 's!/lib/libcrypto!/%{_lib}/libcrypto!g' configure
-sed -i -e 's!openssldir/lib !openssldir/%{_lib} !g' configure
+sed -i -e 's!commondir/lib !commondir/%{_lib} !g' configure
%build
@@ -87,6 +83,7 @@
%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
# Fixup pam module location.
install -dm 755 $RPM_BUILD_ROOT/%{_lib}/security
@@ -94,9 +91,7 @@
$RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.so
rm -rf $RPM_BUILD_ROOT%{_libdir}/security
-# Installing config examples as doc later.
install -dm 755 _docs/openssh
-mv $RPM_BUILD_ROOT%{_datadir}/opensc/*.conf.example _docs
install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
@@ -112,8 +107,8 @@
%files
%defattr(-,root,root,-)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS QUICKSTART README.*
-%doc docs/*.html docs/*.css _docs/*.conf.example
+%doc ANNOUNCE NEWS QUICKSTART README.* docs/*.html docs/*.css etc/scldap.conf
+%config(noreplace) %{_sysconfdir}/opensc.conf
%{_bindir}/cardos-info
%{_bindir}/cryptoflex-tool
%{_bindir}/opensc-explorer
@@ -127,7 +122,7 @@
%{_libdir}/libscconf.so.*
%{_libdir}/libscldap.so.*
%dir %{_libdir}/opensc
-%{!?_with_oldssl:%{_libdir}/opensc/engine_*.so}
+%{_libdir}/opensc/engine_*.so
%dir %{_libdir}/pkcs11
%{_libdir}/pkcs11/opensc-pkcs11.so
%{_libdir}/pkcs11/lib*.so.*
@@ -168,19 +163,24 @@
%{_libdir}/pkcs11/pkcs11-spy.so
%{_libdir}/pkcs11/lib*.so
%exclude %{_libdir}/pkcs11/*.la
-%{_libdir}/pkgconfig/libopensc.pc
+%{_libdir}/pkgconfig/lib*.pc
%{_mandir}/man1/opensc-config.1*
%{_mandir}/man3/*.3*
%if !%{disable_static}
%{_libdir}/*.a
-%{_libdir}/opensc/*.a
-%{_libdir}/pkcs11/lib*.a
+%exclude %{_libdir}/opensc/*.a
+%exclude %{_libdir}/pkcs11/*.a
%endif
%changelog
+* Tue Apr 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.6-1
+- 0.9.6, build patch applied upstream.
+- Package summary and description improvements.
+- Drop explicit openct dependency.
+
* Wed Feb 9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
-- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
+- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
- Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
* Thu Feb 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.4-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 2 Feb 2005 23:25:14 -0000 1.2
+++ sources 17 May 2005 19:13:24 -0000 1.3
@@ -1 +1 @@
-76c18fc9bd9fad9c45396ea81f317551 opensc-0.9.4.tar.gz
+38fdd64566cc6fc83338d659e816b4fb opensc-0.9.6.tar.gz
--- opensc-build.patch DELETED ---
More information about the fedora-extras-commits
mailing list