Hello community, here is the log from the commit of package openct for openSUSE:Factory checked in at Thu Aug 6 18:34:49 CEST 2009. -------- --- openct/openct.changes 2009-04-09 16:01:31.000000000 +0200 +++ openct/openct.changes 2009-08-05 14:55:14.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 5 14:51:47 CEST 2009 - sbrabec@suse.cz + +- Updated to version 0.6.17: + * add support for Rutoken ECP (ccid driver) + * For ccid, etoken* drivers remove polling loop. + * Fix some issues caused by newer udev version. + * Handle T1 abort better. + * Some build system fixes. + * Some minor fixes. + * Re-add api documentation (pre-generated). + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openct-0.6.15.tar.bz2 openct-conf-more-readers.patch openct-disable.fdi openct-hal-fdi-ccid.patch openct-hal-fdi-common-rule.patch openct-hald-addon.patch openct-new-hal.patch openct-policy.fdi openct-status-lock-orphans.patch New: ---- openct-0.6.17.tar.bz2 openct-old-hal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openct.spec ++++++ --- /var/tmp/diff_new_pack.4BNjZ5/_old 2009-08-06 18:32:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4BNjZ5/_new 2009-08-06 18:32:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openct (Version 0.6.15) +# spec file for package openct (Version 0.6.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: openct -Version: 0.6.15 -Release: 7 +Version: 0.6.17 +Release: 1 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. @@ -31,16 +31,9 @@ Url: http://www.opensc-project.org/openct/ Summary: OpenCT Tools for Smart Card Readers Source: %{name}-%{version}.tar.bz2 -Source1: openct-policy.fdi Source2: README.SUSE -Source3: openct-disable.fdi -Patch: %{name}-conf-more-readers.patch Patch1: %{name}-init.patch -Patch2: %{name}-hald-addon.patch -Patch3: %{name}-hal-fdi-ccid.patch -Patch4: %{name}-status-lock-orphans.patch -Patch5: %{name}-new-hal.patch -Patch6: %{name}-hal-fdi-common-rule.patch +Patch5: %{name}-old-hal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: licenses # bug437293 @@ -62,6 +55,8 @@ %define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | sed -n 's/^ENV{MODALIAS}==%{QUOTE}%{BACKSLASH}%{LBRACE}usb:[^{QUOTE}]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}*%{QUOTE}.*$/modalias%{LBRACE}%{BACKSLASH}1d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') # We are not using Supplements here. User may want to choose between openct and pcsc-lite: Enhances: %USBDRIVERS +# Generic CCID devices: +Enhances: modalias(usb:*ic0Bisc00d*dc*dsc*dp*ic*isc*ip*) %description OpenCT is a set of library and tools to talk to smart card readers. @@ -165,23 +160,16 @@ %prep %setup -q -n %{name}-%{version} -cp -a %{S:1} %{S:2} %{S:3} . -%patch +cp -a %{S:2} . %patch1 -%patch2 -%patch3 -%patch4 -%if %suse_version > 1030 +%if %suse_version <= 1030 # Patch and sed script converts fdi file to the new hal syntax: %patch5 %endif -# Rework to be simpler: -sed -i '/hald-addon-openct/d;s:<merge key="info.category" type="string">smart_card_reader</merge>:<merge key="smart_card_reader.openct_capable" type="bool">true</merge>:' etc/openct.fdi -%patch6 sed -i 's/@USER@/%{USER}/g;s/@GROUP@/%{GROUP}/g' etc/openct.hald.in etc/init-script.in %build -%if %suse_version > 1020 +%if %suse_version > 1110 ACLOCAL="aclocal -I m4" autoreconf -f -i %endif %configure\ @@ -208,7 +196,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor cp etc/openct.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi -cp openct-policy.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/10-usb-openct.fdi +cp etc/openct-policy.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/10-usb-openct.fdi mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/hal install etc/openct.hald $RPM_BUILD_ROOT%{_libexecdir}/hal/hald-addon-openct # @@ -224,7 +212,7 @@ ln -s ../..%{_sysconfdir}/init.d/openct $RPM_BUILD_ROOT%{_sbindir}/rcopenct # # Copy the rest of documentation -cp LGPL-2.1 README.SUSE TODO openct-disable.fdi doc/nonpersistent/ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name} +cp LGPL-2.1 README.SUSE TODO doc/nonpersistent/ChangeLog etc/openct-disable.fdi $RPM_BUILD_ROOT%{_docdir}/%{name} # And remove pointless .la file rm $RPM_BUILD_ROOT%{_libdir}/libopenct.la ++++++ openct-0.6.15.tar.bz2 -> openct-0.6.17.tar.bz2 ++++++ ++++ 78015 lines of diff (skipped) ++++++ openct-init.patch ++++++ --- /var/tmp/diff_new_pack.4BNjZ5/_old 2009-08-06 18:32:21.000000000 +0200 +++ /var/tmp/diff_new_pack.4BNjZ5/_new 2009-08-06 18:32:21.000000000 +0200 @@ -1,67 +1,26 @@ --- etc/init-script.in +++ etc/init-script.in -@@ -1,12 +1,52 @@ - #! /bin/sh - # -+# /etc/init.d/openct -+# -+### BEGIN INIT INFO -+# Provides: openct -+# Required-Start: $remote_fs -+# Required-Stop: $remote_fs -+# Should-Start: $syslog -+# Should-Stop: $syslog -+# Default-Start: 2 3 5 -+# Default-Stop: -+# Short-Description: Smart card terminal framework -+# Description: Runs drivers for smart card readers -+# X-UnitedLinux-Default-Enabled: yes -+### END INIT INFO - - PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - DAEMON=@sbindir@/openct-control +@@ -20,7 +20,11 @@ NAME=OpenCT DESC="smart card terminal framework" -test -x $DAEMON || exit 0 -+# Shell functions sourced from /etc/rc.status: -+# rc_check check and set local and overall rc status -+# rc_status check and set local and overall rc status -+# rc_status -v ditto but be verbose in local rc status -+# rc_status -v -r ditto and clear the local rc status -+# rc_failed set local and overall rc status to failed -+# rc_reset clear local rc status (overall remains) -+# rc_exit exit appropriate to overall rc status +. /etc/rc.status + +rc_reset + -+# Return values acc. to LSB for all commands but status: -+# 0 - success -+# 1 - misc error -+# 2 - invalid or excess args -+# 3 - unimplemented feature (e.g. reload) -+# 4 - insufficient privilege -+# 5 - program not installed -+# 6 - program not configured -+# -+# Note that starting an already running service, stopping -+# or restarting a not-running service as well as the restart -+# with force-reload (in case signalling is not supported) are -+# considered a success. -+ +test -x $DAEMON || exit 5 # create the directory for our status and socket files, # if it does not exist. -@@ -18,52 +58,54 @@ +@@ -32,39 +36,26 @@ # 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@" +- #chown root:scard "$STATUS_DIR" +- #chmod 0750 "$STATUS_DIR" ++ chown @USER@:@GROUP@ "$STATUS_DIR" ++ chmod 0755 "$STATUS_DIR" fi -set -e @@ -74,13 +33,16 @@ + rc_status -v ;; stop) - echo -n "Stopping $DESC: $NAME " -- $DAEMON shutdown +- echo -n "Stopping $DESC: $NAME " ++ echo -n "Stopping $DESC: $NAME" + if [ -f $STATUS_FILE ]; then + $DAEMON shutdown + rm -f $STATUS_FILE + fi - echo "." -+ if test -f @OPENCT_SOCKET_PATH@/status ; then -+ $DAEMON shutdown -+ fi + rc_status -v ++ ;; ++ reload) ;; - #reload) - # @@ -95,43 +57,33 @@ - # @localstatedir@/run/$NAME.pid --exec $DAEMON - # echo "done." - #;; -+ reload) -+ ;; restart|force-reload) # # If the "reload" option is implemented, move the "force-reload" - # 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 +@@ -78,12 +69,23 @@ + fi sleep 0.1 $DAEMON init - echo "." + rc_status -v -+ ;; + ;; + try-restart) + $0 status >/dev/null && $0 restart + rc_status + ;; + status) -+ echo -n "Checking for $DESC: $NAME" ++ echo -n "Checking for $DESC: $NAME" + if openct-tool list >/dev/null 2>&1; then + rc_failed 0 + else + rc_failed 3 + fi + rc_status -v - ;; *) -- N=/etc/init.d/$NAME + N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 -+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" >&2 ++ echo "Usage: $N {start|stop|status|try-restart|restart|reload|force-reload}" >&2 exit 1 ;; esac ++++++ openct-old-hal.patch ++++++ --- etc/openct.fdi +++ etc/openct.fdi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> <deviceinfo version="0.2"> <device> - <match key="info.subsystem" string="usb"> + <match key="info.bus" string="usb"> <match key="usb.vendor_id" int="0x0973"> <match key="usb.product_id" int="0x0001"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org