From 3cf82e3f49794924b6c69d17d28b8a62e11c513b Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jun 18 2010 09:34:37 +0000 Subject: - fix FTBFS #538893 and #599857 (patch by Petr Machata) --- diff --git a/asio-ssl.patch b/asio-ssl.patch new file mode 100644 index 0000000..b0600c8 --- /dev/null +++ b/asio-ssl.patch @@ -0,0 +1,12 @@ +diff -up asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp\~ asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp +--- asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp~ 2009-03-03 03:22:54.000000000 +0100 ++++ asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp 2010-02-23 15:54:15.000000000 +0100 +@@ -66,7 +66,7 @@ public: + // Create a new context implementation. + void create(impl_type& impl, context_base::method m) + { +- ::SSL_METHOD* ssl_method = 0; ++ const ::SSL_METHOD* ssl_method = 0; + switch (m) + { + case context_base::sslv2: diff --git a/asio.spec b/asio.spec index fb06876..e4347a7 100644 --- a/asio.spec +++ b/asio.spec @@ -4,9 +4,10 @@ Summary: A cross-platform C++ library for network programming Name: asio Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://sourceforge.net/projects/asio/ Source0: http://downloads.sourceforge.net/asio/asio-%{version}.tar.gz +Patch0: asio-ssl.patch License: Boost Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,7 @@ modern C++ approach. %prep %setup -q +%patch0 -p1 %build %configure @@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/asio.hpp %changelog +* Fri Jun 18 2010 Dan Horák 1.4.1-3 +- fix FTBFS #538893 and #599857 (patch by Petr Machata) + * Mon Jul 27 2009 Marc Maurer 1.4.1-2 - The tarball is now a gzip archive