rpms/opencryptoki/devel opencryptoki-2.3.0-lsb.patch, NONE, 1.1 opencryptoki.spec, 1.5, 1.6
Dan Horák
sharkcz at fedoraproject.org
Fri Jan 22 15:29:26 UTC 2010
Author: sharkcz
Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26420
Modified Files:
opencryptoki.spec
Added Files:
opencryptoki-2.3.0-lsb.patch
Log Message:
* Fri Jan 22 2010 Dan Horák <dan[at]danny.cz> 2.3.0-5
- made pkcsslotd initscript LSB compliant (#522149)
opencryptoki-2.3.0-lsb.patch:
pkcsslotd.in | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE opencryptoki-2.3.0-lsb.patch ---
diff -up opencryptoki-2.3.0/misc/pkcsslotd.in.lsb-fix opencryptoki-2.3.0/misc/pkcsslotd.in
--- opencryptoki-2.3.0/misc/pkcsslotd.in.lsb-fix 2010-01-22 15:54:25.000000000 +0100
+++ opencryptoki-2.3.0/misc/pkcsslotd.in 2010-01-22 15:57:46.000000000 +0100
@@ -17,10 +17,11 @@ LOCKFILE=/var/lock/subsys/pkcsslotd
SLOTDBIN=@METHOD_PATH@/pkcsslotd
CONFSTART=@METHOD_PATH@/pkcs11_startup
-[ -f $SLOTDBIN ] || exit 5
-[ -f $CONFSTART ] || exit 5
start() {
+ [ -x $SLOTDBIN ] || exit 5
+ [ -x $CONFSTART ] || exit 5
+
echo -n $"Starting pkcsslotd: "
# Generate the configuration information
@@ -40,8 +41,8 @@ start() {
daemon $SLOTDBIN
fi
- echo
RETVAL=$?
+ echo
[ $RETVAL -eq 0 ] && touch $LOCKFILE
return $RETVAL
}
@@ -49,8 +50,8 @@ start() {
stop() {
echo -n $"Shutting down pkcsslotd:"
killproc pkcsslotd -TERM
- echo
RETVAL=$?
+ echo
[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
return $RETVAL
}
@@ -81,7 +82,7 @@ case "$1" in
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
+ exit 2
esac
exit $?
Index: opencryptoki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/opencryptoki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- opencryptoki.spec 7 Sep 2009 12:53:02 -0000 1.5
+++ opencryptoki.spec 22 Jan 2010 15:29:25 -0000 1.6
@@ -1,13 +1,15 @@
Name: opencryptoki
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
Version: 2.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: CPL
Group: System Environment/Base
URL: http://sourceforge.net/projects/opencryptoki
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-2.2.8-do-not-create-group-in-pkcs11_startup.patch
Patch1: %{name}-2.3.0-fix-nss-breakage.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=522149
+Patch2: %{name}-2.3.0-lsb.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): shadow-utils coreutils sed
Requires(post): chkconfig
@@ -48,6 +50,7 @@ based applications.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# Upstream tarball has unnecessary executable perms set on the sources
@@ -138,6 +141,9 @@ exit 0
%changelog
+* Fri Jan 22 2010 Dan Horák <dan[at]danny.cz> 2.3.0-5
+- made pkcsslotd initscript LSB compliant (#522149)
+
* Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-4
- Added opencryptoki-2.3.0-fix-nss-breakage.patch on upstream request.
More information about the scm-commits
mailing list