rpms/ctapi-cyberjack/devel ctapi-cyberjack_Bug_191515.patch, NONE, 1.1 ctapi-cyberjack.spec, 1.1, 1.2 ctapi-cyberjack_MakefileCtAPI.patch, 1.1, 1.2 ctapi-cyberjack_MakefilePCSC.patch, 1.1, 1.2
Frank Büttner (frankb)
fedora-extras-commits at redhat.com
Sat May 27 11:48:00 UTC 2006
Author: frankb
Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8147
Modified Files:
ctapi-cyberjack.spec ctapi-cyberjack_MakefileCtAPI.patch
ctapi-cyberjack_MakefilePCSC.patch
Added Files:
ctapi-cyberjack_Bug_191515.patch
Log Message:
- first test for the new version 2.0.10 of the driver
- it need some testing because on some kernels sometimes the reader will
not found
ctapi-cyberjack_Bug_191515.patch:
--- NEW FILE ctapi-cyberjack_Bug_191515.patch ---
diff -Naur ctapi-cyberjack-2.0.10.org/makevars ctapi-cyberjack-2.0.10/makevars
--- ctapi-cyberjack-2.0.10.org/makevars 2006-05-27 12:40:17.000000000 +0200
+++ ctapi-cyberjack-2.0.10/makevars 2006-05-27 12:43:51.000000000 +0200
@@ -23,7 +23,7 @@
CFLAGS+= -DHAVE_READLINE_HISTORY_H -DHAVE_READLINE_READLINE_H
# include the known include folders
-CFLAGS+= -I/usr/local/include -I/usr/include
+CFLAGS+= -I/lib/modules/XX/source/include
# the following is debugging stuff. If all works fine you want need this
Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1
+++ ctapi-cyberjack.spec 27 May 2006 11:48:00 -0000 1.2
@@ -1,42 +1,46 @@
Name: ctapi-cyberjack
Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version: 2.0.8
-Release: 13%{?dist}
-Requires: %{_libdir}/ctapi
-#For FC>4
-BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
-#For FC4
-#BuildRequires: libusb-devel readline-devel
-URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2
+Version: 2.0.10
+Release: 1_FC4
+BuildRequires: libusb, readline-devel, ncurses-devel, kernel-devel
License: LGPL
-Group: Development/Libraries
+Group: System Environment/Libraries
Source: %{name}-%{version}.tar.bz2
-Patch0: ctapi-cyberjack_MakefileCtAPI.patch
-Patch1: ctapi-cyberjack_MakefilePCSC.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#for FC4
-#%%define readers_dir %{_libdir}/readers
-#for FC>4
-%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)
+Patch0: ctapi-cyberjack-2.0.4-rh73_old_libusb.patch
+Buildroot: %{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root
+
+#%define prefix /usr
+#%define lib_dir %{prefix}/lib
+%define readers_dir %{_libdir}/readers
+
+%package ifd-handler
+Summary: cyberjack PC/SC IFD handler for pcsc-lite
+Requires: %{name} = %{version}
+Group: System Environment/Libraries
+
+%description ifd-handler
+REINER SCT cyberJack pinpad/e-com USB user space driver
+
+This package includes the PC/SC IFD handler driver for the cyberJack
+pinpad/e-com USB chipcard reader.
+
%package devel
Summary: Development files for libctapi-cyberjack
Requires: %{name} = %{version}
Group: Development/Libraries
-%package pcsc
-Summary: PC/SC Module
-Requires: pcsc-lite
-Group: Development/Libraries
-
%description
REINER SCT cyberJack pinpad/e-com USB user space driver
This package includes the CT-API driver for the cyberJack pinpad/e-com
USB chipcard reader.
+This package changes the permissions of /dev/ttyUSB devices 0-3 to
+2666. This gives the users the possibility to access the devices and
+enables mandatory locking.
+
The kernel side driver is included in the official linux kernel starting
with version 2.4.6.
@@ -45,166 +49,111 @@
controllers.
For more information about the reader, software updates and a shop see
-http://www.reiner-sct.com
-
- WARNING
-Use the tool ctsh only when you know what you are doing!!!
-Or you can damage your SmartCard!!!
-
- Hint
-When using the CT-API lib you must first stop the PC/SC daemon,
-when you use it.
+http://www.reiner-sct.com/
%description devel
Development files for libctapi-cyberjack
-%description pcsc
-Files for the PC/SC system.
-
%prep
%setup -q -n %{name}-%{version}
-#fix path for the driver lib the config file
- sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \
- etc/reader.conf
-
-#fix reader.conf for FC>4
- sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf
-
-%patch0 -p1
-%patch1 -p1
-
%build
-#make %{?_smp_mflags} will fail!!!
-make
+##Fedora korrektur
+sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu
+mv makevars.neu makevars
+make
%install
-rm -rf $RPM_BUILD_ROOT
-
+if [ -n "%{buildroot}" ] ; then
+ [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+fi
# CT-API
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so
-install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h
-install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte
-install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh
-
+mkdir -p %{buildroot}/%{readers_dir}
+install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version}
+install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a
+( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so )
+( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so )
+( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so )
+( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a )
+mkdir -p %{buildroot}/%{_includedir}
+install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h
+mkdir -p %{buildroot}/%{_bindir}
+install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte
+install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh
# PC/SC
-mkdir -p $RPM_BUILD_ROOT%{readers_dir}
-install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
-install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf
-
-%post pcsc
-#register PC/SC driver and restart daemon
-/sbin/service pcscd condrestart||:
-
-%postun pcsc
-#unregister PC/SC driver and restart daemon
-/sbin/service pcscd condrestart||:
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+#mkdir -p %{buildroot}/%{readers_dir}
+mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux
+install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version}
+install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist
+install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo
+( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so )
+( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so )
+mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d
+install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf
+
+%pre
+groupadd -r cyberjack 2>/dev/null || :
+
+%post ifd-handler
+/usr/sbin/update-reader.conf
+
+%post
+if [ -e /dev/ttyUSB0 ] ; then
+ chmod 2666 /dev/ttyUSB0
+else
+ mknod -m 2666 /dev/ttyUSB0 c 188 0
+fi
+if [ -e /dev/ttyUSB1 ] ; then
+ chmod 2666 /dev/ttyUSB1
+else
+ mknod -m 2666 /dev/ttyUSB1 c 188 1
+fi
+if [ -e /dev/ttyUSB2 ] ; then
+ chmod 2666 /dev/ttyUSB2
+else
+ mknod -m 2666 /dev/ttyUSB2 c 188 2
+fi
+if [ -e /dev/ttyUSB3 ] ; then
+ chmod 2666 /dev/ttyUSB3
+else
+ mknod -m 2666 /dev/ttyUSB3 c 188 3
+fi
%clean
-rm -rf $RPM_BUILD_ROOT
+if [ -n "%{buildroot}" ] ; then
+ [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+fi
%files
-%doc COPYRIGHT*
-%doc doc/README.txt
-%doc doc/README.pdf
-%doc doc/README.html
-
-%defattr(-,root,root,-)
+%defattr(0644,root,root)
+%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example
# CT-API
-%{_libdir}/ctapi/libctapi-cyberjack.so
-%{_bindir}/cjgeldkarte
-%{_bindir}/ctsh
+%{readers_dir}/libctapi-cyberjack.so.%{version}
+%{readers_dir}/libctapi-cyberjack.so
+%{readers_dir}/libctapi.so
+%{_libdir}/libctapi.so
+%attr(0755,root,root) %{_bindir}/cjgeldkarte
+%attr(0755,root,root) %{prefix}/bin/ctsh
-%files pcsc
# PC/SC
-%defattr(755,root,root)
+%files ifd-handler
+/%{readers_dir}/libcyberjack_ifd.so.%{version}
/%{readers_dir}/libcyberjack_ifd.so
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf
+%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo
+%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist
+%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so
+%{_sysconfdir}/reader.conf.d/cyberjack.conf
%files devel
%defattr(0644,root,root)
-%{_includedir}/ctapi-cyberjack/ctapi.h
-
-%changelog
-* Thu May 11 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-13%{?dist}
-- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to
- libcyberjack_ifd.so
-- fix place for the comments of /sbin/service pcscd condrestart
-
-* Wed May 10 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-12%{?dist}
-- fix comments for %%post/%%postun pcsc
-- fix call of restart the PC/SC daemon
-- move to the old version of dependency for the PC/SC package
-- add -soname option in PS/SC driver
-
-* Tue May 9 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-11%{?dist}
-- remove comments at %%post and %%postun
-- remove unneeded /usr/sbin/update-reader.conf call
-
-* Mon May 8 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-10%{?dist}
-- fix ldconfig for the PC/SC part
-- fix dependency for the PC/SC package
-- fix build dependency for the package.
-
-* Mon May 8 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-9%{?dist}
-- restart PC/SC daemon only when it run's
-- fix CT-API version bug so that apps can find it in the ldcache via
- libctapi-cyberjack.so
-- add comment about using CT-API and PC/SC together
-
-* Sun May 7 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-8%{?dist}
-- add requirement of the ctapi dir under %{_libdir}
-- the CT-API lib lives now under %{_libdir}/ctapi
-- reenable link the ctapi driver static in the PC/SC part
-- run ldconfig after install/uninstall
-
-* Mon May 1 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-7%{?dist}
-- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec
-- fix permisson of the PC/SC config file
-- restart PC/SC daemon after remove the PS/SC driver
-
-* Sun Apr 30 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-6%{?dist}
-- replace if statements with comments
-- replace german to english comments
-- fix the makefile for the CT-API lib
-- correct naming the libs CT-API and PS/SC
-- rename package PS/SC to pcsc
-- replace RPM_BUILD_ROOT
-- fix doc
-- add warning for the tool ctsh
-
-* Thu Apr 27 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-5%{dist}
-- fix owner of lib's
-- add PC/SC fix for FC5
-- restart pcscd
-
-* Thu Apr 27 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-4%{dist}
-- change permisson of all lib's to 0755
-- rename lib files to support more reader's
-- fix the path of the CT-API part and the devel file
-- support FC4 and FC5
-
-* Sat Apr 15 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-3%{dist}
-- remove makefile workaround
-
-* Sat Apr 15 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-2%{dist}
-- remove packager
-- remove hardcodet Fedora Tag
-- rename file from ctapi-cyberjack-version to ctapi-cyberjack
-- modify source URL
-- fix clean section
-
-* Sat Apr 08 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-1.FC4
-- start for Fedora
-- sepperate the PC/SC part
+%{_includedir}/ctapi.h
+%{readers_dir}/libctapi-cyberjack.a
+%{_libdir}/libctapi-cyberjack.a
+
+%changelog -n ctapi-cyberjack
+* Mon May 30 2005 - Harald Welte <hwelte at hmw-consulting.de>
++ ctapi-cyberjack-2.0.9-1
+- add pcsc-lite 'dropdir' compatible PC/SC driver
* Wed Mar 02 2005 - Harald Welte <hwelte at hmw-consulting.de>
+ ctapi-cyberjack-2.0.8-1
ctapi-cyberjack_MakefileCtAPI.patch:
Index: ctapi-cyberjack_MakefileCtAPI.patch
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefileCtAPI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctapi-cyberjack_MakefileCtAPI.patch 11 May 2006 14:40:35 -0000 1.1
+++ ctapi-cyberjack_MakefileCtAPI.patch 27 May 2006 11:48:00 -0000 1.2
@@ -1,13 +1,12 @@
-diff -Naur ctapi-cyberjack-2.0.8.org/ctapi/Makefile ctapi-cyberjack-2.0.8/ctapi/Makefile
---- ctapi-cyberjack-2.0.8.org/ctapi/Makefile 2005-02-15 00:57:54.000000000 +0100
-+++ ctapi-cyberjack-2.0.8/ctapi/Makefile 2006-05-01 10:50:54.000000000 +0200
-@@ -22,7 +22,8 @@
+diff -Naur ctapi-cyberjack-2.0.10.org/ctapi/Makefile ctapi-cyberjack-2.0.10/ctapi/Makefile
+--- ctapi-cyberjack-2.0.10.org/ctapi/Makefile 2006-05-27 12:40:17.000000000 +0200
++++ ctapi-cyberjack-2.0.10/ctapi/Makefile 2006-05-27 13:17:09.000000000 +0200
+@@ -22,7 +22,7 @@
$(CC) $(CFLAGS) -o $@ -c $^
libso: $(OBJS) $(LIBS)
- ld -x --shared -lusb -o libctapi-cyberjack.so $(OBJS) $(LIBS)
-+ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so \
-+ $(OBJS) $(LIBS)
++ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so $(OBJS) $(LIBS)
liba: $(OBJS) $(LIBS)
mkdir tmp
ctapi-cyberjack_MakefilePCSC.patch:
Index: ctapi-cyberjack_MakefilePCSC.patch
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefilePCSC.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctapi-cyberjack_MakefilePCSC.patch 11 May 2006 14:40:35 -0000 1.1
+++ ctapi-cyberjack_MakefilePCSC.patch 27 May 2006 11:48:00 -0000 1.2
@@ -1,12 +1,12 @@
-diff -Naur ctapi-cyberjack-2.0.8.org/pcsc/Makefile ctapi-cyberjack-2.0.8/pcsc/Makefile
---- ctapi-cyberjack-2.0.8.org/pcsc/Makefile 2005-02-15 00:59:03.000000000 +0100
-+++ ctapi-cyberjack-2.0.8/pcsc/Makefile 2006-05-01 10:55:41.000000000 +0200
-@@ -20,7 +18,7 @@
- install -o root -g root libcyberjack_ifd.so $(INSTALL_PREFIX)/lib
+diff -Naur ctapi-cyberjack-2.0.10.org/pcsc/Makefile ctapi-cyberjack-2.0.10/pcsc/Makefile
+--- ctapi-cyberjack-2.0.10.org/pcsc/Makefile 2006-05-27 12:40:17.000000000 +0200
++++ ctapi-cyberjack-2.0.10/pcsc/Makefile 2006-05-27 13:19:27.000000000 +0200
+@@ -24,7 +24,7 @@
+ install -o root -g root $(PLUGDIR)/PkgInfo $(INSTALL_PREFIX)/lib/pcsc/drivers/$(PLUGDIR)/PkgInfo
libso: $(OBJS)
-- ld -x --shared -lusb -o libcyberjack_ifd.so $(OBJS)
-+ ld -x --shared -lusb -lc -soname libcyberjack_ifd.so -o libcyberjack_ifd.so $(OBJS)
+- ld -x --shared -lusb -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS)
++ ld -x --shared -lusb -lc -soname ifd-cyberjack.so -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS)
liba: $(OBJS)
ar r libcyberjack_ifd.a $(OBJS) $(CTOBJS)
More information about the scm-commits
mailing list