Author: qboosh Date: Mon Jun 20 15:45:03 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.4 - updated sh patch - added aep patch (missing includes) - added skip_post_check_so for modules
---- Files affected: packages/opencryptoki: opencryptoki-sh.patch (1.1 -> 1.2) , opencryptoki.spec (1.6 -> 1.7) , opencryptoki-aep.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/opencryptoki/opencryptoki-sh.patch diff -u packages/opencryptoki/opencryptoki-sh.patch:1.1 packages/opencryptoki/opencryptoki-sh.patch:1.2 --- packages/opencryptoki/opencryptoki-sh.patch:1.1 Sun Oct 10 07:59:51 2010 +++ packages/opencryptoki/opencryptoki-sh.patch Mon Jun 20 17:44:58 2011 @@ -1,13 +1,11 @@ ---- 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"]) +--- opencryptoki-2.4/configure.in.orig 2011-05-18 00:27:00.000000000 +0200 ++++ opencryptoki-2.4/configure.in 2011-06-19 20:21:06.992291554 +0200 +@@ -624,7 +624,7 @@ + CFLAGS="$CFLAGS -DPKCS64 -D_XOPEN_SOURCE=500" --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)\"' ++CFLAGS="$CFLAGS"' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\"' # At this point, CFLAGS is set to something sensible AC_PROG_CC ================================================================ Index: packages/opencryptoki/opencryptoki.spec diff -u packages/opencryptoki/opencryptoki.spec:1.6 packages/opencryptoki/opencryptoki.spec:1.7 --- packages/opencryptoki/opencryptoki.spec:1.6 Sat Feb 5 01:59:41 2011 +++ packages/opencryptoki/opencryptoki.spec Mon Jun 20 17:44:58 2011 @@ -2,15 +2,16 @@ Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 Summary(pl.UTF-8): Implementacja PKCS#11 (Cryptoki) v2.11 Name: opencryptoki -Version: 2.3.2 +Version: 2.4 Release: 1 License: CPL v0.5 Group: Applications/System -Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.bz2 -# Source0-md5: eada4c72c2563f2c9a1b44fc6d1856db +Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz +# Source0-md5: 1c834a4c7380a352319cb47b99fc6157 Patch0: %{name}-ica.patch Patch1: %{name}-sh.patch Patch2: %{name}-bcom.patch +Patch3: %{name}-aep.patch URL: http://opencryptoki.sourceforge.net/ BuildRequires: aep1000-devel BuildRequires: autoconf @@ -25,6 +26,8 @@ Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define skip_post_check_so .*%{_libdir}/opencryptoki/stdll/libpkcs11_.*\.so.* + %description The openCryptoki package implements the PKCS#11 version 2.11: Cryptographic Token Interface Standard (Cryptoki). @@ -64,6 +67,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -103,7 +107,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS COPYRIGHTS FAQ LICENSE README TODO doc/* +%doc AUTHORS COPYRIGHTS ChangeLog FAQ LICENSE README TODO doc/* %attr(755,root,root) %{_sbindir}/pkcs11_startup %attr(755,root,root) %{_sbindir}/pkcsconf %attr(755,root,root) %{_sbindir}/pkcs_slot @@ -161,6 +165,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2011/06/20 15:44:58 qboosh +- updated to 2.4 +- updated sh patch +- added aep patch (missing includes) +- added skip_post_check_so for modules + Revision 1.6 2011/02/05 00:59:41 sparky - corrected lang tag in Summary ================================================================ Index: packages/opencryptoki/opencryptoki-aep.patch diff -u /dev/null packages/opencryptoki/opencryptoki-aep.patch:1.1 --- /dev/null Mon Jun 20 17:45:03 2011 +++ packages/opencryptoki/opencryptoki-aep.patch Mon Jun 20 17:44:58 2011 @@ -0,0 +1,15 @@ +--- opencryptoki-2.4/usr/lib/pkcs11/aep_stdll/aeptok_api.c.orig 2011-05-18 00:27:00.000000000 +0200 ++++ opencryptoki-2.4/usr/lib/pkcs11/aep_stdll/aeptok_api.c 2011-06-19 20:39:06.422327697 +0200 +@@ -34,6 +34,12 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <string.h> ++ ++#include "pkcs11types.h" ++#include "defs.h" ++#include "host_defs.h" ++#include "h_extern.h" + + #include "aeptok_api.h" + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencryptoki/opencryptoki-sh.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencryptoki/opencryptoki.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
