diff --git a/pcsc-lite-1.8.17.tar.bz2 b/pcsc-lite-1.8.17.tar.bz2 deleted file mode 100644 index 66c69a2..0000000 --- a/pcsc-lite-1.8.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d72b6f8654024f2a1d2de70f8f1d39776bd872870a4f453f436fd93d4312026f -size 716673 diff --git a/pcsc-lite-1.8.17.tar.bz2.asc b/pcsc-lite-1.8.17.tar.bz2.asc deleted file mode 100644 index 6c25244..0000000 --- a/pcsc-lite-1.8.17.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJXSt2lAAoJEHihtN/o+cV+9fYP/17gqrVb9hs6+/Ty7OUmKv9Q -gsOc6gYPCs6zzLmnH8kNKCJ4AZVS7082mWJDHhUAIhJ8tbw5X61nXhwkeg4DK9Qu -v+RcH6UPHTn2DAlL940D7mW9J2MehZK+ldtzDwwvhaepQ8ovdUKtOy2/fUgOQ9sp -PXQo4Zoaipj0ka+XUu/6JIxyfsZ3oFssm1fZkUfVN3FUb6WTeQ1GffXMk5xsVSsx -WjfptSDU5/9GSObqX5/akr27tZ+/fYkCY96Pe+SPSyWQ0X301Xs29T+keM1nWtq7 -yZqINvZ4MxJWc+LHTtDGfZZXyC2t/SqKZXmDPb4KgdHBJaQJN9Ju+xe91MU6iUyv -vQE25+Bxh2LJLAqH1mNYX9N/ujuMYXPNKBrJ2+7XK2vcxYgrKahXasPU9RF+kHai -XdbzTYCyVoy65xt4jhjmwt8Iyp+au6cUdOp6mEtmHgky29LQCj0jrjPkI9VceNSC -MkqkXA3yo8Movcqd75rnZC205voalVv4m2EfCRew4V10CHWu56m4zB75E7phEsvm -Mqvq04I8Hx/Qruz2aJ2NXmHIucGVLZWIOm1kdurpu9+TMpEga9MrPgNvU+h9SIP4 -PJMlSkfgCZagfveRewJNN4ayi+rUboI+6ih9saOpzDkMqqs3jcLe9FUp/rBVZ8ks -6GhafyYfm2hVf8SPdQ16 -=ZIfJ ------END PGP SIGNATURE----- diff --git a/pcsc-lite-1.8.18.tar.bz2 b/pcsc-lite-1.8.18.tar.bz2 new file mode 100644 index 0000000..b25fa89 --- /dev/null +++ b/pcsc-lite-1.8.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b22d32b018f6a1016adba91abfcc63876cca999daa472dd86e953ddd41d00905 +size 741987 diff --git a/pcsc-lite-1.8.18.tar.bz2.asc b/pcsc-lite-1.8.18.tar.bz2.asc new file mode 100644 index 0000000..62467ac --- /dev/null +++ b/pcsc-lite-1.8.18.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJXq3eNAAoJEHihtN/o+cV+mZgP/RcRD1s2zvfFiKNQtwYXkOXv +uxR6TVanTbkO9+OCbJRd8oF7kUTVFws8jKlS9hxykjiVacKfxJePKODI7EDd7wN7 +Gu07mfZRFPUYNmwvOtp8zaqyLYi788fnIcp4b3VSRc0MS1iQW7fSGi8Gg66fHX7L +1moLQInI/UOiIQilJXjxTQResC1H4vBgdDMmoeeJCzqEnSRR7qFxqKCRxHlfCCGF +kSbXRtkXBBTbLKqW/4UYFqc9GJwisYJ/N0C+PjhHe2a37uGMEWFWWHrxxjXdNw9f +I1KH6CzbveUjGoAxQHQy//Kab2KtZKlsA90mt5iQA7du/B8lAkHRyKMJ6I6dyT8r +78Mj4COVbDpS1GLekCWNh6Y9jzAvonancyYmJ0xkzfpcijCRzZ7cB/wq6E9F8yZH +LMPRMqUX/yTg+3fU26NxFcVaJR81XflPwIhTB44UM/14aQO/K1QSGVqmdLGffgtD +uzWup4f1PJVX+mGoTV1HuQWTg/n5/UgtMYudpTmP6k02/MVNsyEoxYThk/EfL4z/ +X9R9xR8FDqLxMgAsl/69sswEpv8cy0sJ4GD5iQM+YFPIoA1g6Z4HBNgYgpcf3HLd +4qZRDqrS71rrzwY14Zu5x4g/rTKA7DTrKqMhk6wN0fs7kP4g0A/qAsHbaRkGM79W +toQAyflbynlaIkBzncnf +=Z4W9 +-----END PGP SIGNATURE----- diff --git a/pcsc-lite-init b/pcsc-lite-init deleted file mode 100644 index 6d33fa3..0000000 --- a/pcsc-lite-init +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# pcscd Starts the pcscd Daemon -# -# chkconfig: 2345 25 88 -# 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 -# Required-Stop: $local_fs $remote_fs $syslog -# Should-Start: udev openct -# Should-Stop: udev openct -# Default-Start: 2 3 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. -# X-UnitedLinux-Default-Enabled: yes -### END INIT INFO -# -# Note! pcscd should be started after pcmcia, and shut down before it -# for smooth experience with PCMCIA readers. - -. /etc/rc.status -rc_reset - -umask 077 - -exec=/usr/sbin/pcscd -prog=$(basename $exec) -lockfile=/var/lock/$prog -PCSCD_OPTIONS= - -# Source config -if [ -f /etc/sysconfig/pcscd ] ; then - . /etc/sysconfig/pcscd -fi - -cleanup() { - # if comm socket exists but pid file is absent pcscd fails to start - # bnc#686674 - if [ -S /var/run/pcscd/pcscd.comm -a ! -e /var/run/pcscd/pcscd.pid ]; then - # check if a pcscd instance is running and remove the socket in case it's not - checkproc $exec || rm /var/run/pcscd/pcscd.comm - fi -} - -start() { - echo -n "Starting PC/SC smart card daemon ($prog): " - cleanup - startproc $exec $PCSCD_OPTIONS - retval=$? - rc_status - [ $retval -eq 0 ] && touch $lockfile - rc_status -v -} -stop() { - echo -n "Stopping PC/SC smart card daemon ($prog): " - killproc $exec - retval=$? - rc_status - [ $retval -eq 0 ] && rm -f $lockfile - rc_status -v -} -restart() { - stop - start -} - - -case "$1" in - start|stop|restart) - $1 - ;; - reload|force-reload) - restart - ;; - status) - echo -n "Checking for PC/SC smart card daemon ($prog): " - checkproc $exec - rc_status -v - ;; - condrestart|try-restart) - if test -f $lockfile ; then - restart - else - rc_reset - fi - rc_status - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" - exit 2 -esac -rc_exit diff --git a/pcsc-lite.changes b/pcsc-lite.changes index b5de811..b568446 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Sep 8 10:38:46 UTC 2016 - tchvatal@suse.com + +- Version update to 1.8.18: + * SCardDisconnect(): much faster with SCARD_UNPOWER_CARD + * SCardConnect(): Fix a possible duplicated hCard context + * Fix compilation on FreeBSD + * Fix compilation on Solaris + * Some other minor improvements + +------------------------------------------------------------------- +Thu Sep 8 10:36:07 UTC 2016 - tchvatal@suse.com + +- Obsolete the conditionals for sle11 as it does not build there and + ends unresolvable anyway +- Remove the presets magic after discussion with standa as new macros + actually work around this correctly + ------------------------------------------------------------------- Mon May 30 06:34:15 UTC 2016 - wr@rosenauer.org diff --git a/pcsc-lite.spec b/pcsc-lite.spec index b4a62af..16ded65 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -21,7 +21,7 @@ %define USER scard %define GROUP scard Name: pcsc-lite -Version: 1.8.17 +Version: 1.8.18 Release: 0 Summary: PCSC Smart Cards Library License: BSD-3-Clause @@ -30,9 +30,7 @@ Url: http://pcsclite.alioth.debian.org/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Source2: README.SUSE -Source3: pre_checkin.sh Source4: baselibs.conf -Source5: pcsc-lite-init Source6: pcsc-lite-reader-conf Source7: %{name}-%{version}.tar.bz2.asc Source8: %{name}.keyring @@ -45,21 +43,10 @@ Requires: libpcsclite1 = %{version} Requires(post): %fillup_prereq Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1320 -BuildRequires: polkit-devel -%endif -%if 0%{?suse_version} >= 1120 BuildRequires: libudev-devel -%else -BuildRequires: libusb-1_0-devel -%endif -%if 0%{?suse_version} > 1140 +BuildRequires: polkit-devel BuildRequires: systemd-rpm-macros %{?systemd_requires} -%else -Requires(post): %insserv_prereq -Requires(post): sysvinit(syslog) -%endif %description The purpose of PCSC Lite is to provide a Windows(R) SCard interface in @@ -125,23 +112,15 @@ compile plugins for the pcsc-lite package. %prep %setup -q %patch0 -p1 -cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} . +cp -a %{SOURCE1} %{SOURCE2} %{SOURCE6} . %build -%configure\ +%configure \ + --disable-silent-rules \ --docdir=%{_docdir}/%{name} \ --enable-usbdropdir=%{ifddir} \ -%if 0%{?suse_version} <= 1110 - --disable-libudev \ -%endif -%if 0%{?suse_version} > 1140 --with-systemdsystemunitdir=%{_unitdir} \ -%endif -%if 0%{?suse_version} >= 1320 --enable-polkit \ -%else - --disable-polkit \ -%endif --disable-static make %{?_smp_mflags} @@ -150,66 +129,28 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}%{ifddir} mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: %{buildroot}%{_sysconfdir}/reader.conf.d/reader.conf -%if 0%{?suse_version} < 1310 -install -D -m 755 pcsc-lite-init %{buildroot}%{_initddir}/pcscd -ln -sf %{_initddir}/pcscd %{buildroot}%{_sbindir}/rcpcscd -%else ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcpcscd -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp %{name}.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pcscd mkdir -p %{buildroot}%{_docdir}/%{name} cp -a AUTHORS ChangeLog COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO %{buildroot}%{_docdir}/%{name} -# Use socket activated pcscd by default. -%if 0%{?suse_version} > 1140 -mkdir -p %{buildroot}%{_libexecdir}/systemd/system-preset -echo -e 'enable pcscd.socket\nenable pcscd.service' >%{buildroot}%{_libexecdir}/systemd/system-preset/50-pcscd.preset -%endif # Remove useless la files find %{buildroot} -type f -name "*.la" -delete -print %pre getent group %{GROUP} >/dev/null || groupadd -r %{GROUP} getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s %{_sbindir}/nologin -c "Smart Card Reader" -d %{_localstatedir}/run/pcscd %{USER} -%if 0%{?suse_version} > 1140 %service_add_pre pcscd.service pcscd.socket -# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset. -if [ $1 -gt 1 ] ; then - if ! test -f %{_libexecdir}/systemd/system-preset/50-pcscd.preset ; then - echo -n "" >/run/rpm-%{name}-update-pcscd.socket-new-in-upgrade - echo -n "" >/run/rpm-%{name}-update-pcscd.service-new-in-upgrade - fi -fi -%endif %post -%if 0%{?suse_version} > 1140 %service_add_post pcscd.service pcscd.socket -%else -%fillup_and_insserv -y -n pcscd pcscd -%endif %fillup_only -n pcscd %preun -%if 0%{?suse_version} > 1140 %service_del_preun pcscd.service pcscd.socket -%endif -%if 0%{?suse_version} < 1310 -%stop_on_removal pcscd -%endif %postun -%if 0%{?suse_version} > 1140 %service_del_postun pcscd.service pcscd.socket -# make sure to reload systemd for possible downgrades -if [ "$1" = "1" ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi -%endif -%if 0%{?suse_version} < 1310 -%restart_on_update pcscd -%insserv_cleanup -%endif %post -n libpcsclite1 -p /sbin/ldconfig @@ -239,18 +180,11 @@ fi %dir %{_sysconfdir}/reader.conf.d %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf %{ifddir} -%if 0%{?suse_version} > 1140 %{_unitdir}/* -%{_libexecdir}/systemd/system-preset/ -%else -%{_initddir}/pcscd -%endif %{_localstatedir}/adm/fillup-templates/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen(). %{_libdir}/libpcsclite.so -%if 0%{?suse_version} >= 1320 %{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy -%endif %files -n libpcsclite1 %defattr(-,root,root) diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 0c2cc8e..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -# -# (C) 2006, jw@suse.de -# Distribute freely. Use and modify with care. -# No warranty. -# -# This script tests the source tar-balls -# against files that we want to exclude. -# - -bad_files_re='dlcompat-[0-9]*/|APPLE_LICENSE' - -for f in `ls *.tar.*`; do - case $f in - *.tar.gz) look='tar ztf' ;; - *.tar.bz2) look='tar jtf' ;; - esac; - $look $f | egrep -- $bad_files_re && bad=1 -# test -z $bad && echo $f okay. -done - -test -z $bad && exit; - -echo "" -echo "===============================================" -echo "Risk level alert!" -echo "Please remove the above files from the package." -echo "===============================================" -echo "" -echo "press CTRL-C to abort, ENTER to continue" -read a