From 79d114fab37930feea5724e096ac262b338dd64a Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Mar 02 2009 16:45:55 +0000
Subject: - new upstream version - fixes CVE-2009-0368


---

diff --git a/.cvsignore b/.cvsignore
index ffa11a8..41452ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-opensc-0.11.6.tar.gz
+opensc-0.11.7.tar.gz
diff --git a/opensc-0.11.6-develconfig.patch b/opensc-0.11.6-develconfig.patch
deleted file mode 100644
index 7e8fc61..0000000
--- a/opensc-0.11.6-develconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up opensc-0.11.6/src/libopensc/libopensc.pc.in.config opensc-0.11.6/src/libopensc/libopensc.pc.in
---- opensc-0.11.6/src/libopensc/libopensc.pc.in.config	2008-07-31 14:20:07.000000000 +0200
-+++ opensc-0.11.6/src/libopensc/libopensc.pc.in	2008-09-02 14:49:04.000000000 +0200
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libopensc
- Description: libopensc
- Version: @VERSION@
--Libs: -L${libdir} -lopensc -lscconf
-+Libs: -L${libdir} -lopensc
- Cflags: -I${includedir}
- 
-diff -up opensc-0.11.6/src/libopensc/opensc-config.in.config opensc-0.11.6/src/libopensc/opensc-config.in
---- opensc-0.11.6/src/libopensc/opensc-config.in.config	2008-07-31 14:20:07.000000000 +0200
-+++ opensc-0.11.6/src/libopensc/opensc-config.in	2008-09-02 14:52:12.000000000 +0200
-@@ -15,10 +15,10 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- exec_prefix_set=no
- 
--libdir="@libdir@"
--includedir="@includedir@"
-+libdir=""
-+includedir=""
- opensc_cflags=""
--opensc_libs="-L${libdir} -lopensc"
-+opensc_libs="-lopensc"
- 
- usage()
- {
diff --git a/opensc-0.11.7-develconfig.patch b/opensc-0.11.7-develconfig.patch
new file mode 100644
index 0000000..1f0f646
--- /dev/null
+++ b/opensc-0.11.7-develconfig.patch
@@ -0,0 +1,28 @@
+diff -up opensc-0.11.7/src/libopensc/libopensc.pc.in.config opensc-0.11.7/src/libopensc/libopensc.pc.in
+--- opensc-0.11.7/src/libopensc/libopensc.pc.in.config	2006-05-15 22:57:30.000000000 +0200
++++ opensc-0.11.7/src/libopensc/libopensc.pc.in	2009-02-27 19:05:56.000000000 +0100
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libopensc
+ Description: libopensc
+ Version: @VERSION@
+-Libs: -L${libdir} -lopensc -lscconf
++Libs: -L${libdir} -lopensc
+ Cflags: -I${includedir}
+ 
+diff -up opensc-0.11.7/src/libopensc/opensc-config.in.config opensc-0.11.7/src/libopensc/opensc-config.in
+--- opensc-0.11.7/src/libopensc/opensc-config.in.config	2008-12-27 17:15:30.000000000 +0100
++++ opensc-0.11.7/src/libopensc/opensc-config.in	2009-02-27 19:03:11.000000000 +0100
+@@ -15,10 +15,10 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ exec_prefix_set=no
+ 
+-libdir="@libdir@"
+-includedir="@includedir@"
++libdir=""
++includedir=""
+ opensc_cflags=""
+-opensc_libs="-L${libdir} -lopensc -lscconf"
++opensc_libs="-lopensc -lscconf"
+ 
+ usage()
+ {
diff --git a/opensc.spec b/opensc.spec
index db839a9..349cdfa 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,7 +1,7 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.11.6
+Version:        0.11.7
 Release:        1%{?dist}
 Summary:        Smart card library and applications
 
@@ -9,7 +9,7 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
 Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-Patch1:         %{name}-0.11.6-develconfig.patch
+Patch1:         %{name}-0.11.7-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -20,6 +20,8 @@ BuildRequires:  openct-devel
 BuildRequires:  openssl-devel >= 0.9.7a
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
+Requires:	pcsc-lite-libs
 
 %description
 OpenSC is a package for for accessing smart card devices.  Basic
@@ -68,6 +70,7 @@ sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in
   --enable-pcsc \
   --enable-openct \
   --enable-doc \
+  --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \
   --with-plugindir=%{plugindir} \
   --with-pin-entry=%{_bindir}/pinentry
 make %{?_smp_mflags}
@@ -103,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc docdir/*
 %config(noreplace) %{_sysconfdir}/opensc.conf
 %{_bindir}/cardos-info
+%{_bindir}/cardos-tool
 %{_bindir}/cryptoflex-tool
 %{_bindir}/eidenv
 %{_bindir}/netkey-tool
@@ -120,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkcs11/onepin-opensc-pkcs11.so
 %{_libdir}/pkcs11/opensc-pkcs11.so
 %{_datadir}/opensc/
-%{_mandir}/man1/cardos-info.1*
+%{_mandir}/man1/cardos-tool.1*
 %{_mandir}/man1/cryptoflex-tool.1*
 %{_mandir}/man1/netkey-tool.1*
 %{_mandir}/man1/opensc-explorer.*
@@ -149,6 +153,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 27 2009 Tomas Mraz <tmraz@redhat.com> - 0.11.7-1
+- new upstream version - fixes CVE-2009-0368
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz@redhat.com> - 0.11.6-2
+- Add explicit requires for pcsc-lite-libs. Dlopen libpcsclite with the full
+  soname.
+
 * Tue Sep  2 2008 Tomas Mraz <tmraz@redhat.com> - 0.11.6-1
 - Update to latest upstream, fixes CVE-2008-2235
 
diff --git a/sources b/sources
index 9d049f5..3395ac0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a426759f11350c32af2f17a5cd4d5938  opensc-0.11.6.tar.gz
+419e9be372c2f9bbb3ce9704c929d5ec  opensc-0.11.7.tar.gz