rpms/opencryptoki/F-12 opencryptoki-2.3.0-lsb.patch, NONE, 1.1 opencryptoki.spec, 1.5, 1.6 opencryptoki-2.3.0-fix-nss-breakage.patch, 1.1, NONE

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/opencryptoki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21445

Modified Files:
	opencryptoki.spec 
Added Files:
	opencryptoki-2.3.0-lsb.patch 
Removed Files:
	opencryptoki-2.3.0-fix-nss-breakage.patch 
Log Message:
* Wed Jan 27 2010 Michal Schmidt <mschmidt at redhat.com> 2.3.1-1
- New upstream release 2.3.1.
- opencryptoki-2.3.0-fix-nss-breakage.patch was merged.


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/F-12/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	27 Jan 2010 15:21:48 -0000	1.6
@@ -1,13 +1,14 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
-Version:		2.3.0
-Release:		4%{?dist}
+Version:		2.3.1
+Release:		1%{?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
@@ -47,7 +48,7 @@ based applications.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch2 -p1
 
 %build
 # Upstream tarball has unnecessary executable perms set on the sources
@@ -138,6 +139,13 @@ exit 0
 
 
 %changelog
+* Wed Jan 27 2010 Michal Schmidt <mschmidt at redhat.com> 2.3.1-1
+- New upstream release 2.3.1.
+- opencryptoki-2.3.0-fix-nss-breakage.patch was merged.
+
+* 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.
 


--- opencryptoki-2.3.0-fix-nss-breakage.patch DELETED ---