Hello community, here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory checked in at 2019-06-19 21:02:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-cyberjack (Old) and /work/SRC/openSUSE:Factory/.pcsc-cyberjack.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-cyberjack" Wed Jun 19 21:02:07 2019 rev:54 rq:706064 version:3.99.5final.SP13 Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-cyberjack/pcsc-cyberjack.changes 2017-10-17 01:52:32.474369265 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-cyberjack.new.4811/pcsc-cyberjack.changes 2019-06-19 21:02:11.054177984 +0200 @@ -1,0 +2,38 @@ +Thu May 2 07:43:32 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Remove redundant %clean section, replace old $RPM_* shell vars. + +------------------------------------------------------------------- +Thu May 2 07:34:24 UTC 2019 - Wolfgang Rosenauer <w...@rosenauer.org> + +- removed unused code which was still built + (no-checksuite.patch, no-libdialog.patch, and manual removal from + source archive) +- removed obsolete patch + ctapi-cyberjack-check.patch + +------------------------------------------------------------------- +Sat Jan 19 09:37:55 UTC 2019 - Wolfgang Rosenauer <w...@rosenauer.org> + +- update to 3.99.5 Service Pack 13 + * Update to the Reiner-SCT repository rev cyberJack@1374 +- removed obsolete patches + * a58a29c08b1da647e5efe08641abcb0144740b8b.patch + * pcsc-cyberjack-fprintf.patch +- add new devices to udev rules (2000, 0551, 2002) + +------------------------------------------------------------------- +Sat Jul 14 09:17:36 UTC 2018 - t...@documentfoundation.org + +- Add patch to get cyberJack RFID komfort working + (a58a29c08b1da647e5efe08641abcb0144740b8b.patch) + https://forum.reiner-sct.com/index.php?/topic/3728-failed_to_transmit_control_command_to_the_terminal + +------------------------------------------------------------------- +Sat Jul 14 09:01:32 UTC 2018 - w...@rosenauer.org + +- update to 3.99.5 Service Pack 12 + * Add support for cyberJack one MF + * man-page removed upstream + +------------------------------------------------------------------- @@ -5,0 +44 @@ + * validated that crash on exit is fixed (boo#908092) Old: ---- ctapi-cyberjack-check.patch pcsc-cyberjack-3.99.5final.SP11.tar.bz2 pcsc-cyberjack-fprintf.patch New: ---- no-checksuite.patch no-libdialog.patch pcsc-cyberjack_3.99.5final.SP13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.ycyPs0/_old 2019-06-19 21:02:12.170178921 +0200 +++ /var/tmp/diff_new_pack.ycyPs0/_new 2019-06-19 21:02:12.174178925 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcsc-cyberjack # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,23 @@ %endif Name: pcsc-cyberjack +Version: 3.99.5final.SP13 +Release: 0 +URL: http://www.reiner-sct.de/support/treiber_cyberjack.php +Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Readers +# libcyberjack/checksuite removed from upstream tarball because it contains +# GPL licensed code which is totally unused at the moment; to avoid adding +# GPL as a license +License: LGPL-2.1-or-later +Group: Productivity/Security +Source: %{name}_%{version}.tar.gz +Source1: %{name}-README.SUSE +Source2: 40-cyberjack.rules +Patch1: ctapi-cyberjack-configure.patch +Patch2: no-checksuite.patch +Patch3: no-libdialog.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define ifddir %(pkg-config --variable=usbdropdir libpcsclite) BuildRequires: distribution-release BuildRequires: gcc-c++ BuildRequires: libtool @@ -38,20 +55,6 @@ BuildRequires: hal-devel BuildRequires: libusb-devel %endif -Version: 3.99.5final.SP11 -Release: 0 -Url: http://www.reiner-sct.de/support/treiber_cyberjack.php -Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Readers -License: LGPL-2.1+ -Group: Productivity/Security -Source: %{name}-%{version}.tar.bz2 -Source1: %{name}-README.SUSE -Source2: 40-cyberjack.rules -Patch1: ctapi-cyberjack-configure.patch -Patch2: ctapi-cyberjack-check.patch -Patch3: pcsc-cyberjack-fprintf.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define ifddir %(pkg-config --variable=usbdropdir libpcsclite) Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*) Supplements: modalias(usb:v0C4Bp0300d*dc*dsc*dp*ic*isc*ip*) Supplements: modalias(usb:v0C4Bp0400d*dc*dsc*dp*ic*isc*ip*) @@ -68,6 +71,9 @@ Supplements: modalias(usb:v0C4Bp0507d*dc*dsc*dp*ic*isc*ip*) Supplements: modalias(usb:v0C4Bp0525d*dc*dsc*dp*ic*isc*ip*) Supplements: modalias(usb:v0C4Bp0580d*dc*dsc*dp*ic*isc*ip*) +Supplements: modalias(usb:v0C4Bp2000d*dc*dsc*dp*ic*isc*ip*) +Supplements: modalias(usb:v0C4Bp0551d*dc*dsc*dp*ic*isc*ip*) +Supplements: modalias(usb:v0C4Bp2002d*dc*dsc*dp*ic*isc*ip*) Requires: pcsc-lite %description @@ -82,7 +88,7 @@ %setup -q cp -a %{S:1} README.SUSE %patch1 -%patch2 +%patch2 -p1 %patch3 -p1 %build @@ -95,32 +101,25 @@ --enable-udev=no \ %endif --with-usbdropdir=%{ifddir} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall %if %suse_version >= 1120 -mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_udevrulesdir} +mkdir -p %{buildroot}/%{_udevrulesdir} +install %{SOURCE2} %{buildroot}/%{_udevrulesdir} %endif # clean up -mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf{.default,} -# man pages -mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man8/ -mv $RPM_BUILD_ROOT%{_datadir}/man/*.8 $RPM_BUILD_ROOT%{_datadir}/man/man8/ +mv %{buildroot}/%{_sysconfdir}/cyberjack.conf{.default,} # exclude -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy/10osvendor/80-cyberjack.fdi -rm -rf $RPM_BUILD_ROOT%{_libdir}/cyberjack/pcscd_init.diff - -%clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot}/%{_sysconfdir}/hal/fdi/policy/10osvendor/80-cyberjack.fdi +rm -rf %{buildroot}/%{_libdir}/cyberjack/pcscd_init.diff %files %defattr(-,root,root) -%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* README.SUSE doc/LIESMICH.* +%doc COPYRIGHT.LGPL doc/README.* README.SUSE doc/LIESMICH.* %dir %{ifddir} %{ifddir}/libifd-cyberjack.bundle -%doc %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/cyberjack.conf %if %suse_version >= 1120 %{_udevrulesdir}/* ++++++ 40-cyberjack.rules ++++++ --- /var/tmp/diff_new_pack.ycyPs0/_old 2019-06-19 21:02:12.206178951 +0200 +++ /var/tmp/diff_new_pack.ycyPs0/_new 2019-06-19 21:02:12.206178951 +0200 @@ -20,5 +20,8 @@ ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0507", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0525", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0580", ENV{ID_SMARTCARD_READER}="1" +ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="2000", ENV{ID_SMARTCARD_READER}="1" +ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0551", ENV{ID_SMARTCARD_READER}="1" +ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="2002", ENV{ID_SMARTCARD_READER}="1" LABEL="cyberjack_rules_end" ++++++ no-checksuite.patch ++++++ diff --git a/Makefile.am b/Makefile.am index 592bcc2..51c4b22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ endif ACLOCAL_AMFLAGS=-I m4 -#SUBDIRS+=ifd libcyberjack checksuite tools debian doc +#SUBDIRS+=ifd libcyberjack tools debian doc SUBDIRS+=ifd libcyberjack tools doc diff --git a/configure.ac b/configure.ac index 5312853..0fd1b9b 100644 --- a/configure.ac +++ b/configure.ac @@ -736,7 +736,6 @@ AC_CONFIG_FILES([Makefile libcyberjack/Makefile libcyberjack/libdialog/Makefile libcyberjack/libdialog/base/Makefile - libcyberjack/checksuite/Makefile tools/Makefile tools/cjflash/Makefile tools/cjgeldkarte/Makefile diff --git a/libcyberjack/Makefile.am b/libcyberjack/Makefile.am index d045edb..3d59000 100644 --- a/libcyberjack/Makefile.am +++ b/libcyberjack/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=checksuite libdialog +SUBDIRS=libdialog INCLUDES= $(pcsc_includes) $(libxml2_includes) \ -I../include -I../include/driver -I../ifd -I../libcyberjack -I../cjeca32 -I../include/firmware -Iausb - ++++++ no-libdialog.patch ++++++ ++++ 1460 lines (skipped)