diff --git a/.gitignore b/.gitignore index 28c7fc6..180a60c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ opencryptoki-2.3.1.tar.gz /opencryptoki-3.10.0.tar.gz /opencryptoki-3.11.0.tar.gz /opencryptoki-3.11.1.tar.gz +/opencryptoki-3.12.0.tar.gz diff --git a/opencryptoki-3.11.0-warn-user-not-in-pkcs11-group.patch b/opencryptoki-3.11.0-warn-user-not-in-pkcs11-group.patch deleted file mode 100644 index 756f55d..0000000 --- a/opencryptoki-3.11.0-warn-user-not-in-pkcs11-group.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up opencryptoki-3.11.0/usr/sbin/pkcsconf/pkcsconf.c.me opencryptoki-3.11.0/usr/sbin/pkcsconf/pkcsconf.c ---- opencryptoki-3.11.0/usr/sbin/pkcsconf/pkcsconf.c.me 2019-01-31 13:27:05.720647942 +0100 -+++ opencryptoki-3.11.0/usr/sbin/pkcsconf/pkcsconf.c 2019-01-31 13:36:05.763624633 +0100 -@@ -1072,6 +1072,9 @@ CK_RV init(void) - if (rc != CKR_OK) { - printf("Error initializing the PKCS11 library: 0x%lX (%s)\n", rc, - p11_get_ckr(rc)); -+ printf("Note: all non-root users that require access to PKCS#11 tokens " -+ "using opencryptoki must be assigned to the pkcs11 group to be " -+ "able to communicate with the pkcsslotd daemon.\n"); - fflush(stdout); - cleanup(); - } diff --git a/opencryptoki.spec b/opencryptoki.spec index 7fb7939..bcceccc 100644 --- a/opencryptoki.spec +++ b/opencryptoki.spec @@ -1,6 +1,6 @@ Name: opencryptoki Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11 -Version: 3.11.1 +Version: 3.12.0 Release: 1%{?dist} License: CPL URL: https://github.com/opencryptoki/opencryptoki @@ -12,9 +12,6 @@ Patch0: opencryptoki-3.11.0-group.patch # bz#1373833, change tmpfiles snippets from /var/lock/* to /run/lock/* Patch1: opencryptoki-3.11.0-lockdir.patch -# bz#1063763, inform the user that he is not in pkcs11 group -Patch2: opencryptoki-3.11.0-warn-user-not-in-pkcs11-group.patch - # Use --no-undefined to debug missing symbols #Patch100: %%{name}-3.2-no-undefined.patch @@ -312,6 +309,9 @@ fi %changelog +* Wed Nov 13 2019 Dan Horák - 3.12.0-1 +- Rebase to 3.12.0 + * Sun Sep 22 2019 Dan Horák - 3.11.1-1 - Rebase to 3.11.1 diff --git a/sources b/sources index d8e9e85..32783e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opencryptoki-3.11.1.tar.gz) = c3dbca34007d636f921f4066c98ba54127f2d94c578f06a527f6c26963dfc8014dee924ffbb6af01ef0629cde29007ec4a8ec19af084bb3ab3f83c2886a84787 +SHA512 (opencryptoki-3.12.0.tar.gz) = ba72ab36530d47e59a12846527eb7bf7f45f559e6d4ad1ad06585e0e1b55e1769f2b7d33a3e105399e0be362b27781bd5a9320cf9db3235a1125dff78452085a