Compare commits

...

19 Commits

Author SHA1 Message Date
Kalev Lember
efe0124b41 - Fix init script start / stop priorities (#580322)
- Don't require pkgconfig as the dep is now automatically generated by rpm
2010-04-13 11:47:24 +00:00
Kalev Lember
488d86052f - Added patch to fix init script LSB header (#565241)
- Dropped BR: libusb-devel as configure script really picks up libhal
    instead
- Use %%global instead of %%define
2010-03-03 16:21:22 +00:00
Jesse Keating
10b6fba78e Initialize branch F-13 for pcsc-lite 2010-02-17 02:20:17 +00:00
Kalev Lember
5caa67c852 - Require -libs subpackage from main pcsc-lite package
- Build -doc subpackage as noarch
- Dropped --enable-runpid configure option which was removed in 1.4.99
- Dropped obsolete provides
- Spec file cleanup
2009-12-21 20:25:29 +00:00
Bill Nottingham
1f40b5109e Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:30:20 +00:00
Kalev Lember
673c7d91d5 Updated to pcsc-lite 1.5.5 2009-11-19 11:56:10 +00:00
Jesse Keating
482276a8d0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-25 23:22:58 +00:00
Robert Relyea
5eb8343b60 update pcsc-lite directory permissions. bug 503211. 2009-06-17 17:59:34 +00:00
Robert Relyea
15da5482f9 upgrade to 1.5.2 fix close on exec issue 2009-03-06 00:37:05 +00:00
Jesse Keating
9d50b165ca - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-26 10:14:06 +00:00
Karsten Hopp
fb1538449f - remove excludearch s390, s390x (#467788) even though s390 does not have
libusb or smartCards, the libusb packages are required to build other
    packages.
2009-02-11 21:14:02 +00:00
Robert Relyea
69b95e73c8 sigh, tagging seems broken, bump the version number to get a clean build 2008-08-29 00:09:38 +00:00
Robert Relyea
fb81f35a8f mock build changes 2008-08-29 00:02:37 +00:00
Robert Relyea
67a62b4c00 mock build changes. 2008-08-28 23:59:45 +00:00
Robert Relyea
992aeb5e07 upgrade to 1.4.102 2008-08-28 00:31:36 +00:00
Jesse Keating
d9b530e888 - Autorebuild for GCC 4.3 2008-02-19 22:33:20 +00:00
Robert Relyea
15733ac2c8 Fix typo. Quite warnings 2008-01-16 23:33:19 +00:00
Robert Relyea
63b6c0ae69 Rebase to pcsc-lite 1.4 2007-12-04 20:04:48 +00:00
Bill Nottingham
c78c0eb96b makefile update to properly grab makefile.common 2007-10-15 19:13:29 +00:00
11 changed files with 168 additions and 42 deletions

View File

@ -1 +1 @@
pcsc-lite-1.3.3.tar.gz pcsc-lite-1.5.5.tar.bz2

View File

@ -1,6 +1,21 @@
# Makefile for source rpm: pcsc-lite # Makefile for source rpm: pcsc-lite
# $Id$ # $Id: Makefile,v 1.2 2007/10/15 19:13:29 notting Exp $
NAME := pcsc-lite NAME := pcsc-lite
SPECFILE = $(firstword $(wildcard *.spec)) SPECFILE = $(firstword $(wildcard *.spec))
include ../common/Makefile.common define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attempt a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

1
branch Normal file
View File

@ -0,0 +1 @@
F-13

2
import.log Normal file
View File

@ -0,0 +1,2 @@
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

View File

@ -0,0 +1,11 @@
--- ./doc/Makefile.in.docinst 2008-06-26 20:32:52.000000000 -0700
+++ ./doc/Makefile.in 2008-08-28 14:18:11.240452000 -0700
@@ -612,7 +612,7 @@
info-am:
-install-data-am: install-docDATA install-man
+install-data-am: install-man
install-dvi: install-dvi-recursive

View File

@ -1,18 +1,18 @@
--- pcsc-lite-1.3.0/configure~ 2006-03-03 15:48:59.000000000 +0200 --- pcsc-lite-1.5.5/configure.rpath64 2009-11-18 14:03:19.000000000 +0200
+++ pcsc-lite-1.3.0/configure 2006-03-05 23:40:48.000000000 +0200 +++ pcsc-lite-1.5.5/configure 2009-11-18 14:06:08.000000000 +0200
@@ -9103,7 +9103,7 @@ @@ -11135,7 +11135,7 @@
shlibpath_overrides_runpath=unknown shlibpath_overrides_runpath=unknown
version_type=none version_type=none
dynamic_linker="$host_os ld.so" dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
if test "$GCC" = yes; then need_lib_prefix=unknown
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` hardcode_into_libs=no
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -9480,7 +9480,7 @@ @@ -11552,7 +11552,7 @@
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
fi fi

View File

@ -0,0 +1,17 @@
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;
}
/**

View File

@ -1,11 +0,0 @@
--- doc/Makefile.in 2003-05-31 00:24:32.000000000 +0300
+++ doc/Makefile.in 2003-06-01 15:43:17.000000000 +0300
@@ -390,7 +390,7 @@
info-am:
-install-data-am: install-dataDATA install-man
+install-data-am: install-man
install-exec-am:

View File

@ -0,0 +1,27 @@
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

View File

@ -1,18 +1,23 @@
%global upstream_build 3082
Name: pcsc-lite Name: pcsc-lite
Version: 1.3.3 Version: 1.5.5
Release: 1%{dist} Release: 4%{?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/1565/%{name}-%{version}.tar.gz Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
Patch0: %{name}-docinst.patch Patch0: %{name}-1.4-docinst.patch
Patch1: %{name}-1.3.0-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)
BuildRequires: libusb-devel >= 0.1.7 BuildRequires: hal-devel
BuildRequires: doxygen BuildRequires: doxygen
Requires(post): initscripts Requires(post): initscripts
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -20,8 +25,7 @@ Requires(preun): /sbin/chkconfig
Requires(preun): initscripts Requires(preun): initscripts
Requires(postun): initscripts Requires(postun): initscripts
Requires: pcsc-ifd-handler Requires: pcsc-ifd-handler
# 390 does not have libusb or smartCards Requires: %{name}-libs = %{version}-%{release}
ExcludeArch: s390 s390x
%description %description
The purpose of PC/SC Lite is to provide a Windows(R) SCard interface The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
@ -35,7 +39,6 @@ line tools.
%package libs %package libs
Summary: PC/SC Lite libraries Summary: PC/SC Lite libraries
Group: System Environment/Libraries Group: System Environment/Libraries
Provides: libpcsc-lite = %{version}-%{release}
%description libs %description libs
PC/SC Lite libraries. PC/SC Lite libraries.
@ -44,8 +47,6 @@ PC/SC Lite libraries.
Summary: PC/SC Lite development files Summary: PC/SC Lite development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
Provides: libpcsc-lite-devel = %{version}-%{release}
%description devel %description devel
PC/SC Lite development files. PC/SC Lite development files.
@ -53,6 +54,7 @@ PC/SC Lite development files.
%package doc %package doc
Summary: PC/SC Lite developer documentation Summary: PC/SC Lite developer documentation
Group: Documentation Group: Documentation
BuildArch: noarch
%description doc %description doc
%{summary}. %{summary}.
@ -62,12 +64,13 @@ Group: Documentation
%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
%build %build
%configure \ %configure \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-static \ --disable-static \
--enable-runpid=%{_localstatedir}/run/pcscd.pid \
--enable-confdir=%{_sysconfdir} \ --enable-confdir=%{_sysconfdir} \
--enable-ipcdir=%{_localstatedir}/run \ --enable-ipcdir=%{_localstatedir}/run \
--enable-usbdropdir=%{_libdir}/pcsc/drivers --enable-usbdropdir=%{_libdir}/pcsc/drivers
@ -88,15 +91,14 @@ All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
by %{_sbindir}/update-reader.conf. by %{_sbindir}/update-reader.conf.
EOF EOF
rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la} rm $RPM_BUILD_ROOT%{_libdir}/*.la
touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
# formaticc doesn't exist any more, don't include the man page rm $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1* touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
%clean %clean
#rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
@ -123,7 +125,7 @@ fi
%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 %doc %{_sysconfdir}/reader.conf.d/README
%ghost %config %{_sysconfdir}/reader.conf %ghost %config(noreplace) %{_sysconfdir}/reader.conf
%{_initrddir}/pcscd %{_initrddir}/pcscd
%{_sbindir}/pcscd %{_sbindir}/pcscd
%{_sbindir}/update-reader.conf %{_sbindir}/update-reader.conf
@ -144,10 +146,72 @@ fi
%files doc %files doc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/api/ doc/*.pdf doc/example/pcsc_demo.c %doc doc/api/ doc/example/pcsc_demo.c
%changelog %changelog
* Tue Apr 13 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.5-4
- Fix init script start / stop priorities (#580322)
- Don't require pkgconfig as the dep is now automatically generated by rpm
* Wed Mar 03 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.5-3
- Added patch to fix init script LSB header (#565241)
- Dropped BR: libusb-devel as configure script really picks up libhal instead
- Use %%global instead of %%define
* Mon Dec 21 2009 Kalev Lember <kalev@smartlink.ee> - 1.5.5-2
- Require -libs subpackage from main pcsc-lite package
- Build -doc subpackage as noarch
- Dropped --enable-runpid configure option which was removed in 1.4.99
- Dropped obsolete provides
- Spec file cleanup
* Wed Nov 18 2009 Kalev Lember <kalev@smartlink.ee> - 1.5.5-1
- Updated to pcsc-lite 1.5.5
- Rebased rpath64 patch
- Dropped upstreamed pcsc-lite-1.5-permissions.patch
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Jun 17 2009 Bob Relyea <rrelyea@redhat.com> - 1.5.2-2
- Pick up security fixes from upstream
* Fri Feb 27 2009 Bob Relyea <rrelyea@redhat.com> - 1.5.2-1
- Pick up 1.5.2
- Add FD_CLOEXEC flag
- make reader.conf a noreplace config file
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.102-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 11 2009 Karsten Hopp <karsten@redhat.com> 1.4.102-4
- remove excludearch s390, s390x (#467788)
even though s390 does not have libusb or smartCards, the libusb
packages are required to build other packages.
* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-3
- bump tag becaue the build system can't deal with mistakes.
* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-2
- mock build changes
* Wed Aug 17 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-1
- Pick up 1.4.102
* Wed May 6 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.101-1
- Pick up 1.4.101
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.4-3
- Autorebuild for GCC 4.3
* Wed Jan 16 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.4-2
- Silence libpcsc-lite even when the daemon isn't running.
- fix typo in init file which prevents the config file from being read.
* Tue Nov 22 2007 Bob Relyea <rrelyea@redhat.com> - 1.4.4-1
- Pick up 1.4.4
* Tue Feb 06 2007 Bob Relyea <rrelyea@redhat.com> - 1.3.3-1 * Tue Feb 06 2007 Bob Relyea <rrelyea@redhat.com> - 1.3.3-1
- Pick up 1.3.3 - Pick up 1.3.3

View File

@ -1 +1 @@
851b090aa0efedd0196f6afd9c0c61bb pcsc-lite-1.3.3.tar.gz 6707e967fc8bb398a5d1b1089d4dff63 pcsc-lite-1.5.5.tar.bz2