Update to 1.6.1
This commit is contained in:
parent
e119734543
commit
df1c7ae3ef
|
@ -1 +1 @@
|
||||||
pcsc-lite-1.5.5.tar.bz2
|
pcsc-lite-1.6.1.tar.bz2
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
pcsc-lite-1_4_102-1_rhel5_bob:HEAD:pcsc-lite-1.4.102-1.rhel5_bob.src.rpm:1219883684
|
|
||||||
pcsc-lite-1_5_2-1_fc10_bob:HEAD:pcsc-lite-1.5.2-1.fc10_bob.src.rpm:1236299703
|
|
|
@ -1,17 +0,0 @@
|
||||||
diff -up ./src/sys_unix.c.close_on_exec ./src/sys_unix.c
|
|
||||||
--- ./src/sys_unix.c.close_on_exec 2009-02-24 16:02:47.641288000 -0800
|
|
||||||
+++ ./src/sys_unix.c 2009-02-24 16:10:25.774746000 -0800
|
|
||||||
@@ -123,9 +123,12 @@ INTERNAL int SYS_USleep(int iTimeVal)
|
|
||||||
* @retval >0 The file descriptor.
|
|
||||||
* @retval -1 An error ocurred.
|
|
||||||
*/
|
|
||||||
+
|
|
||||||
INTERNAL int SYS_OpenFile(const char *pcFile, int flags, int mode)
|
|
||||||
{
|
|
||||||
- return open(pcFile, flags, mode);
|
|
||||||
+ int fd = open(pcFile, flags, mode);
|
|
||||||
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
||||||
+ return fd;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
|
@ -1,27 +0,0 @@
|
||||||
diff -up pcsc-lite-1.5.5/etc/pcscd.init.in.lsb_header pcsc-lite-1.5.5/etc/pcscd.init.in
|
|
||||||
--- pcsc-lite-1.5.5/etc/pcscd.init.in.lsb_header 2008-05-09 17:59:08.000000000 +0300
|
|
||||||
+++ pcsc-lite-1.5.5/etc/pcscd.init.in 2010-04-13 12:56:33.000000000 +0300
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
#
|
|
||||||
# pcscd Starts the pcscd Daemon
|
|
||||||
#
|
|
||||||
-# chkconfig: 2345 25 88
|
|
||||||
+# chkconfig: 2345 27 73
|
|
||||||
# description: The PC/SC smart card daemon is a resource manager for the \
|
|
||||||
# PC/SC lite and Musclecard frameworks. It coordinates \
|
|
||||||
# communications with smart card readers, smart cards, and \
|
|
||||||
@@ -13,10 +13,10 @@
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: pcscd
|
|
||||||
-# Required-Start: $local_fs $remote_fs $syslog
|
|
||||||
-# Required-Stop: $local_fs $remote_fs $syslog
|
|
||||||
-# Should-Start: udev hal openct
|
|
||||||
-# Should-Stop: udev hal openct
|
|
||||||
+# Required-Start: $local_fs $remote_fs $syslog haldaemon
|
|
||||||
+# Required-Stop: $local_fs $remote_fs $syslog haldaemon
|
|
||||||
+# Should-Start: openct
|
|
||||||
+# Should-Stop: openct
|
|
||||||
# Default-Start: 2 3 4 5
|
|
||||||
# Default-Stop: 0 1 6
|
|
||||||
# Short-Description: Daemon to access a smart card using PC/SC
|
|
|
@ -1,19 +1,17 @@
|
||||||
%global upstream_build 3082
|
%global upstream_build 3298
|
||||||
|
|
||||||
Name: pcsc-lite
|
Name: pcsc-lite
|
||||||
Version: 1.5.5
|
Version: 1.6.1
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: PC/SC Lite smart card framework and applications
|
Summary: PC/SC Lite smart card framework and applications
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://pcsclite.alioth.debian.org/
|
URL: http://pcsclite.alioth.debian.org/
|
||||||
Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
|
Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
|
||||||
|
Source1: pcscd.init
|
||||||
Patch0: %{name}-1.4-docinst.patch
|
Patch0: %{name}-1.4-docinst.patch
|
||||||
Patch1: %{name}-1.5.5-rpath64.patch
|
Patch1: %{name}-1.5.5-rpath64.patch
|
||||||
Patch2: %{name}-close_on_exec.patch
|
|
||||||
# Fedora specific changes to init script LSB header and start/stop priorities
|
|
||||||
Patch3: %{name}-lsb_header.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
@ -64,14 +62,19 @@ BuildArch: noarch
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0 -b .docinst
|
%patch0 -p0 -b .docinst
|
||||||
%patch1 -p1 -b .rpath64
|
%patch1 -p1 -b .rpath64
|
||||||
%patch2 -p1 -b .close_on_exec
|
|
||||||
%patch3 -p1 -b .lsb_header
|
# Convert to utf-8
|
||||||
|
for file in ChangeLog; do
|
||||||
|
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
||||||
|
touch -r $file $file.new && \
|
||||||
|
mv $file.new $file
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--disable-dependency-tracking \
|
--disable-dependency-tracking \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-confdir=%{_sysconfdir} \
|
|
||||||
--enable-ipcdir=%{_localstatedir}/run \
|
--enable-ipcdir=%{_localstatedir}/run \
|
||||||
--enable-usbdropdir=%{_libdir}/pcsc/drivers
|
--enable-usbdropdir=%{_libdir}/pcsc/drivers
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
@ -83,19 +86,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
|
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
|
||||||
|
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
|
||||||
|
|
||||||
install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
|
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/pcscd
|
||||||
|
|
||||||
cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README
|
# remove setuid bit
|
||||||
All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
|
chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/pcscd
|
||||||
by %{_sbindir}/update-reader.conf.
|
|
||||||
EOF
|
|
||||||
|
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||||
|
|
||||||
rm $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
|
|
||||||
touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
@ -124,15 +123,11 @@ fi
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO
|
%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO
|
||||||
%dir %{_sysconfdir}/reader.conf.d/
|
%dir %{_sysconfdir}/reader.conf.d/
|
||||||
%doc %{_sysconfdir}/reader.conf.d/README
|
|
||||||
%ghost %config(noreplace) %{_sysconfdir}/reader.conf
|
|
||||||
%{_initrddir}/pcscd
|
%{_initrddir}/pcscd
|
||||||
%{_sbindir}/pcscd
|
%{_sbindir}/pcscd
|
||||||
%{_sbindir}/update-reader.conf
|
|
||||||
%{_libdir}/pcsc/
|
%{_libdir}/pcsc/
|
||||||
%{_mandir}/man5/reader.conf.5*
|
%{_mandir}/man5/reader.conf.5*
|
||||||
%{_mandir}/man8/pcscd.8*
|
%{_mandir}/man8/pcscd.8*
|
||||||
%{_mandir}/man8/update-reader.conf.8*
|
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
@ -150,6 +145,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 18 2010 Kalev Lember <kalev@smartlink.ee> - 1.6.1-1
|
||||||
|
- Update to 1.6.1
|
||||||
|
|
||||||
* Tue Apr 13 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.5-4
|
* Tue Apr 13 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.5-4
|
||||||
- Fix init script start / stop priorities (#580322)
|
- Fix init script start / stop priorities (#580322)
|
||||||
- Don't require pkgconfig as the dep is now automatically generated by rpm
|
- Don't require pkgconfig as the dep is now automatically generated by rpm
|
||||||
|
|
|
@ -0,0 +1,84 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# pcscd Starts the pcscd Daemon
|
||||||
|
#
|
||||||
|
# chkconfig: 2345 27 73
|
||||||
|
# description: The PC/SC smart card daemon is a resource manager for the \
|
||||||
|
# PC/SC lite and Musclecard frameworks. It coordinates \
|
||||||
|
# communications with smart card readers, smart cards, and \
|
||||||
|
# cryptographic tokens that are connected to the system.
|
||||||
|
#
|
||||||
|
# processname: pcscd
|
||||||
|
# config: /etc/reader.conf
|
||||||
|
#
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: pcscd
|
||||||
|
# Required-Start: $local_fs $remote_fs $syslog haldaemon
|
||||||
|
# Required-Stop: $local_fs $remote_fs $syslog haldaemon
|
||||||
|
# Should-Start: openct
|
||||||
|
# Should-Stop: openct
|
||||||
|
# Default-Start: 2 3 4 5
|
||||||
|
# Default-Stop: 0 1 6
|
||||||
|
# Short-Description: Daemon to access a smart card using PC/SC
|
||||||
|
# Description: The PC/SC smart card daemon is a resource manager for the
|
||||||
|
# PC/SC lite and Musclecard frameworks. It coordinates
|
||||||
|
# communications with smart card readers, smart cards, and
|
||||||
|
# cryptographic tokens that are connected to the system.
|
||||||
|
### END INIT INFO
|
||||||
|
#
|
||||||
|
# Note! pcscd should be started after pcmcia, and shut down before it
|
||||||
|
# for smooth experience with PCMCIA readers.
|
||||||
|
|
||||||
|
. /etc/init.d/functions
|
||||||
|
|
||||||
|
umask 077
|
||||||
|
|
||||||
|
exec=/usr/sbin/pcscd
|
||||||
|
prog=$(basename $exec)
|
||||||
|
lockfile=/var/lock/subsys/$prog
|
||||||
|
PCSCD_OPTIONS=
|
||||||
|
|
||||||
|
# Source config
|
||||||
|
if [ -f /etc/sysconfig/pcscd ] ; then
|
||||||
|
. /etc/sysconfig/pcscd
|
||||||
|
fi
|
||||||
|
|
||||||
|
start() {
|
||||||
|
echo -n $"Starting PC/SC smart card daemon ($prog): "
|
||||||
|
/usr/sbin/update-reader.conf && daemon $prog $PCSCD_OPTIONS
|
||||||
|
retval=$?
|
||||||
|
echo
|
||||||
|
[ $retval -eq 0 ] && touch $lockfile
|
||||||
|
return $retval
|
||||||
|
}
|
||||||
|
stop() {
|
||||||
|
echo -n $"Stopping PC/SC smart card daemon ($prog): "
|
||||||
|
killproc $prog
|
||||||
|
retval=$?
|
||||||
|
echo
|
||||||
|
[ $retval -eq 0 ] && rm -f $lockfile
|
||||||
|
return $retval
|
||||||
|
}
|
||||||
|
restart() {
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start|stop|restart)
|
||||||
|
$1
|
||||||
|
;;
|
||||||
|
reload|force-reload)
|
||||||
|
restart
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
status $prog
|
||||||
|
;;
|
||||||
|
condrestart|try-restart)
|
||||||
|
[ ! -f $lockfile ] || restart
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
|
||||||
|
exit 2
|
||||||
|
esac
|
Loading…
Reference in New Issue