drop unnecessary opencryptoki-3.11.0-group.patch, problem with root run all the pkcs11 commands
without the need to be a member of the pkcs11 group was fixed long ago
This commit is contained in:
parent
bca00e7abd
commit
4d69833004
@ -1,31 +0,0 @@
|
|||||||
diff -up opencryptoki-3.11.0/usr/lib/api/shrd_mem.c.in.me opencryptoki-3.11.0/usr/lib/api/shrd_mem.c.in
|
|
||||||
--- opencryptoki-3.11.0/usr/lib/api/shrd_mem.c.in.me 2019-01-31 10:42:23.325797012 +0100
|
|
||||||
+++ opencryptoki-3.11.0/usr/lib/api/shrd_mem.c.in 2019-01-31 10:52:17.585191667 +0100
|
|
||||||
@@ -55,9 +55,11 @@ void *attach_shared_memory()
|
|
||||||
int shmid;
|
|
||||||
char *shmp;
|
|
||||||
struct stat statbuf;
|
|
||||||
+#if 0
|
|
||||||
struct group *grp;
|
|
||||||
struct passwd *pw, *epw;
|
|
||||||
uid_t uid, euid;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if !(MMAP)
|
|
||||||
// Really should fstat the tok_path, since it will be the actual
|
|
||||||
@@ -69,6 +71,7 @@ void *attach_shared_memory()
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if 0
|
|
||||||
uid = getuid();
|
|
||||||
euid = geteuid();
|
|
||||||
// only check group membership if not root user
|
|
||||||
@@ -102,6 +105,7 @@ void *attach_shared_memory()
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
Anchor->shm_tok = ftok(TOK_PATH, 'b');
|
|
||||||
|
|
@ -19,3 +19,14 @@ diff -up opencryptoki-3.18.0/Makefile.am.me opencryptoki-3.18.0/Makefile.am
|
|||||||
endif
|
endif
|
||||||
$(MKDIR_P) $(DESTDIR)/etc/ld.so.conf.d
|
$(MKDIR_P) $(DESTDIR)/etc/ld.so.conf.d
|
||||||
echo "$(libdir)/opencryptoki" >\
|
echo "$(libdir)/opencryptoki" >\
|
||||||
|
diff -up opencryptoki-3.20.0/Makefile.am.me opencryptoki-3.20.0/Makefile.am
|
||||||
|
--- opencryptoki-3.20.0/Makefile.am.me 2023-02-13 17:23:17.263189936 +0100
|
||||||
|
+++ opencryptoki-3.20.0/Makefile.am 2023-02-13 17:24:22.743815752 +0100
|
||||||
|
@@ -39,7 +39,6 @@ include tools/tools.mk
|
||||||
|
include doc/doc.mk
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
- getent group pkcs11 > /dev/null || $(GROUPADD) -r pkcs11
|
||||||
|
if ENABLE_LIBRARY
|
||||||
|
$(MKDIR_P) $(DESTDIR)$(libdir)/opencryptoki/stdll
|
||||||
|
$(MKDIR_P) $(DESTDIR)$(libdir)/pkcs11
|
||||||
|
@ -11,11 +11,9 @@ License: CPL
|
|||||||
URL: https://github.com/opencryptoki/opencryptoki
|
URL: https://github.com/opencryptoki/opencryptoki
|
||||||
Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: opencryptoki.module
|
Source1: opencryptoki.module
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=732756
|
|
||||||
Patch0: opencryptoki-3.11.0-group.patch
|
|
||||||
# bz#1373833, change tmpfiles snippets from /var/lock/* to /run/lock/*
|
# bz#1373833, change tmpfiles snippets from /var/lock/* to /run/lock/*
|
||||||
Patch1: opencryptoki-3.11.0-lockdir.patch
|
Patch1: opencryptoki-3.11.0-lockdir.patch
|
||||||
# add missing config file
|
# fix install problem in buildroot
|
||||||
Patch2: opencryptoki-3.20.0-p11sak.patch
|
Patch2: opencryptoki-3.20.0-p11sak.patch
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
|
||||||
@ -360,6 +358,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 13 2023 Than Ngo <than@redhat.com> - 3.20.0-1
|
* Mon Feb 13 2023 Than Ngo <than@redhat.com> - 3.20.0-1
|
||||||
- update to 3.20.0
|
- update to 3.20.0
|
||||||
|
- drop unnecessary opencryptoki-3.11.0-group.patch
|
||||||
|
|
||||||
* Wed Feb 08 2023 Than Ngo <than@redhat.com> - 3.19.0-3
|
* Wed Feb 08 2023 Than Ngo <than@redhat.com> - 3.19.0-3
|
||||||
- Add support of ep11 token for new IBM Z Hardware (IBM z16)
|
- Add support of ep11 token for new IBM Z Hardware (IBM z16)
|
||||||
|
Loading…
Reference in New Issue
Block a user