Accepting request 263915 from home:mnhauke:branches:security:chipcard
update to version 1.4.13 OBS-URL: https://build.opensuse.org/request/show/263915 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/perl-pcsc?expand=0&rev=7
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
3c3b42af9c
commit
eb6b9e1836
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bdf6a9bd914f72034909e9a2e025c0363673ba85ae1f86a51edf687283139d63
|
||||
size 36218
|
||||
3
pcsc-perl-1.4.13.tar.bz2
Normal file
3
pcsc-perl-1.4.13.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a5f7dfb30be0346cfe80d47749994dab861592929d80786104693987b36e3684
|
||||
size 36273
|
||||
@ -1,66 +0,0 @@
|
||||
Index: pcsc-perl-1.4.10/PCSC.xs
|
||||
===================================================================
|
||||
--- pcsc-perl-1.4.10.orig/PCSC.xs
|
||||
+++ pcsc-perl-1.4.10/PCSC.xs
|
||||
@@ -369,13 +369,8 @@ _LoadPCSCLibrary ()
|
||||
hConnect = (TSCardConnect) GET_FCT (ghDll, "SCardConnect");
|
||||
hStatus = (TSCardStatus) GET_FCT (ghDll, "SCardStatus");
|
||||
hGetStatusChange = (TSCardGetStatusChange) GET_FCT (ghDll, "SCardGetStatusChange");
|
||||
- /* SetTimeout is not part of the original PCSC yet it is still important */
|
||||
- hSetTimeout = (TSCardSetTimeout) GET_FCT (ghDll, "SCardSetTimeout");
|
||||
#endif
|
||||
if (
|
||||
-#ifndef WIN32
|
||||
- !hSetTimeout ||
|
||||
-#endif
|
||||
!hEstablishContext || !hReleaseContext || !hListReaders || !hConnect ||
|
||||
!hReconnect || ! hDisconnect || !hBeginTransaction || !hEndTransaction ||
|
||||
!hTransmit || !hStatus || !hGetStatusChange || !hCancel || !hControl)
|
||||
@@ -1329,8 +1324,7 @@ _Cancel (hContext)
|
||||
#///////////////////////////////////////////////////////////////////////////////
|
||||
#// SetTimeout ()
|
||||
#//
|
||||
-#// This function is only defined for PCSClite that is why we build a
|
||||
-#// stub after the #else processing command
|
||||
+#// This function is no more defined that is why we build a stub
|
||||
#//
|
||||
#// INPUT :
|
||||
#// - $hContext ->
|
||||
@@ -1338,30 +1332,6 @@ _Cancel (hContext)
|
||||
#// OUTPUT :
|
||||
#// returns either true or false depending on successful completion
|
||||
|
||||
-#ifndef WIN32
|
||||
-
|
||||
-unsigned long
|
||||
-_SetTimeout (hContext, dwTimeout)
|
||||
- unsigned long hContext;
|
||||
- unsigned long dwTimeout;
|
||||
- CODE:
|
||||
-
|
||||
-
|
||||
- gnLastError = hSetTimeout (hContext, dwTimeout);
|
||||
-
|
||||
- /* Then we check for an error */
|
||||
- if (gnLastError != SCARD_S_SUCCESS)
|
||||
- RETVAL = FALSE;
|
||||
- else
|
||||
- RETVAL = TRUE;
|
||||
- OUTPUT:
|
||||
- RETVAL
|
||||
-
|
||||
-#else
|
||||
-
|
||||
-#// Win32 does not implement SetTimeout therefore we simply define
|
||||
-#// a stub.
|
||||
-
|
||||
unsigned long
|
||||
_SetTimeout (hContext, dwTimeout)
|
||||
unsigned long hContext;
|
||||
@@ -1371,6 +1341,4 @@ _SetTimeout (hContext, dwTimeout)
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
-#endif
|
||||
-
|
||||
# End of File #
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 3 21:21:44 UTC 2014 - mardnh@gmx.de
|
||||
|
||||
- update to version 1.4.13
|
||||
- corrected Source URL
|
||||
- ran spec-cleaner
|
||||
- removed patch: pcsc-perl-noSCardSetTimeout.patch (included in upstream since 1.4.11)
|
||||
|
||||
- Changes since 1.4.10:
|
||||
* PCSC.pm: Support Perl 5.16
|
||||
|
||||
Remove the warning:
|
||||
defined(@array) is deprecated at /usr/lib/perl/5.16.3/Chipcard/PCSC.pm line 69.
|
||||
(Maybe you should just omit the defined()?)
|
||||
|
||||
Thanks to Viliam Pucik for the bug report
|
||||
|
||||
* PCSC.xs: Also check for SVt_PVIV and not just SVt_IV.
|
||||
* PCSC.xs, PCSC.pm, test.pl: Use lines of less than 80 columns
|
||||
* PCSCperl.h: SCardCancelTransaction() is no more present in pcsc-lite
|
||||
* PCSC.pm, PCSC.pod, PCSC.xs, PCSCperl.h:
|
||||
SCardSetTimout is no more present in pcsc-lite > 1.6.4
|
||||
It was a pcsc-lite specific and deprecated function
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 18 16:24:07 CEST 2011 - sbrabec@suse.cz
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-pcsc
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,30 +15,26 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: perl-pcsc
|
||||
%define cpan_name pcsc-perl
|
||||
Name: perl-pcsc
|
||||
Version: 1.4.13
|
||||
Release: 0
|
||||
Summary: Perl interface to Smart Card Reader
|
||||
Version: 1.4.10
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
License: GPL-2.0+
|
||||
Group: Development/Libraries/Perl
|
||||
Url: http://search.cpan.org/dist/pcsc-perl/
|
||||
Source: %{cpan_name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-OPENSUSE pcsc-perl-noSCardSetTimeout.patch sbrabec@suse.cz -- Fix for the latest pcsc-lite.
|
||||
Patch: pcsc-perl-noSCardSetTimeout.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Url: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
|
||||
Source: http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{cpan_name}-%{version}.tar.bz2
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(libpcsclite)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} > 1130
|
||||
%{perl_requires}
|
||||
BuildRequires: perl-macros
|
||||
%{perl_requires}
|
||||
%else
|
||||
Requires: perl = %{perl_version}
|
||||
%endif
|
||||
BuildRequires: pcsc-lite-devel pkg-config
|
||||
Requires: libpcsclite1
|
||||
|
||||
%description
|
||||
PC/SC represents an abstraction layer to smart card readers. It
|
||||
@ -47,15 +43,14 @@ readers through a standardized API.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{cpan_name}-%{version}
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
|
||||
%{__make} %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
# No daemon and no card in the sysroot => no test.
|
||||
#%{__make} test
|
||||
#make %{?_smp_mflags} test
|
||||
|
||||
%install
|
||||
%perl_make_install
|
||||
@ -66,9 +61,6 @@ readers through a standardized API.
|
||||
touch %{name}.files
|
||||
%endif
|
||||
|
||||
%clean
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f %{name}.files
|
||||
%defattr(-,root,root,-)
|
||||
%doc Changelog LICENCE README
|
||||
@ -76,7 +68,7 @@ touch %{name}.files
|
||||
%{perl_vendorarch}/Chipcard
|
||||
%{perl_vendorarch}/auto/Chipcard
|
||||
%doc %{_mandir}/man3/*
|
||||
/var/adm/perl-modules/%{name}
|
||||
%{_localstatedir}/adm/perl-modules/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user