rpms/openct/devel openct.rules, NONE, 1.1 openct.init, 1.1, 1.2 openct.spec, 1.6, 1.7

Ville Skytta (scop) fedora-extras-commits at redhat.com
Mon Nov 28 19:25:31 UTC 2005 

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7921

Modified Files:
	openct.init openct.spec 
Added Files:
	openct.rules 
Log Message:
* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-3
- Adapt to udev, drop old hotplug support.
- Init script improvements: incoming events don't start explicitly stopped
  daemons, improved status output.
- Init script is not a config file.



--- NEW FILE openct.rules ---
ACTION!="add", GOTO="openct_end"
SUBSYSTEM!="usb", GOTO="openct_pcmcia"

# egate
SYSFS{idVendor}=="0973", SYSFS{idProduct}=="0001", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# eToken
SYSFS{idVendor}=="0529", SYSFS{idProduct}=="050c", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"
SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0514", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# eToken 64
SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0600", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# eutron
SYSFS{idVendor}=="073d", SYSFS{idProduct}=="0005", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# ikey2k
SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1200", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# ikey3k
SYSFS{idVendor}=="04b9", SYSFS{idProduct}=="1300", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# cardman
#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="0596", \
#	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
#	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
#	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"
#SYSFS{idVendor}=="076b", SYSFS{idProduct}=="1784", \
#	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
#	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
#	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"
#SYSFS{idVendor}=="08d4", SYSFS{idProduct}=="0009", \
#	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
#	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
#	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# ccid
SYSFS{bInterfaceClass}=="0b", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

# pertosmart1030
SYSFS{idVendor}=="072f", SYSFS{idProduct}=="0001", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"
SYSFS{idVendor}=="072f", SYSFS{idProduct}=="8009", \
	ENV{DEVICE}=="?*", ENV{PRODUCT}=="?*", \
	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
	RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"

LABEL="openct_pcmcia"
SUBSYSTEM!="pcmcia", GOTO="openct_end"

# cm4000
#SYSFS{manf_id}=="0223", SYSFS{card_id}=="0002", \
#	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
#	TODO

# cm4040 (ccid)
#SYSFS{manf_id}=="0223", SYSFS{card_id}=="0200", \
#	PROGRAM=="/usr/bin/test -e /var/run/openct/status", \
#	TODO

LABEL="openct_end"


Index: openct.init
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openct.init	1 Feb 2005 21:24:42 -0000	1.1
+++ openct.init	28 Nov 2005 19:25:29 -0000	1.2
@@ -34,7 +34,10 @@
     action $"Stopping OpenCT smart card terminals: " \
         $exec $OPENCT_OPTIONS shutdown
     retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
+    if [ $retval -eq 0 ] ; then
+        rm -f /var/run/openct/status
+        rm -f $lockfile
+    fi
     return $retval
 }
 
@@ -43,6 +46,17 @@
     start
 }
 
+oct_status() {
+    status $proc
+    retval=$?
+    if [ -e /var/run/openct/status ] ; then
+        $exec $OPENCT_OPTIONS status
+        [ -e /var/run/openct/status ] && \
+            echo $"Waiting for reader attach/detach events..."
+    fi
+    return $retval
+}
+
 case "$1" in
     start|stop|restart)
         $1
@@ -51,8 +65,7 @@
         restart
         ;;
     status)
-        $exec $OPENCT_OPTIONS status
-        status $proc
+        oct_status
         ;;
     try-restart|condrestart)
   	[ ! -f $lockfile ] || restart


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openct.spec	12 Sep 2005 07:06:13 -0000	1.6
+++ openct.spec	28 Nov 2005 19:25:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           openct
 Version:        0.6.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -10,13 +10,15 @@
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Source3:        %{name}-reader.conf
+Source4:        %{name}.rules
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  sed
-Requires:       hotplug
+# TODO: verify minimum udev version
+Requires:       udev >= 062
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -65,9 +67,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
 make install DESTDIR=$RPM_BUILD_ROOT
 
+install -Dpm 644 \
+  %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+
 ln -sf %{_libdir}/openct-ifd.so \
   $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
 
@@ -118,8 +122,8 @@
 %doc ANNOUNCE NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
-%config %{_sysconfdir}/hotplug/usb/openct*
-%config %{_initrddir}/openct
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
+%{_initrddir}/openct
 %{_bindir}/openct-tool
 %{_sbindir}/ifdhandler
 %{_sbindir}/ifdproxy
@@ -145,6 +149,12 @@
 
 
 %changelog
+* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-3
+- Adapt to udev, drop old hotplug support.
+- Init script improvements: incoming events don't start explicitly stopped
+  daemons, improved status output.
+- Init script is not a config file.
+
 * Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-2
 - 0.6.6.
 - Improve description.

More information about the fedora-extras-commits mailing list