Hello community,
here is the log from the commit of package openct
checked in at Mon Nov 3 14:14:39 CET 2008.
--------
--- openct/openct.changes 2008-09-09 15:11:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/openct/openct.changes 2008-10-31 15:18:45.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Oct 30 18:15:24 CET 2008 - sbrabec@suse.cz
+
+- Fixed HAL FDI files and hald-addon scripts (bnc#304149).
+- Fixed permissions in hald-addon script and /var/run.
+- Build a pcsc-openct package.
+- "rcopenct stop" does not fail if there is nothing to stop
+ (bnc#303829).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
openct-hald-addon.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openct.spec ++++++
--- /var/tmp/diff_new_pack.KI1222/_old 2008-11-03 14:14:13.000000000 +0100
+++ /var/tmp/diff_new_pack.KI1222/_new 2008-11-03 14:14:14.000000000 +0100
@@ -20,7 +20,7 @@
Name: openct
Version: 0.6.15
-Release: 1
+Release: 4
BuildRequires: db-devel doxygen krb5-devel libusb-devel licenses openldap2-devel pcsc-lite-devel pkg-config
# NOTE: We prefer multiple RPM directory ownership here, because
# dependency on hal increases bootstrap build time.
@@ -29,10 +29,11 @@
Group: Productivity/Security
License: BSD 3-Clause; LGPL v2.1 or later
Url: http://www.opensc-project.org/openct/
-Summary: OpenCT Library for Smart Card Readers
+Summary: OpenCT Tools for Smart Card Readers
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-hal.patch
Patch1: %{name}-init.patch
+Patch2: %{name}-hald-addon.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: licenses
## Only for directory ownership:
@@ -40,6 +41,9 @@
# Existed up to 10.2, maintained in SLES9:
Provides: pcsc-etoken <= 0.3.2
Obsoletes: pcsc-etoken <= 0.3.2
+%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
+%define USER daemon
+%define GROUP daemon
%description
OpenCT is a set of library and tools to talk to smart card readers.
@@ -82,6 +86,32 @@
Olaf Kirch
Andreas Jellinghaus
+%package -n pcsc-openct
+License: BSD 3-Clause; LGPL v2.1 or later
+Group: Productivity/Security
+Summary: PC/SC IFD Handler for OpenCT Smart Card Drivers
+
+%description -n pcsc-openct
+PC/SC Connector for OpenCT. It allows to use any of OpenCT Smart Card
+drivers with the PCSC-Lite daemon from the pcsc-lite package.
+
+OpenCT is a set of library and tools to talk to smart card readers.
+OpenCT is used by the OpenSC Smart Card library.
+
+For a list of supported readers, please read documentation in
+/usr/share/doc/packages/openct/wiki/index.html - some readers may be
+supported only with particular firmware or particular connection type.
+
+There are other packages that may support your reader in a different
+way. Name of all these packages starts with "pcsc-".
+
+
+
+Authors:
+--------
+ Olaf Kirch
+ Andreas Jellinghaus
+
%package devel
License: BSD 3-Clause; LGPL v2.1 or later
Group: Development/Libraries/C and C++
@@ -109,9 +139,13 @@
%prep
%setup -q -n %{name}-%{version}
%if %suse_version > 1030
+# Patch and sed script converts fdi file to the new hal syntax:
%patch
+sed -i 's/key="usb\./key="usb_device./g' etc/openct.fdi
%endif
%patch1
+%patch2
+sed -i 's/@USER@/%{USER}/g;s/@GROUP@/%{GROUP}/g' etc/openct.hald.in etc/init-script.in
%build
ACLOCAL="aclocal -I m4" autoreconf -f -i
@@ -123,8 +157,13 @@
--enable-usb\
--enable-pcsc\
--enable-non-privileged\
- --with-daemon-user=daemon\
- --with-daemon-groups=daemon
+ --with-daemon-user=%{USER}\
+ --with-daemon-groups=%{GROUP}\
+ --with-bundle=%{ifddir}\
+ --with-ifddir=%{ifddir}
+# FIXME: Fix PCMCIA and serial readers hotplug.
+# udev scripts are outdated, HAL rules don't exist yet:
+# --with-udev=%{_sysconfdir}/udev/rules.d\
make %{?jobs:-j%jobs}
%install
@@ -138,6 +177,9 @@
#
# Create directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/openct
+# NOTE: Example in the source recommends 750, but this value allows
+# access only to dedicated users and root.
+chmod 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
#
# Install init script
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -154,6 +196,8 @@
%post
%{fillup_and_insserv openct}
+chown %{USER}:%{GROUP} %{_localstatedir}/run/openct
+chmod 0755 %{_localstatedir}/run/openct
%postun
%{restart_on_update openct}
@@ -177,7 +221,7 @@
%doc %{_docdir}/%{name}/wiki
%{_bindir}/*
%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi
-%dir %{_localstatedir}/run/openct
+%dir %attr(-,%{USER},%{GROUP}) %{_localstatedir}/run/openct
%{_libexecdir}/hal/hald-addon-*
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
@@ -195,6 +239,10 @@
%defattr(-,root,root)
%{_libdir}/*.so.*
+%files -n pcsc-openct
+%defattr(-,root,root)
+%{ifddir}/openct-ifd.bundle
+
%files devel
%defattr(-,root,root)
%doc %{_docdir}/%{name}/api
@@ -204,6 +252,12 @@
%{_libdir}/pkgconfig/libopenct.pc
%changelog
+* Thu Oct 30 2008 sbrabec@suse.cz
+- Fixed HAL FDI files and hald-addon scripts (bnc#304149).
+- Fixed permissions in hald-addon script and /var/run.
+- Build a pcsc-openct package.
+- "rcopenct stop" does not fail if there is nothing to stop
+ (bnc#303829).
* Tue Sep 09 2008 sbrabec@suse.cz
- Updated to version 0.6.15:
* Build system rewritten.
++++++ openct-hald-addon.patch ++++++
--- etc/openct.hald.in
+++ etc/openct.hald.in
@@ -1,16 +1,7 @@
#!/bin/bash
-PRODUCT="`printf %x/%x/%x $HAL_PROP_USB_VENDOR_ID $HAL_PROP_USB_PRODUCT_ID \
- $HAL_PROP_USB_DEVICE_REVISION_BCD`"
+PRODUCT="`printf %x/%x/%x $HAL_PROP_USB_DEVICE_VENDOR_ID $HAL_PROP_USB_DEVICE_PRODUCT_ID \
+ $HAL_PROP_USB_DEVICE_DEVICE_REVISION_BCD`"
-DEVICE="`printf /dev/bus/usb/%03u/%03u \
- $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`"
-
-if test -e $DEVICE
-then
- exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE
-fi
-
-DEVICE="`printf /proc/bus/usb/%03u/%03u \
- $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`"
-exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE
+chown @USER@:@GROUP@ $HAL_PROP_LINUX_DEVICE_FILE
+exec @sbindir@/openct-control attach usb:$PRODUCT usb $HAL_PROP_LINUX_DEVICE_FILE
++++++ openct-hal.patch ++++++
--- /var/tmp/diff_new_pack.KI1222/_old 2008-11-03 14:14:14.000000000 +0100
+++ /var/tmp/diff_new_pack.KI1222/_new 2008-11-03 14:14:14.000000000 +0100
@@ -5,7 +5,7 @@
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="usb">
-+ <match key="info.subsystem" string="usb">
++ <match key="info.subsystem" string="usb_device">
<match key="usb.vendor_id" int="0x0973">
<match key="usb.product_id" int="0x0001">
++++++ openct-init.patch ++++++
--- /var/tmp/diff_new_pack.KI1222/_old 2008-11-03 14:14:14.000000000 +0100
+++ /var/tmp/diff_new_pack.KI1222/_new 2008-11-03 14:14:14.000000000 +0100
@@ -53,7 +53,19 @@
# create the directory for our status and socket files,
# if it does not exist.
-@@ -28,26 +67,15 @@
+@@ -18,52 +57,54 @@
+ # this example would assign the directory to a group "scard"
+ # and set permissions so only users in that group can access
+ # smart card readers via openct.
+- #chown root:scard "@OPENCT_SOCKET_PATH@"
+- #chmod 0750 "@OPENCT_SOCKET_PATH@"
++ chown @USER@:@GROUP@ "@OPENCT_SOCKET_PATH@"
++ chmod 0755 "@OPENCT_SOCKET_PATH@"
+ fi
+
+-set -e
+-
+ case "$1" in
start)
echo -n "Starting $DESC: $NAME"
$DAEMON init
@@ -62,8 +74,11 @@
;;
stop)
echo -n "Stopping $DESC: $NAME "
- $DAEMON shutdown
+- $DAEMON shutdown
- echo "."
++ if test -f @OPENCT_SOCKET_PATH@/status ; then
++ $DAEMON shutdown
++ fi
+ rc_status -v
;;
- #reload)
@@ -84,8 +99,15 @@
restart|force-reload)
#
# If the "reload" option is implemented, move the "force-reload"
-@@ -58,12 +86,23 @@
- $DAEMON shutdown
+ # option to the "reload" entry above. If not, "force-reload" is
+ # just the same as "restart".
+ #
+- echo -n "Restarting $DESC: $NAME"
+- $DAEMON shutdown
++ echo -n "Restarting $DESC: $NAME "
++ if test -f @OPENCT_SOCKET_PATH@/status ; then
++ $DAEMON shutdown
++ fi
sleep 0.1
$DAEMON init
- echo "."
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org