From 9a8778934dc65d6a98f92618d7128175fb145576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 23 Aug 2013 17:12:11 +0200 Subject: [PATCH] - update unit file (#995002) --- opencryptoki-3.0-unit.patch | 24 ++++++++++++++++++++++++ opencryptoki.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 opencryptoki-3.0-unit.patch diff --git a/opencryptoki-3.0-unit.patch b/opencryptoki-3.0-unit.patch new file mode 100644 index 0000000..95eb8d4 --- /dev/null +++ b/opencryptoki-3.0-unit.patch @@ -0,0 +1,24 @@ +From a8870725de46b8c5716e1539a0d01256b319940b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Fri, 23 Aug 2013 16:57:52 +0200 +Subject: [PATCH] update unit file for 3.0 + +--- + misc/pkcsslotd.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/misc/pkcsslotd.service.in b/misc/pkcsslotd.service.in +index bfd9934..461be60 100644 +--- a/misc/pkcsslotd.service.in ++++ b/misc/pkcsslotd.service.in +@@ -5,7 +5,6 @@ After=syslog.target + [Service] + Type=forking + PIDFile=/var/run/pkcsslotd.pid +-ExecStartPre=@sbindir@/pkcs11_startup + ExecStart=@sbindir@/pkcsslotd + + [Install] +-- +1.8.1.4 + diff --git a/opencryptoki.spec b/opencryptoki.spec index 80c35cd..c65f5ba 100644 --- a/opencryptoki.spec +++ b/opencryptoki.spec @@ -3,7 +3,7 @@ Name: opencryptoki Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11 Version: 3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/opencryptoki @@ -14,6 +14,9 @@ Patch0: %{name}-2.4-group.patch # https://bugzilla.redhat.com/show_bug.cgi?id=948460 # http://sourceforge.net/mailarchive/message.php?msg_id=31202168 Patch1: %{name}-3.0-pkcsconf-man.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=995002 +# http://sourceforge.net/mailarchive/message.php?msg_id=31321105 +Patch2: %{name}-3.0-unit.patch Requires(pre): shadow-utils coreutils sed BuildRequires: openssl-devel BuildRequires: trousers-devel @@ -155,6 +158,7 @@ cryptographic hardware such as IBM 4764 or 4765 that uses the %setup -q -n %{name} %patch0 -p1 -b .group %patch1 -p1 -b .pkcsconf-man +%patch2 -p1 -b .unit # Upstream tarball has unnecessary executable perms set on the sources find . -name '*.[ch]' -print0 | xargs -0 chmod -x @@ -285,6 +289,9 @@ exit 0 %changelog +* Fri Aug 23 2013 Dan Horák - 3.0-4 +- update unit file (#995002) + * Sat Aug 03 2013 Fedora Release Engineering - 3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild