packages: opencryptoki/opencryptoki.spec, opencryptoki/opencryptoki-bcom.pa...

qboosh qboosh at pld-linux.org
Sun Oct 10 07:59:56 CEST 2010 

Author: qboosh                       Date: Sun Oct 10 05:59:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.3.2
- added sh,bcom patches
- ica driver now requires libica 2 (available only for zSeries)

---- Files affected:
packages/opencryptoki:
   opencryptoki.spec (1.3 -> 1.4) , opencryptoki-bcom.patch (NONE -> 1.1)  (NEW), opencryptoki-sh.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opencryptoki/opencryptoki.spec
diff -u packages/opencryptoki/opencryptoki.spec:1.3 packages/opencryptoki/opencryptoki.spec:1.4
--- packages/opencryptoki/opencryptoki.spec:1.3	Tue Aug 26 21:15:08 2008
+++ packages/opencryptoki/opencryptoki.spec	Sun Oct 10 07:59:51 2010
@@ -2,17 +2,24 @@
 Summary:	An Implementation of PKCS#11 (Cryptoki) v2.11
 Summary(pl.UTF-8):	Implementacja PKCS#11 (Cryptoki) v2.11
 Name:		opencryptoki
-Version:	2.2.6
+Version:	2.3.2
 Release:	1
 License:	CPL v0.5
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz
-# Source0-md5:	755f2f605298094205ec1263ba3c3c16
+Source0:	http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.bz2
+# Source0-md5:	eada4c72c2563f2c9a1b44fc6d1856db
 Patch0:		%{name}-ica.patch
+Patch1:		%{name}-sh.patch
+Patch2:		%{name}-bcom.patch
 URL:		http://opencryptoki.sourceforge.net/
 BuildRequires:	aep1000-devel
+BuildRequires:	autoconf
+BuildRequires:	automake >= 1.6
 BuildRequires:	bcm5820-devel
-BuildRequires:	libica-devel
+%ifarch s390 s390x
+BuildRequires:	libica-devel >= 2.0
+%endif
+BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	trousers-devel >= 0.2.9
 Requires:	%{name}-libs = %{version}-%{release}
@@ -44,6 +51,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki openCryptoki
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	opencryptoki-static
 
 %description devel
 Header files for openCryptoki library.
@@ -51,30 +59,30 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki openCryptoki.
 
-%package static
-Summary:	Static openCryptoki library
-Summary(pl.UTF-8):	Statyczna biblioteka openCryptoki
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static openCryptoki library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka openCryptoki.
-
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-	--enable-static \
 	--disable-crtok \
+%ifarch s390 s390x
+	--enable-ccatok \
 	--enable-icatok \
+%else
+	--disable-ccatok \
+	--disable-icatok \
+%endif
 	--enable-tpmtok
 # icctok (PCICC) not supported on Linux (only AIX, Windows, z/OS, OS/390)
 # crtok requires some weird library (libsocketarmor + typhoon.h) - not found
+# pkcscca_migrate requires xcryptolinz (IBM proprietary, zSeries only)
 
 %{__make}
 
@@ -85,7 +93,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	initdir=/etc/rc.d/init.d
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/opencryptoki/stdll/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/opencryptoki/stdll/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,21 +117,26 @@
 %{_mandir}/man5/pk_config_data.5*
 %{_mandir}/man7/opencryptoki.7*
 %{_mandir}/man8/pkcsslotd.8*
-%ifnarch s390 s390x
+# swtok
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_sw.so*
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_SW.so
-%endif
 # aep
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_aep.so*
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_AEP.so
 # bc
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_bc.so*
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_BC.so
+%ifarch s390 s390x
+# cca
+%attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_cca.so*
+%attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_CCA.so
 # ica
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_ica.so*
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_ICA.so
+%endif
 # tpm
 %attr(755,root,root) %{_libdir}/opencryptoki/stdll/libpkcs11_tpm.so*
+%attr(755,root,root) %{_libdir}/opencryptoki/stdll/PKCS11_TPM.so
 
 %files libs
 %defattr(644,root,root,755)
@@ -142,16 +155,17 @@
 %{_libdir}/opencryptoki/libopencryptoki.la
 %{_includedir}/opencryptoki
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/opencryptoki/libopencryptoki.a
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/10/10 05:59:51  qboosh
+- updated to 2.3.2
+- added sh,bcom patches
+- ica driver now requires libica 2 (available only for zSeries)
+
 Revision 1.3  2008/08/26 19:15:08  qboosh
 - updated to 2.2.6
 

================================================================
Index: packages/opencryptoki/opencryptoki-bcom.patch
diff -u /dev/null packages/opencryptoki/opencryptoki-bcom.patch:1.1
--- /dev/null	Sun Oct 10 07:59:56 2010
+++ packages/opencryptoki/opencryptoki-bcom.patch	Sun Oct 10 07:59:51 2010
@@ -0,0 +1,11 @@
+--- opencryptoki-2.3.2/configure.in.orig	2010-10-09 21:43:05.827741882 +0200
++++ opencryptoki-2.3.2/configure.in	2010-10-09 23:12:37.735734339 +0200
+@@ -597,7 +597,7 @@
+ else
+ 	enable_bcomtok=no
+ fi
+-AM_CONDITIONAL([ENABLE_BCOMTOK], [test "x$enable_bcom" = "xyes"])
++AM_CONDITIONAL([ENABLE_BCOMTOK], [test "x$enable_bcomtok" = "xyes"])
+ 
+ dnl --- enable_crtok
+ if test "x$enable_crtok" = "xyes"; then

================================================================
Index: packages/opencryptoki/opencryptoki-sh.patch
diff -u /dev/null packages/opencryptoki/opencryptoki-sh.patch:1.1
--- /dev/null	Sun Oct 10 07:59:56 2010
+++ packages/opencryptoki/opencryptoki-sh.patch	Sun Oct 10 07:59:51 2010
@@ -0,0 +1,13 @@
+--- opencryptoki-2.3.2/configure.in.orig	2010-07-29 14:28:41.000000000 +0200
++++ opencryptoki-2.3.2/configure.in	2010-10-09 21:42:12.111734339 +0200
+@@ -628,9 +628,7 @@
+ AM_CONDITIONAL([ENABLE_PKCSCCA_MIGRATE], [test "x$enable_pkcscca_migrate" = "xyes"])
+ 
+ 
+-CFLAGS="$CFLAGS $DEBUG_CFLAGS -DPKCS64 -D_XOPEN_SOURCE=500"
+-
+-CFLAGS+=' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\"'
++CFLAGS="$CFLAGS $DEBUG_CFLAGS -DPKCS64 -D_XOPEN_SOURCE=500 "'-DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\"'
+ 
+ # At this point, CFLAGS is set to something sensible
+ AC_PROG_CC
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencryptoki/opencryptoki.spec?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list