tags 652798 + pending thanks Dear maintainer,
I've prepared an NMU for python-visual (versioned as 1:5.12-1.4) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -u python-visual-5.12/debian/changelog python-visual-5.12/debian/changelog
--- python-visual-5.12/debian/changelog
+++ python-visual-5.12/debian/changelog
@@ -1,3 +1,12 @@
+python-visual (1:5.12-1.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ * patches/1004_boost148_ftbfs.patch: New. Update random_device.cpp to
+ work with Boost 1.48. Closes: #652798.
+
+ -- Steve M. Robbins <s...@debian.org> Tue, 31 Jan 2012 23:40:50 -0600
+
python-visual (1:5.12-1.3) unstable; urgency=low
* Non-maintainer upload.
diff -u python-visual-5.12/debian/patches/series python-visual-5.12/debian/patches/series
--- python-visual-5.12/debian/patches/series
+++ python-visual-5.12/debian/patches/series
@@ -2,2 +2,3 @@
1003_include_python_header.patch
+1004_boost148_ftbfs.patch
2000_boost_python_workaround.patch
only in patch2:
unchanged:
--- python-visual-5.12.orig/debian/patches/1004_boost148_ftbfs.patch
+++ python-visual-5.12/debian/patches/1004_boost148_ftbfs.patch
@@ -0,0 +1,245 @@
+Description: Update random_device to work with Boost 1.48.
+Bug-Debian: #652798
+Author: Tobias Frost <t...@coldtobi.de>
+Reviewed-By: Steve Robbins <s...@debian.org>
+
+Index: python-visual-5.12/src/gtk2/random_device.cpp
+===================================================================
+--- python-visual-5.12.orig/src/gtk2/random_device.cpp 2012-01-12 21:27:53.000000000 +0100
++++ python-visual-5.12/src/gtk2/random_device.cpp 2012-01-12 21:37:49.000000000 +0100
+@@ -19,6 +19,9 @@
+ *
+ */
+
++#include <boost/version.hpp>
++#if (BOOST_VERSION < 104800)
++
+ #include <boost/nondet_random.hpp>
+ #include <string>
+ #include <cassert>
+@@ -125,3 +128,225 @@
+ {
+ return pimpl->next();
+ }
++
++#else /* boost version >1.48 */
++
++/* boost random_device.cpp implementation
++ *
++ * Copyright Jens Maurer 2000
++ * Copyright Steven Watanabe 2010-2011
++ * Distributed under the Boost Software License, Version 1.0. (See
++ * accompanying file LICENSE_1_0.txt or copy at
++ * http://www.boost.org/LICENSE_1_0.txt)
++ *
++ * $Id: random_device.cpp 71018 2011-04-05 21:27:52Z steven_watanabe $
++ *
++ */
++
++#define BOOST_RANDOM_SOURCE
++
++#include <boost/random/random_device.hpp>
++#include <boost/config.hpp>
++#include <boost/assert.hpp>
++#include <boost/detail/workaround.hpp>
++#include <string>
++
++#if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION) && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
++// A definition is required even for integral static constants
++const bool boost::random::random_device::has_fixed_range;
++#endif
++
++
++#if defined(BOOST_WINDOWS)
++
++#include <windows.h>
++#include <wincrypt.h>
++#include <stdexcept> // std::invalid_argument
++
++#define BOOST_AUTO_LINK_NOMANGLE
++#define BOOST_LIB_NAME "Advapi32"
++#include <boost/config/auto_link.hpp>
++
++#ifdef __MINGW32__
++
++extern "C" {
++
++// mingw's wincrypt.h appears to be missing some things
++WINADVAPI
++BOOL
++WINAPI
++CryptEnumProvidersA(
++ DWORD dwIndex,
++ DWORD *pdwReserved,
++ DWORD dwFlags,
++ DWORD *pdwProvType,
++ LPSTR szProvName,
++ DWORD *pcbProvName
++ );
++
++}
++
++#endif
++
++namespace {
++
++const char * const default_token = MS_DEF_PROV_A;
++
++}
++
++class boost::random::random_device::impl
++{
++public:
++ impl(const std::string & token) : provider(token) {
++ char buffer[80];
++ DWORD type;
++ DWORD len;
++
++ // Find the type of the provider
++ for(DWORD i = 0; ; ++i) {
++ len = sizeof(buffer);
++ if(!CryptEnumProvidersA(i, NULL, 0, &type, buffer, &len)) {
++ error("Could not find provider name");
++ }
++ if(buffer == provider) {
++ break;
++ }
++ }
++
++ if(!CryptAcquireContextA(&hProv, NULL, provider.c_str(), type,
++ CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
++ error("Could not acquire CSP context");
++ }
++ }
++
++ ~impl() {
++ if(!CryptReleaseContext(hProv, 0)) error("Could not release CSP context");
++ }
++
++ unsigned int next() {
++ unsigned int result;
++
++ if(!CryptGenRandom(hProv, sizeof(result),
++ static_cast<BYTE*>(static_cast<void*>(&result)))) {
++ error("error while reading");
++ }
++
++ return result;
++ }
++
++private:
++ void error(const std::string & msg) {
++ char buf[80];
++ DWORD num = FormatMessageA(
++ FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
++ NULL,
++ GetLastError(),
++ 0,
++ buf,
++ sizeof(buf),
++ NULL);
++
++ throw std::invalid_argument("boost::random_device: " + msg +
++ " Cryptopraphic Service Provider " + provider +
++ ": " + std::string(&buf[0], &buf[0] + num));
++ }
++ const std::string provider;
++ HCRYPTPROV hProv;
++};
++
++#else
++
++namespace {
++// the default is the unlimited capacity device, using some secure hash
++// try "/dev/random" for blocking when the entropy pool has drained
++const char * const default_token = "/dev/urandom";
++}
++
++/*
++ * This uses the POSIX interface for unbuffered reading.
++ * Using buffered std::istream would consume entropy which may
++ * not actually be used. Entropy is a precious good we avoid
++ * wasting.
++ */
++
++#if defined(__GNUC__) && defined(_CXXRT_STD_NAME)
++// I have severe difficulty to get the POSIX includes to work with
++// -fhonor-std and Dietmar Kuhl's standard C++ library. Hack around that
++// problem for now.
++extern "C" {
++static const int O_RDONLY = 0;
++extern int open(const char *__file, int __oflag, ...);
++extern int read(int __fd, __ptr_t __buf, size_t __nbytes);
++extern int close(int __fd);
++}
++#else
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h> // open
++#include <unistd.h> // read, close
++#endif
++
++#include <errno.h> // errno
++#include <string.h> // strerror
++#include <stdexcept> // std::invalid_argument
++
++
++class boost::random::random_device::impl
++{
++public:
++ impl(const std::string & token) : path(token) {
++ fd = open(token.c_str(), O_RDONLY);
++ if(fd < 0)
++ error("cannot open");
++ }
++
++ ~impl() { if(close(fd) < 0) error("could not close"); }
++
++ unsigned int next() {
++ unsigned int result;
++ long sz = read(fd, reinterpret_cast<char *>(&result), sizeof(result));
++ if(sz == -1)
++ error("error while reading");
++ else if(sz != sizeof(result)) {
++ errno = 0;
++ error("EOF while reading");
++ }
++ return result;
++ }
++
++private:
++ void error(const std::string & msg) {
++ throw std::invalid_argument("boost::random_device: " + msg +
++ " random-number pseudo-device " + path +
++ ": " + strerror(errno));
++ }
++ const std::string path;
++ int fd;
++};
++
++#endif // BOOST_WINDOWS
++
++BOOST_RANDOM_DECL boost::random::random_device::random_device()
++ : pimpl(new impl(default_token))
++{}
++
++BOOST_RANDOM_DECL boost::random::random_device::random_device(const std::string& token)
++ : pimpl(new impl(token))
++{}
++
++BOOST_RANDOM_DECL boost::random_device::~random_device()
++{
++ delete pimpl;
++}
++
++BOOST_RANDOM_DECL double boost::random_device::entropy() const
++{
++ return 10;
++}
++
++BOOST_RANDOM_DECL unsigned int boost::random_device::operator()()
++{
++ return pimpl->next();
++}
++
++#endif
signature.asc
Description: Digital signature
