rpms/opencryptoki
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to opencryptoki-3.7.0

Browse Source
This commit is contained in:
Sinny Kumari 2017-05-17 16:27:12 +05:30
parent f121ddef95
commit 9cad4f6c1c
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ opencryptoki-2.3.1.tar.gz
/opencryptoki-3.5.tgz /opencryptoki-3.5.tgz
/opencryptoki-3.5.1.tgz /opencryptoki-3.5.1.tgz
/opencryptoki-3.6.2.tar.gz /opencryptoki-3.6.2.tar.gz
/opencryptoki-3.7.0.tar.gz

14
opencryptoki-2.4-group.patch
View File

@ -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 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/usr/lib/pkcs11/api/shrd_mem.c.in.group 2015-08-27 11:35:42.759397175 +0200 --- opencryptoki-3.7.0.orig/usr/lib/pkcs11/api/shrd_mem.c.in 2017-05-17 15:13:54.711536688 +0530
+++ opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in 2015-08-27 11:39:02.240023425 +0200 +++ opencryptoki-3.7.0/usr/lib/pkcs11/api/shrd_mem.c.in 2017-05-17 15:22:27.758655055 +0530
@@ -338,9 +338,6 @@ @@ -56,9 +56,6 @@ attach_shared_memory() {
int shmid; int shmid;
char *shmp; char *shmp;
struct stat statbuf; struct stat statbuf;
@ -11,7 +11,7 @@ diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/li
#if !(MMAP) #if !(MMAP)
// Really should fstat the tok_path, since it will be the actual // 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; return NULL;
} }
@ -37,7 +37,7 @@ diff -up opencryptoki/usr/lib/pkcs11/api/shrd_mem.c.in.group opencryptoki/usr/li
- if (epw) { - if (epw) {
- if (!strncmp(epw->pw_name, grp->gr_mem[i],strlen(epw->pw_name))) { - if (!strncmp(epw->pw_name, grp->gr_mem[i],strlen(epw->pw_name))) {
- member = 1; - 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; - return NULL;
- } - }
- } - }
- -
Anchor->shm_tok = ftok(TOK_PATH,'b'); Anchor->shm_tok = ftok(TOK_PATH,'b');
// Get the shared memory id. // Get the shared memory id.

7
opencryptoki.spec
View File

@ -2,7 +2,7 @@
Name: opencryptoki Name: opencryptoki
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11 Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
Version: 3.6.2 Version: 3.7.0
Release: 1%{?dist} Release: 1%{?dist}
License: CPL License: CPL
Group: System Environment/Base Group: System Environment/Base
@ -24,6 +24,7 @@ BuildRequires: openldap-devel
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: bison flex BuildRequires: bison flex
BuildRequires: systemd BuildRequires: systemd
BuildRequires: libitm-devel
%ifarch s390 s390x %ifarch s390 s390x
BuildRequires: libica-devel >= 2.3 BuildRequires: libica-devel >= 2.3
%endif %endif
@ -349,6 +350,10 @@ exit 0
%changelog %changelog
* Wed May 17 2017 Sinny Kumari <sinny@redhat.com> - 3.7.0-1
- Rebase to 3.7.0
- Added libitm-devel as BuildRequires
* Mon Apr 03 2017 Sinny Kumari <sinny@redhat.com> - 3.6.2-1 * Mon Apr 03 2017 Sinny Kumari <sinny@redhat.com> - 3.6.2-1
- Rebase to 3.6.2 - Rebase to 3.6.2
- RHBZ#1424017 - opencryptoki: FTBFS in rawhide - RHBZ#1424017 - opencryptoki: FTBFS in rawhide

2
sources
View File

@ -1 +1 @@
SHA512 (opencryptoki-3.6.2.tar.gz) = f4bcc38d741ec369eaab8c86e2a75b1397e39d22fae4ef6fb163ea2ce384361b22168d5ed7e2677db609cea82f4c864957522a53ada94983327bb113051f32a6 SHA512 (opencryptoki-3.7.0.tar.gz) = 396a684fbf4a564473349456b5a1cf39a559487da0948129fa93f25864ef2315c0344cd0415ec3b04a40633537a6b28c64acc300f51d71dcdc3c1fb5ed38c4d7