packages: pcsc-lite/pcsc-lite-pcscd.init, pcsc-lite/pcsc-lite.spec, pcsc-li...

[glen]

Author: glen                         Date: Sun Aug 28 11:36:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add upstart config

---- Files affected:
packages/pcsc-lite:
   pcsc-lite-pcscd.init (1.15 -> 1.16) , pcsc-lite.spec (1.58 -> 1.59) , pcscd.upstart (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pcsc-lite/pcsc-lite-pcscd.init
diff -u packages/pcsc-lite/pcsc-lite-pcscd.init:1.15 packages/pcsc-lite/pcsc-lite-pcscd.init:1.16
--- packages/pcsc-lite/pcsc-lite-pcscd.init:1.15	Wed Jan 12 01:32:56 2011
+++ packages/pcsc-lite/pcsc-lite-pcscd.init	Sun Aug 28 13:36:03 2011
@@ -20,6 +20,8 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 umask 077
 
 # Set defaults

================================================================
Index: packages/pcsc-lite/pcsc-lite.spec
diff -u packages/pcsc-lite/pcsc-lite.spec:1.58 packages/pcsc-lite/pcsc-lite.spec:1.59
--- packages/pcsc-lite/pcsc-lite.spec:1.58	Fri Mar 18 17:51:26 2011
+++ packages/pcsc-lite/pcsc-lite.spec	Sun Aug 28 13:36:03 2011
@@ -6,12 +6,12 @@
 #
 # Conditional build:
 %bcond_without	udev	# use libusb instead of libudev
-#
+
 Summary:	PCSC Framework for Linux
 Summary(pl.UTF-8):	Środowisko PCSC dla Linuksa
 Name:		pcsc-lite
 Version:	1.7.0
-Release:	1
+Release:	2
 License:	BSD
 Group:		Daemons
 # Source0Download: http://alioth.debian.org/project/showfiles.php?group_id=30105
@@ -19,6 +19,7 @@
 # Source0-md5:	df69029ddbf62b9ae5f9307183d19a4d
 Source1:	%{name}-pcscd.init
 Source2:	%{name}-pcscd.sysconfig
+Source3:	pcscd.upstart
 Patch0:		%{name}-fhs.patch
 Patch1:		%{name}-any.patch
 Patch2:		noautostart.patch
@@ -135,7 +136,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{usbdropdir} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,init} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d \
 	$RPM_BUILD_ROOT/var/run/pcscd \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -146,9 +147,10 @@
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pcscd
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pcscd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pcscd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/pcscd
 
-cp -a doc/example/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p doc/example/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -181,6 +183,7 @@
 %dir %{_libdir}/pcsc/drivers
 %dir %{_sysconfdir}/reader.conf.d
 %attr(754,root,root) /etc/rc.d/init.d/pcscd
+%config(noreplace) %verify(not md5 mtime size) /etc/init/pcscd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
@@ -215,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2011/08/28 11:36:03  glen
+- add upstart config
+
 Revision 1.58  2011/03/18 16:51:26  qboosh
 - updated to 1.7.0 (now uses udev instead of hal)
 - updated noautostart patch

================================================================
Index: packages/pcsc-lite/pcscd.upstart
diff -u /dev/null packages/pcsc-lite/pcscd.upstart:1.1
--- /dev/null	Sun Aug 28 13:36:09 2011
+++ packages/pcsc-lite/pcscd.upstart	Sun Aug 28 13:36:03 2011
@@ -0,0 +1,24 @@
+description "PC/SC Smartcard daemon"
+
+# Note!  pcscd should be started after pcmcia, and shut down before it
+# for smooth experience with PCMCIA readers.
+
+# Set defaults
+env LOGLEVEL=""
+env PCSCD_OPTIONS=""
+
+respawn
+expect fork
+
+script
+	[ -f /etc/sysconfig/pcscd ] && . /etc/sysconfig/pcscd
+
+	local logopt
+	case "$LOGLEVEL" in
+	debug|info|error|critical)
+		logopt=--$LOGLEVEL
+	;;
+	esac
+
+	exec /usr/sbin/pcscd $logopt $PCSCD_OPTIONS
+end script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pcsc-lite/pcsc-lite-pcscd.init?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pcsc-lite/pcsc-lite.spec?r1=1.58&r2=1.59&f=u