Hello community,
here is the log from the commit of package openCryptoki for openSUSE:Factory
checked in at 2014-02-11 11:59:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openCryptoki (Old)
and /work/SRC/openSUSE:Factory/.openCryptoki.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openCryptoki"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openCryptoki/openCryptoki.changes
2013-12-13 11:59:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openCryptoki.new/openCryptoki.changes
2014-02-11 11:59:57.000000000 +0100
@@ -1,0 +2,37 @@
+Mon Feb 4 17:16:25 UTC 2014 - jjo...@suse.com
+
+- Updated to openCryptoki v3.1: See ChangeLog for complete details
+ (FATE#315426)
+ - opencryptoki-3.1
+ - New ep11 token to support IBM Crypto Express adpaters
+ (starting with Crypto Express 4S adapters) configured with
+ Enterprise PKCS#11(EP11) firmware. (FATE#315330)
+ - opencryptoki-3.0
+ - New opencryptoki.conf file to replace pk_config_data and
+ pkcs11_starup. The opencryptoki.conf contains slot entry
+ information for tokens.
+ - Removed pkcs_slot and pkcs11_startup shell scripts.
+ - ICA token supports CKM_DES_OFB64, CKM_DES_CFB8, CKM_DES_CFB6
+ mechanisms using 3DES keys. (FATE#315323)
+ - ICA token supports CKM_DES3_MAC and CKM_DES3_MAC_GENERAL
+ mechanisms. (FATE#315323)
+ - ICA token supports CKM_AES_OFB, CKM_AES_CFB8, CKM_AES_CFB64,
+ CKM_AES_CFB128, CKM_AES_MAC, and CKM_AES_MAC_GENERAL
+ mechanisms. (FATE#315323)
+ - opencryptoki-2.4.1 (21 Feb 2012)
+ - SHA256 support added for CCA token (FATE#315289)
+- Using insserv macros in %post, %preun and %postun sections
+- Cleaned up spec file
+- removed patches:
+ - ocki-2.2.6-PIN-backspace.patch
+- added patches:
+ - ocki-3.1-fix-implicit-decl.patch
+ - ocki-3.1-remove-make-install-chgrp-chmod.patch
+ - ocki-3.1-fix-init_d-path.patch
+
+-------------------------------------------------------------------
+Tue Feb 4 13:22:49 CET 2014 - r...@suse.de
+
+- add aarch64 to 64bit archs
+
+-------------------------------------------------------------------
Old:
----
ocki-2.2.6-PIN-backspace.patch
opencryptoki-2.2.6.tar.bz2
New:
----
ocki-3.1-fix-implicit-decl.patch
ocki-3.1-fix-init_d-path.patch
ocki-3.1-remove-make-install-chgrp-chmod.patch
opencryptoki-v3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openCryptoki.spec ++++++
--- /var/tmp/diff_new_pack.v8NJ60/_old 2014-02-11 11:59:58.000000000 +0100
+++ /var/tmp/diff_new_pack.v8NJ60/_new 2014-02-11 11:59:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openCryptoki
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,32 +19,37 @@
%define openCryptoki_32bit_arch %ix86 s390 ppc %arm
# support in the workings for: ppc64
# no support in sight for: ia64
-%define openCryptoki_64bit_arch s390x ppc64 ppc64le x86_64
+%define openCryptoki_64bit_arch s390x ppc64 ppc64le x86_64 aarch64
# autobuild:/work/cd/lib/misc/group
# openCryptoki pkcs11:x:64:
%define pkcs11_group_id 64
-%define oc_cvs_tag opencryptoki-%{version}
+%define oc_cvs_tag opencryptoki
Name: openCryptoki
+BuildRequires: bison
+BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libica
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: pwdutils
+BuildRequires: trousers-devel
Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM
Cryptographic Hardware
License: IPL-1.0
Group: Productivity/Security
-Version: 2.2.6
+Version: 3.1
Release: 0
# :pserver:anonym...@cvs.sourceforge.net:/cvsroot/opencryptoki
# cvs co -r openCryptoki-2-1-5 -d openCryptoki-2-1-5 .
-Source: %{oc_cvs_tag}.tar.bz2
+Source: %{oc_cvs_tag}-v%{version}.tar.bz2
Source1: openCryptoki.pkcsslotd
Source2: openCryptoki-TFAQ.html
-Patch1: ocki-2.2.6-PIN-backspace.patch
+Patch1: ocki-3.1-remove-make-install-chgrp-chmod.patch
+Patch2: ocki-3.1-fix-init_d-path.patch
+Patch3: ocki-3.1-fix-implicit-decl.patch
Url:
http://oss.software.ibm.com/developerworks/opensource/opencryptoki
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: /usr/sbin/groupadd /usr/bin/id /usr/sbin/usermod /bin/sed
+PreReq: /usr/sbin/groupadd /usr/bin/id /usr/sbin/usermod /bin/sed
%insserv_prereq
# IBM maintains openCryptoki on these architectures:
ExclusiveArch: %openCryptoki_32bit_arch %openCryptoki_64bit_arch
#
@@ -119,12 +124,14 @@
%prep
%setup -q -n %{oc_cvs_tag}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp %{SOURCE2} .
-%patch1
%build
autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -D__USE_BSD" ./configure --prefix=/usr
--libdir=%{_libdir} --enable-tpmtok
+CFLAGS="$RPM_OPT_FLAGS -D__USE_BSD" ./configure --prefix=/usr
--libdir=%{_libdir} --enable-tpmtok --sysconfdir=%{_sysconfdir}
--localstatedir=%{_localstatedir}
make
%install
@@ -154,6 +161,9 @@
s/^,//
'),pkcs11 root
+%preun
+%{stop_on_removal pkcsslotd}
+
%post
# Symlink from /var/lib/opencryptoki to /etc/pkcs11
if [ ! -L %{_sysconfdir}/pkcs11 ] ; then
@@ -164,11 +174,15 @@
fi
fi
/sbin/ldconfig
+%{fillup_and_insserv -f pkcsslotd}
%postun
if [ -L %{_sysconfdir}/pkcs11 ] ; then
rm %{_sysconfdir}/pkcs11
fi
+%{restart_on_update pkcsslotd}
+%{insserv_cleanup}
+
%ifarch %openCryptoki_32bit_arch
%postun 32bit
@@ -202,16 +216,26 @@
%defattr(-,root,root)
%doc openCryptoki-TFAQ.html
# configuration directory
-%dir %attr(755,root,pkcs11) /var/lib/opencryptoki
+%dir /etc/opencryptoki
+%config /etc/opencryptoki/opencryptoki.conf
/etc/init.d/pkcsslotd
/usr/sbin/rcpkcsslotd
# utilities
/usr/sbin/pkcsslotd
-/usr/sbin/pkcs11_startup
/usr/sbin/pkcsconf
-/usr/sbin/pkcs_slot
%dir %{_libdir}/opencryptoki
%dir %{_libdir}/opencryptoki/stdll
+ # State and lock directories
+%dir %attr(755,root,pkcs11) %{_localstatedir}/lib/opencryptoki
+%dir %attr(770,root,pkcs11) %{_localstatedir}/lib/opencryptoki/ccatok
+%dir %attr(770,root,pkcs11) %{_localstatedir}/lib/opencryptoki/ccatok/TOK_OBJ
+%dir %attr(770,root,pkcs11) %{_localstatedir}/lib/opencryptoki/swtok
+%dir %attr(770,root,pkcs11) %{_localstatedir}/lib/opencryptoki/swtok/TOK_OBJ
+%dir %attr(770,root,pkcs11) %{_localstatedir}/lib/opencryptoki/tpm
+%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki
+%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/ccatok
+%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/swtok
+%ghost %dir %attr(770,root,pkcs11) %{_localstatedir}/lock/opencryptoki/tpm
%{_mandir}/man*/*
%files devel
@@ -231,8 +255,12 @@
%ghost %{_libdir}/opencryptoki/PKCS11_API.so
%{_libdir}/opencryptoki/*.0
%ifnarch s390 s390x
+%{_libdir}/opencryptoki/stdll/libpkcs11_cca.so
%{_libdir}/opencryptoki/stdll/libpkcs11_sw.so
+%{_libdir}/opencryptoki/stdll/libpkcs11_tpm.so
+%ghost %{_libdir}/opencryptoki/stdll/PKCS11_CCA.so
%ghost %{_libdir}/opencryptoki/stdll/PKCS11_SW.so
+%ghost %{_libdir}/opencryptoki/stdll/PKCS11_TPM.so
%else
%{_libdir}/opencryptoki/stdll/libpkcs11_ica.so
%ghost %{_libdir}/opencryptoki/stdll/PKCS11_ICA.so
@@ -242,8 +270,6 @@
%ghost %{_libdir}/pkcs11/stdll
%ghost %{_libdir}/pkcs11/methods
%{_libdir}/pkcs11/*.so
-# %{_libdir}/libopencryptoki.so
-# %{_libdir}/libopencryptoki.so.0
%{_sysconfdir}/ld.so.conf.d/*
%endif
%ifarch %openCryptoki_64bit_arch
@@ -257,8 +283,6 @@
%{_libdir}/opencryptoki/stdll/*.so
%{_libdir}/opencryptoki/stdll/*.0
%{_libdir}/pkcs11
-# %{_libdir}/libopencryptoki.so
-# %{_libdir}/libopencryptoki.so.0
%{_sysconfdir}/ld.so.conf.d/*
%endif
++++++ ocki-3.1-fix-implicit-decl.patch ++++++
--- opencryptoki.orig/usr/lib/pkcs11/common/loadsave.c 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/common/loadsave.c 2014-01-31
10:56:26.377812000 -0700
@@ -287,6 +287,9 @@
//
//
+/* _GNU_SOURCE necessary for asprintf */
+#define _GNU_SOURCE
+
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
--- opencryptoki.orig/usr/lib/pkcs11/common/mech_rng.c 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/common/mech_rng.c 2014-01-31
11:00:30.004283000 -0700
@@ -301,6 +301,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <unistd.h>
#include "pkcs11types.h"
--- opencryptoki.orig/usr/sbin/pkcsslotd/garbage_linux.c 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/sbin/pkcsslotd/garbage_linux.c 2014-01-31
11:03:14.422314000 -0700
@@ -294,6 +294,7 @@
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
+#include <unistd.h>
#include "log.h"
#include "slotmgr.h"
--- opencryptoki.orig/usr/sbin/pkcsslotd/mutex.c 2014-01-31
11:08:15.000000000 -0700
+++ opencryptoki/usr/sbin/pkcsslotd/mutex.c 2014-01-31 11:08:25.929081000
-0700
@@ -293,6 +293,9 @@
#include <sys/types.h>
#include <sys/file.h>
#include <grp.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <unistd.h>
#include "log.h"
#include "slotmgr.h"
--- opencryptoki.orig/usr/sbin/pkcsslotd/slotmgr.c 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/sbin/pkcsslotd/slotmgr.c 2014-01-31 11:12:08.708122000
-0700
@@ -292,6 +292,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
#include "log.h"
#include "slotmgr.h"
--- opencryptoki.orig/usr/lib/pkcs11/tpm_stdll/tpm_specific.c 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/tpm_stdll/tpm_specific.c 2014-01-31
11:16:45.158228000 -0700
@@ -31,6 +31,9 @@
*
*/
+#define _GNU_SOURCE
+#include <stdio.h>
+
#include <pthread.h>
#include <string.h>
#include <stdlib.h>
++++++ ocki-3.1-fix-init_d-path.patch ++++++
--- opencryptoki.orig/misc/Makefile.am 2014-01-27 15:01:57.000000000 -0700
+++ opencryptoki/misc/Makefile.am 2014-01-31 09:15:15.816980000 -0700
@@ -11,7 +11,7 @@ pkcsslotd.service: pkcsslotd.service.in
@SED@ -e s!\@sbindir\@!"@sbindir@"!g < $< > $@-t
mv $@-t $@
else
-initddir = $(sysconfdir)/rc.d/init.d
+initddir = $(sysconfdir)/init.d
initd_SCRIPTS = pkcsslotd
CLEANFILES = pkcsslotd
++++++ ocki-3.1-remove-make-install-chgrp-chmod.patch ++++++
--- opencryptoki.orig/usr/lib/pkcs11/soft_stdll/Makefile.am 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/soft_stdll/Makefile.am 2014-01-31
08:15:21.781145000 -0700
@@ -54,13 +54,7 @@ install-data-hook:
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
ln -sf libpkcs11_sw.so PKCS11_SW.so
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
- $(CHGRP) pkcs11
$(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
- $(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
- $(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
$(MKDIR_P) $(DESTDIR)$(lockdir)/swtok
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/swtok
- $(CHMOD) 0770 $(DESTDIR)$(lockdir)/swtok
uninstall-hook:
if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
--- opencryptoki.orig/usr/lib/pkcs11/tpm_stdll/Makefile.am 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/tpm_stdll/Makefile.am 2014-01-31
08:20:37.999866000 -0700
@@ -69,11 +69,7 @@ install-data-hook:
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
ln -sf libpkcs11_tpm.so PKCS11_TPM.so
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
- $(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
$(MKDIR_P) $(DESTDIR)$(lockdir)/tpm
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/tpm
- $(CHMOD) 0770 $(DESTDIR)$(lockdir)/tpm
uninstall-hook:
if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
--- opencryptoki.orig/usr/lib/pkcs11/cca_stdll/Makefile.am 2014-01-27
15:01:58.000000000 -0700
+++ opencryptoki/usr/lib/pkcs11/cca_stdll/Makefile.am 2014-01-31
08:30:51.030956000 -0700
@@ -66,13 +66,7 @@ install-data-hook:
cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
ln -sf libpkcs11_cca.so PKCS11_CCA.so
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
- $(CHGRP) pkcs11
$(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
- $(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
- $(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
$(MKDIR_P) $(DESTDIR)$(lockdir)/ccatok
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/ccatok
- $(CHMOD) 0770 $(DESTDIR)$(lockdir)/ccatok
uninstall-hook:
if test -d $(DESTDIR)/$(libdir)/opencryptoki/stdll; then \
--- opencryptoki.orig/usr/Makefile.am 2014-01-27 15:01:58.000000000 -0700
+++ opencryptoki/usr/Makefile.am 2014-01-31 08:33:02.949361000 -0700
@@ -6,5 +6,3 @@ SUBDIRS = lib $(DAEMONDIRS)
install-data-hook:
$(MKDIR_P) $(DESTDIR)$(lockdir)
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)
- $(CHMOD) 0770 $(DESTDIR)$(lockdir)
++++++ openCryptoki.pkcsslotd ++++++
--- /var/tmp/diff_new_pack.v8NJ60/_old 2014-02-11 11:59:58.000000000 +0100
+++ /var/tmp/diff_new_pack.v8NJ60/_new 2014-02-11 11:59:58.000000000 +0100
@@ -18,6 +18,7 @@
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Description: Start the pkcsslotd daemon
+# Short-Description: Start the pkcsslotd daemon
### END INIT INFO
. /etc/rc.status
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
