rpms/opensc/devel opensc-0.11.6-develconfig.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 opensc.spec, 1.38, 1.39 sources, 1.20, 1.21 opensc-0.11.1-develconfig.patch, 1.1, NONE
Tomáš Mráz
tmraz at fedoraproject.org
Tue Sep 2 14:32:35 UTC 2008
Author: tmraz
Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7349
Modified Files:
.cvsignore opensc.spec sources
Added Files:
opensc-0.11.6-develconfig.patch
Removed Files:
opensc-0.11.1-develconfig.patch
Log Message:
* Tue Sep 2 2008 Tomas Mraz <tmraz at redhat.com> - 0.11.6-1
- Update to latest upstream, fixes CVE-2008-2235
opensc-0.11.6-develconfig.patch:
--- NEW FILE opensc-0.11.6-develconfig.patch ---
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()
{
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 10 Sep 2007 16:18:55 -0000 1.20
+++ .cvsignore 2 Sep 2008 14:32:04 -0000 1.21
@@ -1 +1 @@
-opensc-0.11.4.tar.gz
+opensc-0.11.6.tar.gz
Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- opensc.spec 10 Apr 2008 15:01:45 -0000 1.38
+++ opensc.spec 2 Sep 2008 14:32:04 -0000 1.39
@@ -1,15 +1,15 @@
%define plugindir %{_libdir}/mozilla/plugins
Name: opensc
-Version: 0.11.4
-Release: 5%{?dist}
+Version: 0.11.6
+Release: 1%{?dist}
Summary: Smart card library and applications
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
-Patch0: %{name}-0.11.1-develconfig.patch
+Patch1: %{name}-0.11.6-develconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel >= 1.1.1
@@ -54,9 +54,8 @@
%prep
%setup -q
-%patch0 -p1
+%patch1 -p1 -b .config
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
-f=doc/ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
# No %{_libdir} here to avoid multilib conflicts; it's just an example
@@ -64,9 +63,12 @@
%build
-%configure --disable-dependency-tracking \
- --disable-static \
- --with-plugin-dir=%{plugindir} \
+%configure --disable-static \
+ --enable-nsplugin \
+ --enable-pcsc \
+ --enable-openct \
+ --enable-doc \
+ --with-plugindir=%{plugindir} \
--with-pin-entry=%{_bindir}/pinentry
make %{?_smp_mflags}
@@ -77,16 +79,14 @@
make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
-install -dm 755 _docs/openssh
-install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
-cp -pR doc _docs
-rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools}
-
find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so
mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir}
+mkdir apidocdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api.html apidocdir
+mv -T $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docdir
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,7 +99,8 @@
%files
%defattr(-,root,root,-)
-%doc COPYING NEWS README* _docs/doc/
+%doc COPYING NEWS README*
+%doc docdir/*
%config(noreplace) %{_sysconfdir}/opensc.conf
%{_bindir}/cardos-info
%{_bindir}/cryptoflex-tool
@@ -112,9 +113,12 @@
%{_bindir}/pkcs15-crypt
%{_bindir}/pkcs15-init
%{_bindir}/pkcs15-tool
+%{_bindir}/rutoken-tool
%{_libdir}/lib*.so.*
%{_libdir}/onepin-opensc-pkcs11.so
%{_libdir}/opensc-pkcs11.so
+%{_libdir}/pkcs11/onepin-opensc-pkcs11.so
+%{_libdir}/pkcs11/opensc-pkcs11.so
%{_datadir}/opensc/
%{_mandir}/man1/cardos-info.1*
%{_mandir}/man1/cryptoflex-tool.1*
@@ -133,17 +137,21 @@
%files devel
%defattr(-,root,root,-)
-%doc _docs/openssh/
+%doc apidocdir/*
%{_bindir}/opensc-config
%{_includedir}/opensc/
%{_libdir}/lib*.so
%{_libdir}/pkcs11-spy.so
+%{_libdir}/pkcs11/pkcs11-spy.so
%{_libdir}/pkgconfig/lib*.pc
%{_mandir}/man1/opensc-config.1*
%{_mandir}/man3/*.3*
%changelog
+* Tue Sep 2 2008 Tomas Mraz <tmraz at redhat.com> - 0.11.6-1
+- Update to latest upstream, fixes CVE-2008-2235
+
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.11.4-5
- BuildRequire libassuan-devel instead of libassuan-static (bz 441812)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 10 Sep 2007 16:18:55 -0000 1.20
+++ sources 2 Sep 2008 14:32:04 -0000 1.21
@@ -1 +1 @@
-2031aa617be609d50d014d5d370bb8a2 opensc-0.11.4.tar.gz
+a426759f11350c32af2f17a5cd4d5938 opensc-0.11.6.tar.gz
--- opensc-0.11.1-develconfig.patch DELETED ---
More information about the fedora-extras-commits
mailing list