diff --git a/.gitignore b/.gitignore index ef77be4..e530c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ opencryptoki-2.3.1.tar.gz /opencryptoki-3.5.tgz /opencryptoki-3.5.1.tgz /opencryptoki-3.6.2.tar.gz +/opencryptoki-3.7.0.tar.gz diff --git a/opencryptoki-2.4-group.patch b/opencryptoki-2.4-group.patch index d6ff327..dcabb60 100644 --- a/opencryptoki-2.4-group.patch +++ b/opencryptoki-2.4-group.patch @@ -1,7 +1,7 @@ -diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in ---- opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group 2015-08-27 11:35:42.759397175 +0200 -+++ opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in 2015-08-27 11:39:02.240023425 +0200 -@@ -338,9 +338,6 @@ +diff -upr opencryptoki-3.7.0.orig/usr/lib/pkcs11/api/shrd_mem.c.in opencryptoki-3.7.0/usr/lib/pkcs11/api/shrd_mem.c.in +--- opencryptoki-3.7.0.orig/usr/lib/pkcs11/api/shrd_mem.c.in 2017-05-17 15:13:54.711536688 +0530 ++++ opencryptoki-3.7.0/usr/lib/pkcs11/api/shrd_mem.c.in 2017-05-17 15:22:27.758655055 +0530 +@@ -56,9 +56,6 @@ attach_shared_memory() { int shmid; char *shmp; struct stat statbuf; @@ -11,7 +11,7 @@ diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/li #if !(MMAP) // Really should fstat the tok_path, since it will be the actual -@@ -352,37 +352,6 @@ attach_shared_memory() { +@@ -70,37 +67,6 @@ attach_shared_memory() { return NULL; } @@ -37,7 +37,7 @@ diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/li - if (epw) { - if (!strncmp(epw->pw_name, grp->gr_mem[i],strlen(epw->pw_name))) { - member = 1; -- break; +- break; - } - } - } @@ -45,7 +45,7 @@ diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/li - return NULL; - } - } -- +- Anchor->shm_tok = ftok(TOK_PATH,'b'); // Get the shared memory id. diff --git a/opencryptoki.spec b/opencryptoki.spec index 1f3f3bf..6f0b439 100644 --- a/opencryptoki.spec +++ b/opencryptoki.spec @@ -2,7 +2,7 @@ Name: opencryptoki Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11 -Version: 3.6.2 +Version: 3.7.0 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -24,6 +24,7 @@ BuildRequires: openldap-devel BuildRequires: autoconf automake libtool BuildRequires: bison flex BuildRequires: systemd +BuildRequires: libitm-devel %ifarch s390 s390x BuildRequires: libica-devel >= 2.3 %endif @@ -349,6 +350,10 @@ exit 0 %changelog +* Wed May 17 2017 Sinny Kumari - 3.7.0-1 +- Rebase to 3.7.0 +- Added libitm-devel as BuildRequires + * Mon Apr 03 2017 Sinny Kumari - 3.6.2-1 - Rebase to 3.6.2 - RHBZ#1424017 - opencryptoki: FTBFS in rawhide diff --git a/sources b/sources index b164a9f..e66c1f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opencryptoki-3.6.2.tar.gz) = f4bcc38d741ec369eaab8c86e2a75b1397e39d22fae4ef6fb163ea2ce384361b22168d5ed7e2677db609cea82f4c864957522a53ada94983327bb113051f32a6 +SHA512 (opencryptoki-3.7.0.tar.gz) = 396a684fbf4a564473349456b5a1cf39a559487da0948129fa93f25864ef2315c0344cd0415ec3b04a40633537a6b28c64acc300f51d71dcdc3c1fb5ed38c4d7