commit pcsc-cyberjack for openSUSE:Factory
Hello community,
here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory
checked in at Wed Apr 8 01:00:58 CEST 2009.
--------
--- pcsc-cyberjack/pcsc-cyberjack.changes 2009-03-20 19:56:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2009-04-07 14:07:30.000000000 +0200
@@ -1,0 +2,16 @@
+Tue Apr 7 14:06:11 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 3.3.1:
+ * improves support for rdesktop
+ * fixes some PC/SC-related bugs
+ * implements FEATURE_MCT_READER_DIRECT
+ * support for latest versions of pcsc-lite which rely on libhal
+- pcsc-cyberjack requires pcsc-lite.
+
+-------------------------------------------------------------------
+Fri Apr 3 14:28:57 CEST 2009 - sbrabec@suse.cz
+
+- Use modalias supplements instead of eID issuer locales.
+- Fixed buffer underflow.
+
+-------------------------------------------------------------------
@@ -8,0 +25,23 @@
+Mon Feb 2 08:46:56 CET 2009 - wr@opensuse.org
+
+- Fixed library path again
+- Removed double doc (licenses)
+- Require "licenses" package explicitely where needed
+- Added %{_libdir}/cyberjack/getdist.sh to make the cyberjack
+ support script more useful
+- Install ctapi libs to %{_libdir} (for upstream compat) and for
+ backwards compat link them to %{_libdir}/readers
+- Patched some support script's messages to fit openSUSE's package
+ (ctapi-cyberjack-check.patch)
+
+-------------------------------------------------------------------
+Wed Jan 21 16:31:25 CET 2009 - sbrabec@suse.cz
+
+- Renamed capabilities name, create category FDI key. (bnc#438131)
+
+-------------------------------------------------------------------
+Tue Jan 13 17:10:11 CET 2009 - wr@opensuse.org
+
+- Adopt new HAL acl handling. (bnc#438131)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
configure.patch
ctapi-cyberjack-3.3.0.tar.bz2
ctapi-cyberjack-overflow.patch
pcsc-cyberjack-libpath.patch
New:
----
ctapi-cyberjack-3.3.1.tar.bz2
ctapi-cyberjack-autoreconf.patch
ctapi-cyberjack-check.patch
ctapi-cyberjack-configure.patch
ctapi-cyberjack-underflow.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-cyberjack.spec ++++++
--- /var/tmp/diff_new_pack.g14159/_old 2009-04-08 01:00:09.000000000 +0200
+++ /var/tmp/diff_new_pack.g14159/_new 2009-04-08 01:00:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pcsc-cyberjack (Version 3.3.0)
+# spec file for package pcsc-cyberjack (Version 3.3.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,25 +29,32 @@
%else
BuildRequires: openSUSE-release
%endif
-Version: 3.3.0
-Release: 5
-Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE)
+Version: 3.3.1
+Release: 1
Group: Productivity/Security
License: LGPL v2.1 or later
Url: http://www.reiner-sct.de/support/treiber_cyberjack.php
Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Reader
Source0: %{_name}-%{version}.tar.bz2
-Patch1: configure.patch
-Patch2: pcsc-cyberjack-libpath.patch
-Patch3: ctapi-cyberjack-overflow.patch
+Patch1: ctapi-cyberjack-configure.patch
Patch4: ctapi-cyberjack-3.3.0-gcc44.patch
+Patch5: ctapi-cyberjack-autoreconf.patch
+Patch6: ctapi-cyberjack-check.patch
+Patch7: ctapi-cyberjack-underflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: pcsc-lite
Requires: licenses
%if %suse_version > 1020
%define ifddir %(pkg-config --variable=usbdropdir libpcsclite)
%else
%define ifddir %{_libdir}/readers
%endif
+%define LBRACE (
+%define RBRACE )
+%define QUOTE "
+%define BACKSLASH \\
+%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^ACTION=="ADD", SUBSYSTEM=="USB", ENV{PRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^{QUOTE}%{BACKSLASH}/]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}/%{BACKSLASH}%{LBRACE}[^{QUOTE}]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}/%{BACKSLASH}*%{QUOTE}.*$/modalias%{LBRACE}usb:v0%{BACKSLASH}1p0%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
+Supplements: %USBDRIVERS
%description
This package includes the PC/SC IFD handler for the Reiner SCT
@@ -73,8 +80,12 @@
Summary: CT-API and tools for Reiner SCT Cyberjack USB-SmartCard Reader
Requires: licenses
# Modules: cyberjack.ko
+Supplements: %USBDRIVERS
Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*)
# Generated with: extract-modaliases -i cyberjack kernel-default.rpm
+%if %suse_version > 1020
+Requires: licenses
+%endif
%description -n ctapi-cyberjack
REINER SCT Cyberjack pinpad/e-com USB user space driver. This package
@@ -94,38 +105,50 @@
%prep
%setup -q -n %{_name}-%{version}
-# configure.patch (this together with --enable-udev=no enables hal)
%patch1
-%patch2
-%patch3
%patch4
+%patch5
+%patch6 -p1
+%patch7
+%if %suse_version >= 1110
+# openSUSE >= 11.1: No resmgr, use HAL capabilities, which does it for us using HAL ACL, USB us "subsystem".
+# NOTE: openSUSE 11.1 does not support smart_card_reader HAL ACL category yet.
+sed -i 's/key="info.category" string="usbraw"/key="info.subsystem" string="usb"/;s/@info.parent:usb_device/usb/;
+ s:^\([[:space:]]*\)<merge key="resmgr.class" type="string">usb</merge>:\1<merge key="info.category" type="string">smart_card_reader</merge>\
+\1<append key="info.capabilities" type="strlist">smart_card_reader</append>:' etc/hal/80-cyberjack.fdi
+sed -i 's:haldir=/etc/hal/fdi/policy/10osvendor:haldir=/usr/share/hal/fdi/information/20thirdparty:' etc/hal/Makefile.am
+%else
%if %suse_version > 1030
+# openSUSE > 10.3: USB is "subsystem", not "bus"
sed -i 's/key="info.category" string="usbraw"/key="info.subsystem" string="usb_device"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi
-%endif
+%else
%if %suse_version == 1030
+# openSUSE == 10.3: USB is "bus", not abusing "category" any more
sed -i 's/key="info.category" string="usbraw"/key="info.bus" string="usb_device"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi
%endif
+%endif
+%endif
%build
+ACLOCAL="aclocal -I m4" autoreconf -f -i
%configure\
+ --disable-static\
--enable-release\
- --libdir=%{ifddir}\
+ --with-usbdropdir=%{ifddir}\
--enable-udev=no
make %{?jobs:-j%jobs}
%install
%makeinstall
# symlinks (workaround for #336707)
-# FIXME: Code should use compile time linking or fix paths.
-for lib in $RPM_BUILD_ROOT%{ifddir}/*so* ; do
- ln -s readers/$(basename $lib) $RPM_BUILD_ROOT%{_libdir}/$(basename $lib)
+for lib in $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack*so* ; do
+ ln -s %{_libdir}/$(basename $lib) $RPM_BUILD_ROOT%{ifddir}/$(basename $lib)
done
# clean up
-rm $RPM_BUILD_ROOT/%{ifddir}/libctapi-cyberjack.la
-rm $RPM_BUILD_ROOT/%{ifddir}/pcsc/drivers/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.la
-rm $RPM_BUILD_ROOT/%{ifddir}/cyberjack/getdist.sh
-mv $RPM_BUILD_ROOT/%{ifddir}/pcsc/drivers/ifd-cyberjack.bundle $RPM_BUILD_ROOT/%{ifddir}
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/cyberjack.conf{.default,}
+rm $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack.la
+rm $RPM_BUILD_ROOT%{ifddir}/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.la
+mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf{.default,}
+# licenses
%if %suse_version > 1020
for FILE in COPYING COPYRIGHT.GPL COPYRIGHT.LGPL ; do
MD5SUM=$(md5sum $FILE | sed 's/ .*//')
@@ -135,32 +158,63 @@
done
%endif
+%post -n ctapi-cyberjack -p /sbin/ldconfig
+
+%postun -n ctapi-cyberjack -p /sbin/ldconfig
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(644,root,root,755)
-%doc COPYRIGHT.GPL COPYRIGHT.LGPL
+%defattr(-,root,root)
%dir %{ifddir}
%{ifddir}/ifd-cyberjack.bundle
%files -n ctapi-cyberjack
-%defattr(-,root,root,755)
-%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* doc/LIESMICH.* NEWS
+%defattr(-,root,root)
+%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* doc/LIESMICH.* ChangeLog NEWS
%dir %{ifddir}
%{ifddir}/*.so*
%{_libdir}/*.so*
+%{_libdir}/cyberjack
%{_bindir}/*
+%if %suse_version > 1100
+%{_datadir}/hal/fdi/information/20thirdparty/*.fdi
+%else
%{_sysconfdir}/hal/fdi/policy/10osvendor/*.fdi
-%config(noreplace) %{_sysconfdir}/cyberjack.conf
-# FIXME: should be owned by hal:
%dir %{_sysconfdir}/hal/fdi/policy/10osvendor
+%endif
+%config(noreplace) %{_sysconfdir}/cyberjack.conf
%changelog
+* Tue Apr 07 2009 sbrabec@suse.cz
+- Updated to version 3.3.1:
+ * improves support for rdesktop
+ * fixes some PC/SC-related bugs
+ * implements FEATURE_MCT_READER_DIRECT
+ * support for latest versions of pcsc-lite which rely on libhal
+- pcsc-cyberjack requires pcsc-lite.
+* Fri Apr 03 2009 sbrabec@suse.cz
+- Use modalias supplements instead of eID issuer locales.
+- Fixed buffer underflow.
* Fri Mar 20 2009 crrodriguez@suse.de
- fix build with GCC 4.4
- fix Requires
- fix buildrequires
+* Mon Feb 02 2009 wr@opensuse.org
+- Fixed library path again
+- Removed double doc (licenses)
+- Require "licenses" package explicitely where needed
+- Added %%{_libdir}/cyberjack/getdist.sh to make the cyberjack
+ support script more useful
+- Install ctapi libs to %%{_libdir} (for upstream compat) and for
+ backwards compat link them to %%{_libdir}/readers
+- Patched some support script's messages to fit openSUSE's package
+ (ctapi-cyberjack-check.patch)
+* Wed Jan 21 2009 sbrabec@suse.cz
+- Renamed capabilities name, create category FDI key. (bnc#438131)
+* Tue Jan 13 2009 wr@opensuse.org
+- Adopt new HAL acl handling. (bnc#438131)
* Tue Jan 06 2009 sbrabec@suse.cz
- Signed-off.
* Sun Dec 07 2008 wr@opensuse.org
@@ -216,7 +270,7 @@
* Tue Apr 17 2007 sbrabec@suse.cz
- Updated package from Build Service security:chipcard (#264252).
- Spec file cleanup.
-* Tue Apr 10 2007 wr@rosenauer.org
+* Wed Apr 11 2007 wr@rosenauer.org
- update to version 2.0.14
* ctapi.h is not packaged anymore (someone need it?)
* Tue Jan 09 2007 wr@rosenauer.org
@@ -229,7 +283,7 @@
- added HAL config to map the reader to usb resmgr class (#191958)
* Sat May 06 2006 kukuk@suse.de
- Fix inclusion of kernel headers
-* Sat Apr 01 2006 sndirsch@suse.de
+* Sun Apr 02 2006 sndirsch@suse.de
- added missing locale provides (Bug #161867)
* Mon Mar 27 2006 schwab@suse.de
- Fix building of shared libs.
@@ -364,7 +418,7 @@
- fixed /etc/init.d/pcscd status-handling (bug #9069)
* Thu Jun 07 2001 ro@suse.de
- fix broken Makefile.am
-* Sun Apr 22 2001 mge@suse.de
+* Mon Apr 23 2001 mge@suse.de
- update to 0.9.1
-* Wed Apr 18 2001 mge@suse.de
+* Thu Apr 19 2001 mge@suse.de
- created package
++++++ ctapi-cyberjack-3.3.0.tar.bz2 -> ctapi-cyberjack-3.3.1.tar.bz2 ++++++
++++ 10934 lines of diff (skipped)
++++++ ctapi-cyberjack-autoreconf.patch ++++++
--- configure.ac
+++ configure.ac
@@ -144,6 +144,7 @@
# Checks for programs.
#
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_INSTALL
AC_LIBTOOL_WIN32_DLL
++++++ ctapi-cyberjack-check.patch ++++++
diff -uprN ctapi-cyberjack-3.3.0.orig/tools/cyberjack/lib/cm_group.cpp ctapi-cyberjack-3.3.0/tools/cyberjack/lib/cm_group.cpp
--- ctapi-cyberjack-3.3.0.orig/tools/cyberjack/lib/cm_group.cpp 2008-05-27 19:24:05.000000000 +0200
+++ ctapi-cyberjack-3.3.0/tools/cyberjack/lib/cm_group.cpp 2009-02-02 09:59:28.000000000 +0100
@@ -48,7 +48,12 @@ bool CM_Group::check(std::string &xmlStr
"Problemen schnell zu helfen.\n"
"Sollten fuer Ihr System keine Pakete verfuegbar sein, muessen "
"Sie die Gruppe \"cyberjack\" mit Hilfe Ihrer Systemadministrations-"
- "Tools (z.B. yast, KUser etc) selbst erstellen.\n";
+ "Tools (z.B. yast, KUser etc) selbst erstellen.\n\n"
+ "openSUSE Hinweis:\nEin Fehlen dieser Gruppe unter openSUSE sollte die Funktion "
+ "nicht beeintraechtigen, da die Zugriffsrechte durch ein anderes\n"
+ "Verfahren sichergestellt werden (HAL/resmgr/PolicyKit).\n"
+ "Sollten Probleme mit dem Geraetezugriff bestehen, berichten Sie uns das bitte "
+ "unter http://bugzilla.novell.com/";
xmlString+="
participants (1)
-
root@Hilbert.suse.de