rpms/openct/devel openct-bundle-sofilename.patch, NONE, 1.1 openct-disable-cardman.patch, NONE, 1.1 openct-reader.conf, NONE, 1.1 openct.init, NONE, 1.1 openct.spec, NONE, 1.1 openct.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Feb 1 21:24:44 UTC 2005
Author: scop
Update of /cvs/extras/rpms/openct/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17566/devel
Modified Files:
.cvsignore sources
Added Files:
openct-bundle-sofilename.patch openct-disable-cardman.patch
openct-reader.conf openct.init openct.spec openct.sysconfig
Log Message:
auto-import openct-0.6.2-1 on branch devel from openct-0.6.2-1.src.rpm
openct-bundle-sofilename.patch:
--- NEW FILE openct-bundle-sofilename.patch ---
Index: macos/libtool-bundle
===================================================================
RCS file: /pub/cvsroot/openct/macos/libtool-bundle,v
retrieving revision 1.2
diff -a -u -u -r1.2 libtool-bundle
--- macos/libtool-bundle 16 Oct 2003 20:40:36 -0000 1.2
+++ macos/libtool-bundle 17 Aug 2004 19:28:57 -0000
@@ -68,7 +68,7 @@
[ -d "$root" ] && rm -rf "$root"
mkdir -p "$root"/Contents/$arch
-cp "$sofile" "$root"/Contents/$arch/"$name"
+cp "$sofile" "$root"/Contents/$arch/
echo "$type$creator" > "$root"/Contents/PkgInfo
create_info_plist ()
@@ -80,7 +80,7 @@
echo " <key>CFBundleDevelopmentRegion</key>"
echo " <string>English</string>"
echo " <key>CFBundleExecutable</key>"
- echo " <string>$name</string>"
+ echo " <string>`basename \"$sofile\"`</string>"
echo " <key>CFBundleInfoDictionaryVersion</key>"
echo " <string>6.0</string>"
echo " <key>CFBundleName</key>"
openct-disable-cardman.patch:
--- NEW FILE openct-disable-cardman.patch ---
diff -Naru openct-0.6.2.orig/etc/Info.plist openct-0.6.2/etc/Info.plist
--- openct-0.6.2.orig/etc/Info.plist 2004-08-31 23:44:12.000000000 +0300
+++ openct-0.6.2/etc/Info.plist 2005-02-01 22:21:41.645358832 +0200
@@ -12,18 +12,18 @@
<key>ifdVendorID</key>
<array>
- <string>0x076B</string> <!-- 1 -->
+ <!--string>0x076B</string--> <!-- 1 -->
<string>0x0529</string> <!-- 2 -->
</array>
<key>ifdProductID</key>
<array>
- <string>0x0596</string> <!-- 1 -->
+ <!--string>0x0596</string--> <!-- 1 -->
<string>0x050C</string> <!-- 2 -->
</array>
<key>ifdFriendlyName</key>
<array>
- <string>OMNIKEY CardMan 2020</string> <!-- 1 -->
+ <!--string>OMNIKEY CardMan 2020</string--> <!-- 1 -->
<string>Aladdin eToken PRO</string> <!-- 2 -->
</array>
diff -Naru openct-0.6.2.orig/etc/openct.conf.in openct-0.6.2/etc/openct.conf.in
--- openct-0.6.2.orig/etc/openct.conf.in 2004-06-29 01:44:10.000000000 +0300
+++ openct-0.6.2/etc/openct.conf.in 2005-02-01 22:39:25.218859061 +0200
@@ -54,9 +54,9 @@
};
driver cardman {
ids = {
- usb:076b/0596, # OMNIKEY CardMan 2020
- usb:076b/1784, # OMNIKEY CardMan 6020
- usb:08d4/0009, # Fujitsu Siemens SCR USB SmartCard Reader
+# usb:076b/0596, # OMNIKEY CardMan 2020
+# usb:076b/1784, # OMNIKEY CardMan 6020
+# usb:08d4/0009, # Fujitsu Siemens SCR USB SmartCard Reader
};
};
driver ccid {
diff -Naru openct-0.6.2.orig/etc/openct.usermap openct-0.6.2/etc/openct.usermap
--- openct-0.6.2.orig/etc/openct.usermap 2004-07-10 00:12:16.000000000 +0300
+++ openct-0.6.2/etc/openct.usermap 2005-02-01 22:18:13.399631957 +0200
@@ -12,8 +12,8 @@
# ikey3k
openct 0x0003 0x04b9 0x1300 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# cardman
-openct 0x0003 0x076b 0x0596 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-openct 0x0003 0x076b 0x1784 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-openct 0x0003 0x08d4 0x0009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x076b 0x0596 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x076b 0x1784 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+#openct 0x0003 0x08d4 0x0009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# ccid
openct 0x0380 0x0000 0x0000 0x0000 0x0000 0x00 0x00 0x00 0x0b 0x00 0x00 0x00000000
--- NEW FILE openct-reader.conf ---
# OpenCT readers that are not activated by hotplug
# FRIENDLYNAME "OpenCT reader"
# DEVICENAME /dev/null
# LIBPATH __LIBDIR__/openct-ifd.so
# CHANNELID 1
--- NEW FILE openct.init ---
#!/bin/sh
#
# openct This shell script takes care of starting and stopping OpenCT.
#
# chkconfig: 2345 24 89
# description: OpenCT is a middleware framework for smart card terminals.
#
# processname: ifdhandler
# config: /etc/openct.conf
. /etc/rc.d/init.d/functions
exec="/usr/sbin/openct-control"
prog=openct
proc=ifdhandler
OPENCT_OPTIONS=
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
lockfile=/var/lock/subsys/$prog
start() {
retval=0
if ! status $proc >/dev/null 2>&1 ; then
action $"Initializing OpenCT smart card terminals: " \
$exec $OPENCT_OPTIONS init
retval=$?
[ $retval -eq 0 ] && touch $lockfile
fi
return $retval
}
stop() {
action $"Stopping OpenCT smart card terminals: " \
$exec $OPENCT_OPTIONS shutdown
retval=$?
[ $retval -eq 0 ] && rm -f $lockfile
return $retval
}
restart() {
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
reload|force-reload)
restart
;;
status)
$exec $OPENCT_OPTIONS status
status $proc
;;
try-restart|condrestart)
[ ! -f $lockfile ] || restart
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
--- NEW FILE openct.spec ---
Name: openct
Version: 0.6.2
Release: 1
Epoch: 0
Summary: Middleware framework for smart card terminals
Group: System Environment/Libraries
License: BSD
URL: http://www.opensc.org/
Source0: http://www.opensc.org/files/openct-0.6.2.tar.gz
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-reader.conf
Patch0: %{name}-bundle-sofilename.patch
Patch1: %{name}-disable-cardman.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel libusb-devel sed
Requires: hotplug
Requires(post): /sbin/chkconfig /sbin/ldconfig
Requires(preun): /sbin/chkconfig
Requires(postun): /sbin/ldconfig
%description
OpenCT is a middleware framework for smart card terminals. It
provides a library with rich set of functions for driver writers,
protocol drivers for T=0 and T=1, serial and USB functionality,
including USB hotplugging. See openct.html in the included
documentation for configuration notes.
%package devel
Summary: OpenCT development files
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig
%description devel
%{summary}.
%package -n pcsc-lite-%{name}
Summary: OpenCT PC/SC Lite driver
Group: System Environment/Daemons
Requires: pcsc-lite >= 0:1.2.0
Provides: pcsc-ifd-handler
Provides: %{name}-pcsc-lite = %{epoch}:%{version}-%{release}
%description -n pcsc-lite-%{name}
The OpenCT PC/SC Lite driver makes smart card readers supported by
OpenCT available for PC/SC Lite.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
%build
%configure \
--disable-dependency-tracking \
--with-bundle-dir=%{_libdir}/pcsc/drivers
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
make install DESTDIR=$RPM_BUILD_ROOT
ln -sf %{_libdir}/openct-ifd.so \
$RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/
install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
install -Dpm 644 %{name}-reader.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/sbin/chkconfig --add openct
%preun
if [ $1 -eq 0 ] ; then
%{_initrddir}/openct stop >/dev/null 2>&1 || :
/sbin/chkconfig --del openct
fi
%postun
/sbin/ldconfig
if [ $1 -gt 0 ] ; then
%{_initrddir}/openct try-restart >/dev/null || :
fi
%post -n pcsc-lite-%{name}
if [ $1 -eq 1 ] ; then
%{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
fi
%postun -n pcsc-lite-%{name}
%{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog LICENSE NEWS TODO
%doc doc/openct.html doc/openct.css
%config(noreplace) %{_sysconfdir}/openct.conf
%config(noreplace) %{_sysconfdir}/sysconfig/openct
%config %{_sysconfdir}/hotplug/usb/openct*
%config %{_initrddir}/openct
%{_bindir}/openct-tool
%{_sbindir}/ifdhandler
%{_sbindir}/ifdproxy
%{_sbindir}/openct-control
%{_libdir}/libopenct.so.*
%{_libdir}/libifd.so.*
%{_libdir}/libopenctapi.so
%dir %{_localstatedir}/run/openct
%ghost %{_localstatedir}/run/openct/status
%files devel
%defattr(-,root,root,-)
%{_includedir}/openct
%{_libdir}/pkgconfig/libopenct.pc
%{_libdir}/libopenct.a
%{_libdir}/libopenct.so
%{_libdir}/libifd.a
%{_libdir}/libifd.so
%exclude %{_libdir}/libopenctapi.a
%exclude %{_libdir}/lib*.la
%files -n pcsc-lite-%{name}
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
%{_libdir}/openct-ifd.so
%{_libdir}/pcsc/drivers/openct-ifd.bundle/
%exclude %{_libdir}/openct-ifd.a
%exclude %{_libdir}/openct-ifd.la
%changelog
* Tue Feb 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.2-1
- Disable CardMan driver in default configs, too unreliable at the moment.
* Wed Nov 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.2-0.fdr.1
- Update to 0.6.2, eToken bundle patch applied upstream.
- Make scriptlet dependencies more granular.
* Tue Aug 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.1-0.fdr.2
- Split PC/SC Lite stuff into the pcsc-lite-openct subpackage, use symlinks
to avoid packaging the same .so many times.
- Install reader.conf snippet for pcsc-lite.
- Patch to make eToken PRO hotplug work with PC/SC Lite.
- Exclude more unneeded files from docs and -devel.
- Disable dependency tracking to speed up the build.
* Thu Jul 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.1-0.fdr.1
- Update to 0.6.1 (preview).
* Thu Jul 1 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.0-0.fdr.0.1.alpha
- Update to 0.6.0-alpha.
* Fri Apr 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.6
- Init script improvements.
* Wed Feb 4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.5
- Autostart service in runlevels 2-5.
* Thu Jan 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.4
- More init script fine tuning.
* Mon Jan 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.3
- Init script improvements.
* Mon Dec 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.2
- Include init script and a sysconfig file.
- Improve summary and description.
* Mon Nov 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.1
- Update to 0.5.0.
* Fri Nov 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.0-0.fdr.2
- Create /var/run/openct/status to avoid OpenSC errors.
* Tue Aug 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.0-0.fdr.1
- First build.
--- NEW FILE openct.sysconfig ---
# -*- sh -*-
# Extra options to pass to openct-control.
# Consult "/usr/sbin/openct-control -h" for available options.
#
OPENCT_OPTIONS=""
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Feb 2005 21:23:24 -0000 1.1
+++ .cvsignore 1 Feb 2005 21:24:42 -0000 1.2
@@ -0,0 +1 @@
+openct-0.6.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Feb 2005 21:23:24 -0000 1.1
+++ sources 1 Feb 2005 21:24:42 -0000 1.2
@@ -0,0 +1 @@
+18d8bca0372515842fec9f366ca461d1 openct-0.6.2.tar.gz
More information about the fedora-extras-commits
mailing list