tags 746915 + patch tags 746915 + pending thanks Hi,
I've uploaded an NMU for sslsniff (versioned as 0.8-4.2). Please find the patch attached. Cheers, -- Raphaël Hertzog ◈ Debian Developer Discover the Debian Administrator's Handbook: → http://debian-handbook.info/get/
diff -Nru sslsniff-0.8/debian/changelog sslsniff-0.8/debian/changelog --- sslsniff-0.8/debian/changelog 2013-08-12 22:50:12.000000000 +0200 +++ sslsniff-0.8/debian/changelog 2014-08-06 17:38:40.000000000 +0200 @@ -1,3 +1,11 @@ +sslsniff (0.8-4.2) unstable; urgency=high + + * Non-maintainer upload. + * Add debian/patches/02-fix-compatibility-with-gcc49.patch + to fix FTFBS with gcc-4.9 (Closes: #746915) + + -- Sophie Brun <sop...@freexian.com> Wed, 06 Aug 2014 17:06:53 +0200 + sslsniff (0.8-4.1) unstable; urgency=low * Non-maintainer upload. diff -Nru sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch --- sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch 1970-01-01 01:00:00.000000000 +0100 +++ sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch 2014-08-06 17:46:18.000000000 +0200 @@ -0,0 +1,59 @@ +Description: Fix failure to build with GCC 4.9 + gcc-4.9 doesn't like the conflict between two variables named + "error", so rename one of them to avoid the conflict. +Author: Sophie Brun <sop...@freexian.com> +Origin: vendor +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746915 +Last-Update: 2014-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/SSLConnectionManager.cpp ++++ b/SSLConnectionManager.cpp +@@ -95,13 +95,13 @@ void SSLConnectionManager::interceptUpda + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errortext = errorStream.str(); ++ Logger::logError(errortext); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errortext = errorStream.str(); ++ Logger::logError(errortext); + } + } + +@@ -120,13 +120,13 @@ void SSLConnectionManager::interceptAddo + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errortext = errorStream.str(); ++ Logger::logError(errortext); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errortext = errorStream.str(); ++ Logger::logError(errortext); + } + } + +@@ -151,9 +151,9 @@ void SSLConnectionManager::interceptSSL( + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); ++ std::string errortext = errorStream.str(); + +- Logger::logError(error); ++ Logger::logError(errortext); + } + } + } diff -Nru sslsniff-0.8/debian/patches/series sslsniff-0.8/debian/patches/series --- sslsniff-0.8/debian/patches/series 2012-01-03 09:35:15.000000000 +0100 +++ sslsniff-0.8/debian/patches/series 2014-08-06 17:38:40.000000000 +0200 @@ -1 +1,2 @@ 01-fix-compatibility-with-boost-1.48.patch +02-fix-compatibility-with-gcc49.patch
