Author: qboosh Date: Sat Mar 19 12:46:35 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.1.7 - removed outdated qt3 patch - added pcsc patch for pcsc-lite 1.6+, openssl patch for openssl 1.0.0+ - muscletool and XCardII are separate packages now
---- Files affected: packages/muscleframework: muscleframework.spec (1.12 -> 1.13) , muscleframework-openssl.patch (NONE -> 1.1) (NEW), muscleframework-pcsc.patch (NONE -> 1.1) (NEW), muscleframework-qt3.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/muscleframework/muscleframework.spec diff -u packages/muscleframework/muscleframework.spec:1.12 packages/muscleframework/muscleframework.spec:1.13 --- packages/muscleframework/muscleframework.spec:1.12 Tue Feb 13 08:16:49 2007 +++ packages/muscleframework/muscleframework.spec Sat Mar 19 13:46:30 2011 @@ -2,20 +2,23 @@ Summary: MuscleCard PKCS#11 Framework Summary(pl.UTF-8): Szkielet MuscleCard PKCS#11 Name: muscleframework -Version: 1.1.3 -Release: 2 +Version: 1.1.7 +Release: 1 Epoch: 1 License: BSD Group: Applications -Source0: http://www.musclecard.com/musclecard/files/%{name}-%{version}.tar.gz -# Source0-md5: def0af167d56e3c6181edb626e6e34d7 -Patch0: %{name}-qt3.patch -Patch1: %{name}-cryptoflex.patch +#Source0Download: https://alioth.debian.org/frs/?group_id=30111 +Source0: https://alioth.debian.org/frs/download.php/3056/%{name}-%{version}.tar.gz +# Source0-md5: 5dcce65c60d35d9dfa9e10cc7ce7f72e +#Patch0: %{name}-qt3.patch +Patch0: %{name}-cryptoflex.patch +Patch1: %{name}-pcsc.patch +Patch2: %{name}-openssl.patch URL: http://www.musclecard.com/musclecard/index.html -BuildRequires: openssl-devel >= 0.9.7d +BuildRequires: libmusclecard-devel +BuildRequires: openssl-devel >= 1.0.0 BuildRequires: pam-devel BuildRequires: pcsc-lite-devel >= 1.1.1 -BuildRequires: qt-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -62,20 +65,6 @@ %description -n pam-pam_musclecard -l pl.UTF-8 Moduł PAM dla szkieletu MuscleCard. -%package tools -Summary: MuscleTool - personalization tool for smartcards -Summary(pl.UTF-8): MuscleTool - narzędzie do personalizacji kart procesorowych -Group: Applications -Requires: pcsc-lite - -%description tools -MuscleTool - command line personalization tool for MuscleCard enabled -smartcards. - -%description tools -l pl.UTF-8 -MuscleTool - działające z linii poleceń narzędzie do personalizacji -kart procesorowych obsługiwanych przez środowisko MuscleCard. - %package pkcs11 Summary: PKCS#11 library Summary(pl.UTF-8): Biblioteka PKCS#11 @@ -92,6 +81,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki PKCS#11 Group: Development/Libraries Requires: %{name}-pkcs11 = %{version}-%{release} +Requires: libmusclecard-devel +Requires: pcsc-lite-devel %description pkcs11-devel PKCS#11 library header files. @@ -111,51 +102,33 @@ %description pkcs11-static -l pl.UTF-8 Statyczna biblioteka PKCS#11. -%package xcard -Summary: XCardII - graphical smartcard administration tool -Summary(pl.UTF-8): XCardII - graficzne narzędzie do administrowania kartami procesorowymi -Group: X11/Applications -Requires: pcsc-lite - -%description xcard -XCardII - graphical smartcard administration tool. - -%description xcard -l pl.UTF-8 -XCardII - graficzne narzędzie do administrowania kartami -procesorowymi. - %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +ln README README.muscleframework +find CFlexPlugin/src/slbCryptoflex.bundle -name '*.orig' | xargs %{__rm} %build cd CFlexPlugin -%configure2_13 +%configure %{__make} cd ../MCardPlugin -%configure2_13 +%configure %{__make} cd ../MusclePAM %{__make} \ CC="%{__cc} %{rpmcflags} -fPIC" -cd ../MuscleTools -%{__make} \ - CC="%{__cc} %{rpmcflags}" - -cd ../PKCS11 -%configure2_13 +cd ../libmusclepkcs11 +%configure \ + --includedir=%{_includedir}/libmusclepkcs11 %{__make} -cd ../XCardII/src -%{__make} \ - CPP="%{__cxx} %{rpmcflags} -fPIC -Wall -I/usr/X11R6/include/qt" \ - LIBS="-L/usr/X11R6/lib -lqt -lpcsclite -lpthread" \ - MOC=moc - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/pcsc/services @@ -174,16 +147,9 @@ install MusclePAM/pam_musclecard.so $RPM_BUILD_ROOT/%{_lib}/security install MusclePAM/pam-muscle.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} -install MuscleTools/muscleTool $RPM_BUILD_ROOT%{_bindir} -install MuscleTools/man/muscleTool.1 $RPM_BUILD_ROOT%{_mandir}/man1 - -%{__make} -C PKCS11 install \ +%{__make} -C libmusclepkcs11 install \ DESTDIR=$RPM_BUILD_ROOT -install XCardII/src/xcard $RPM_BUILD_ROOT%{_bindir} -install XCardII/man/xcard.1 $RPM_BUILD_ROOT%{_mandir}/man1 - %clean rm -rf $RPM_BUILD_ROOT @@ -192,7 +158,7 @@ %files -n pcsc-service-cryptoflex %defattr(644,root,root,755) -%doc CFlexPlugin/{AUTHORS,COPYING,ChangeLog,NEWS,README} +%doc CFlexPlugin/{AUTHORS,COPYING,ChangeLog,ChangeLog.svn,NEWS,README} README.muscleframework %dir %{_libdir}/pcsc/services/slbCryptoflex.bundle %dir %{_libdir}/pcsc/services/slbCryptoflex.bundle/Contents %{_libdir}/pcsc/services/slbCryptoflex.bundle/Contents/Info.plist @@ -202,7 +168,7 @@ %files -n pcsc-service-musclecard %defattr(644,root,root,755) -%doc MCardPlugin/{AUTHORS,COPYING,ChangeLog,NEWS,README} +%doc MCardPlugin/{AUTHORS,COPYING,ChangeLog,ChangeLog.svn,NEWS,README} README.muscleframework %dir %{_libdir}/pcsc/services/mscMuscleCard.bundle %dir %{_libdir}/pcsc/services/mscMuscleCard.bundle/Contents %{_libdir}/pcsc/services/mscMuscleCard.bundle/Contents/Info.plist @@ -212,36 +178,25 @@ %files -n pam-pam_musclecard %defattr(644,root,root,755) -%doc MusclePAM/{LICENSE,README} +%doc MusclePAM/{COPYING,ChangeLog.svn,README} README.muscleframework %attr(755,root,root) /%{_lib}/security/pam_musclecard.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pam-muscle.conf -%files tools -%defattr(644,root,root,755) -%doc MuscleTools/{COPYING,README} -%attr(755,root,root) %{_bindir}/muscleTool -%{_mandir}/man1/muscleTool.1* - %files pkcs11 %defattr(644,root,root,755) -%doc PKCS11/{AUTHORS,COPYING,ChangeLog,NEWS,README} -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%doc libmusclepkcs11/{AUTHORS,COPYING,ChangeLog,ChangeLog.svn,NEWS,README} README.muscleframework +%attr(755,root,root) %{_libdir}/libmusclepkcs11.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libmusclepkcs11.so.0 %files pkcs11-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la -%{_includedir}/*.h +%attr(755,root,root) %{_libdir}/libmusclepkcs11.so +%{_libdir}/libmusclepkcs11.la +%{_includedir}/libmusclepkcs11 %files pkcs11-static %defattr(644,root,root,755) -%{_libdir}/lib*.a - -%files xcard -%defattr(644,root,root,755) -%doc XCardII/{COPYING,README} -%attr(755,root,root) %{_bindir}/xcard -%{_mandir}/man1/xcard.1* +%{_libdir}/libmusclepkcs11.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -249,6 +204,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2011/03/19 12:46:30 qboosh +- updated to 1.1.7 +- removed outdated qt3 patch +- added pcsc patch for pcsc-lite 1.6+, openssl patch for openssl 1.0.0+ +- muscletool and XCardII are separate packages now + Revision 1.12 2007/02/13 07:16:49 glen - tabs in preamble ================================================================ Index: packages/muscleframework/muscleframework-openssl.patch diff -u /dev/null packages/muscleframework/muscleframework-openssl.patch:1.1 --- /dev/null Sat Mar 19 13:46:35 2011 +++ packages/muscleframework/muscleframework-openssl.patch Sat Mar 19 13:46:30 2011 @@ -0,0 +1,20 @@ +--- muscleframework-1.1.7/MusclePAM/pam_smartcard.c.orig 2009-06-24 16:12:56.000000000 +0200 ++++ muscleframework-1.1.7/MusclePAM/pam_smartcard.c 2011-03-19 12:52:02.341347580 +0100 +@@ -142,7 +142,7 @@ + EVP_PKEY *pubkey; + int index, rv; + X509 *tmpCert, *rootCert; +- STACK *emlst; ++ STACK_OF(OPENSSL_STRING) *emlst; + char *userid; + char *p; + +@@ -155,7 +155,7 @@ + return PAM_AUTHINFO_UNAVAIL; + } + +- emlst = (STACK *) X509_get1_email(tmpCert); ++ emlst = X509_get1_email(tmpCert); + + for (index = 0, p = sk_value(emlst,0); + *p && index < MAX_USERNAME_LEN; ================================================================ Index: packages/muscleframework/muscleframework-pcsc.patch diff -u /dev/null packages/muscleframework/muscleframework-pcsc.patch:1.1 --- /dev/null Sat Mar 19 13:46:35 2011 +++ packages/muscleframework/muscleframework-pcsc.patch Sat Mar 19 13:46:30 2011 @@ -0,0 +1,26 @@ +--- muscleframework-1.1.7/CFlexPlugin/src/cryptoflex.c.orig 2009-06-24 13:22:26.000000000 +0200 ++++ muscleframework-1.1.7/CFlexPlugin/src/cryptoflex.c 2011-03-19 11:47:27.369351770 +0100 +@@ -3001,8 +3001,10 @@ + return MSC_TOKEN_REMOVED; + case SCARD_W_RESET_CARD: + return MSC_TOKEN_RESET; ++#ifdef SCARD_W_INSERTED_CARD + case SCARD_W_INSERTED_CARD: + return MSC_TOKEN_INSERTED; ++#endif + case SCARD_E_NO_SERVICE: + return MSC_SERVICE_UNRESPONSIVE; + case SCARD_E_UNKNOWN_CARD: +--- muscleframework-1.1.7/MCardPlugin/src/musclecardApplet.c.orig 2008-05-31 18:24:34.000000000 +0200 ++++ muscleframework-1.1.7/MCardPlugin/src/musclecardApplet.c 2011-03-19 12:04:27.669350932 +0100 +@@ -2185,8 +2185,10 @@ + return MSC_TOKEN_REMOVED; + case SCARD_W_RESET_CARD: + return MSC_TOKEN_RESET; ++#ifdef SCARD_W_INSERTED_CARD + case SCARD_W_INSERTED_CARD: + return MSC_TOKEN_INSERTED; ++#endif + case SCARD_E_NO_SERVICE: + return MSC_SERVICE_UNRESPONSIVE; + case SCARD_E_UNKNOWN_CARD: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/muscleframework/muscleframework.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
