From f973fdc8c7346db00703a313f3ff758a9c710c0d Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: May 17 2005 19:11:59 +0000 Subject: 0.9.6, cosmetic improvements. --- diff --git a/.cvsignore b/.cvsignore index 745a62b..35f1bc2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -opensc-0.9.4.tar.gz +opensc-0.9.6.tar.gz diff --git a/opensc-build.patch b/opensc-build.patch deleted file mode 100644 index 1f8b5a5..0000000 --- a/opensc-build.patch +++ /dev/null @@ -1,161 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /pub/cvsroot/opensc/configure.in,v -retrieving revision 1.133 -diff -a -u -r1.133 configure.in ---- configure.in 5 Aug 2004 22:27:11 -0000 1.133 -+++ configure.in 3 Nov 2004 17:04:38 -0000 -@@ -241,7 +241,7 @@ - AC_SUBST(ENGINE_LINK) - AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [ - if test "x$tryssldir" = "x" ; then -- tryssldir="$trycommandir /usr/ /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl" -+ tryssldir="$trycommondir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl" - fi - - for ssldir in $tryssldir ; do -@@ -316,11 +316,11 @@ - } - ], - [ -- AC_MSG_RESULT("good, 0.9.7d or later") -+ AC_MSG_RESULT([good, 0.9.7d or later]) - GOOD_OPENSSL=yes - ], - [ -- AC_MSG_RESULT("not so good, 0.9.7d or later woudl be better") -+ AC_MSG_RESULT([not so good, 0.9.7d or later would be better]) - GOOD_OPENSSL=no - ] - ) -@@ -406,11 +406,13 @@ - - if test "x$SSL_MSG" = "xyes" ; then - AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries]) -- LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS" -- if test ! -z "$need_dash_r" ; then -+ if test "x$ac_cv_openssldir" != "x/usr"; then -+ LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS" -+ if test ! -z "$need_dash_r" ; then - LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS" -+ fi -+ CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS" - fi -- CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS" - else - LIBCRYPTO="" - LIBCRYPTOA="" -Index: src/libopensc/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/libopensc/Makefile.am,v -retrieving revision 1.79 -diff -a -u -r1.79 Makefile.am ---- src/libopensc/Makefile.am 27 Oct 2004 06:41:27 -0000 1.79 -+++ src/libopensc/Makefile.am 3 Nov 2004 17:04:39 -0000 -@@ -7,7 +7,7 @@ - EXTRA_DIST = Makefile.mak libopensc.pc.in - - INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@ --LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@ -+AM_LDFLAGS = @OPENCT_LDFLAGS@ - - bin_SCRIPTS = opensc-config - -Index: src/openscd/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/openscd/Makefile.am,v -retrieving revision 1.9 -diff -a -u -r1.9 Makefile.am ---- src/openscd/Makefile.am 30 Jul 2003 09:50:17 -0000 1.9 -+++ src/openscd/Makefile.am 3 Nov 2004 17:04:39 -0000 -@@ -5,7 +5,7 @@ - EXTRA_DIST = test.c - - INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@ --LDFLAGS = @LDFLAGS@ @LIBOPENSC@ -+AM_LDFLAGS = @LIBOPENSC@ - - if HAVE_ASSUAN - noinst_PROGRAMS = openscd -Index: src/pam/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/pam/Makefile.am,v -retrieving revision 1.31 -diff -a -u -r1.31 Makefile.am ---- src/pam/Makefile.am 22 Dec 2003 22:07:02 -0000 1.31 -+++ src/pam/Makefile.am 3 Nov 2004 17:04:39 -0000 -@@ -6,7 +6,7 @@ - - INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam - --LDFLAGS = @LDFLAGS@ ${top_builddir}/src/scam/libscam.la -+AM_LDFLAGS = ${top_builddir}/src/scam/libscam.la - - if HAVE_PAM - lib_LTLIBRARIES = pam_opensc.la -Index: src/pkcs15init/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/pkcs15init/Makefile.am,v -retrieving revision 1.29 -diff -a -u -r1.29 Makefile.am ---- src/pkcs15init/Makefile.am 16 Jun 2004 20:59:59 -0000 1.29 -+++ src/pkcs15init/Makefile.am 3 Nov 2004 17:04:40 -0000 -@@ -4,8 +4,8 @@ - - MAINTAINERCLEANFILES = Makefile.in - --CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" --LDFLAGS = @LDFLAGS@ @LIBOPENSC@ -+AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" -+AM_LDFLAGS = @LIBOPENSC@ - - PROFILES = \ - cyberflex.profile \ -Index: src/sia/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/sia/Makefile.am,v -retrieving revision 1.13 -diff -a -u -r1.13 Makefile.am ---- src/sia/Makefile.am 30 Jul 2003 09:50:17 -0000 1.13 -+++ src/sia/Makefile.am 3 Nov 2004 17:04:40 -0000 -@@ -6,7 +6,7 @@ - - INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam - --LDFLAGS = @LDFLAGS@ @LIBDL@ ${top_builddir}/src/scam/libscam.la -+AM_LDFLAGS = @LIBDL@ ${top_builddir}/src/scam/libscam.la - - SRC = sia_opensc.c sia_support.c sia_support.h - -Index: src/tests/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/tests/Makefile.am,v -retrieving revision 1.19 -diff -a -u -r1.19 Makefile.am ---- src/tests/Makefile.am 30 Jul 2003 09:50:18 -0000 1.19 -+++ src/tests/Makefile.am 3 Nov 2004 17:04:40 -0000 -@@ -6,7 +6,7 @@ - - EXTRA_DIST = Makefile.mak - --LDFLAGS = @LDFLAGS@ @LIBOPENSC@ -+AM_LDFLAGS = @LIBOPENSC@ - - noinst_PROGRAMS = base64 lottery p15dump pintest prngtest - -Index: src/tools/Makefile.am -=================================================================== -RCS file: /pub/cvsroot/opensc/src/tools/Makefile.am,v -retrieving revision 1.35 -diff -a -u -r1.35 Makefile.am ---- src/tools/Makefile.am 21 Jul 2004 22:02:37 -0000 1.35 -+++ src/tools/Makefile.am 3 Nov 2004 17:04:41 -0000 -@@ -4,7 +4,7 @@ - - EXTRA_DIST = Makefile.mak - --LDFLAGS = @LDFLAGS@ @LIBOPENSC@ -+AM_LDFLAGS = @LIBOPENSC@ - - if HAVE_SSL - PROGRAMS_SSL = cryptoflex-tool pkcs15-init diff --git a/opensc.spec b/opensc.spec index 7a2e0fb..7e43f58 100644 --- a/opensc.spec +++ b/opensc.spec @@ -5,32 +5,28 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.9.4 -Release: 3 -Summary: OpenSC SmartCard library and applications +Version: 0.9.6 +Release: 2 +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 -Patch1: %{name}-lvalue.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 @@ -40,17 +36,17 @@ Requires: %{plugindir} pinentry %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 -n pam_%{name} -Summary: OpenSC pluggable authentication module +Summary: Pluggable authentication module using smart cards Group: System Environment/Base Provides: %{name}-pam = %{version}-%{release} -Obsoletes: %{name}-pam < 0.9.4-3 +Obsoletes: %{name}-pam < 0.9.6-2 Requires: %{name} = %{version}-%{release} %description -n pam_%{name} -OpenSC pluggable authentication module implementing smart card support. +Pluggable authentication module implementing smart card support. %package devel Summary: OpenSC development files @@ -65,16 +61,14 @@ OpenSC development files. %prep %setup -q %patch0 -p0 -%patch1 -p0 cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . 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. 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 @@ -90,6 +84,7 @@ make %{?_smp_mflags} %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 @@ -97,9 +92,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/security/pam_opensc.so \ $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 @@ -115,8 +108,8 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -130,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT %{_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.* @@ -171,17 +164,22 @@ rm -rf $RPM_BUILD_ROOT %{_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ä - 0.9.6-2 +- 0.9.6, build patch applied upstream. +- Package summary and description improvements. +- Drop explicit openct dependency. + * Fri Mar 18 2005 Ville Skyttä - 0.9.4-3 - Fix FC4 build. - Rename opensc-pam to pam_opensc per package naming guidelines. diff --git a/sources b/sources index 082f91e..bd0727c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76c18fc9bd9fad9c45396ea81f317551 opensc-0.9.4.tar.gz +38fdd64566cc6fc83338d659e816b4fb opensc-0.9.6.tar.gz