[Debian-l10n-commits] poedit branch master updated. debian/1.8.11-1-2-g8702a3a

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".

The branch, master has been updated
       via  8702a3a3da342bc0c66aac962b805c103d1e2775 (commit)
      from  df155fe19568dcac0341839da681cbe963ee7313 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=8702a3a3da342bc0c66aac962b805c103d1e2775

commit 8702a3a3da342bc0c66aac962b805c103d1e2775
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Oct 29 20:28:38 2016 +0200

    Fix crash, upload to unstable

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |  5 +-
 .../e5d68f3851341c59c712763e69839042e630555a.patch | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/e5d68f3851341c59c712763e69839042e630555a.patch

diff --git a/debian/changelog b/debian/changelog
index ae3e604..195f71e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-poedit (1.8.11-2) UNRELEASED; urgency=medium
+poedit (1.8.11-2) unstable; urgency=medium
 
   * Drop dh-autoreconf, useless with compat level 10
+  * debian/patches/e5d68f3851341c59c712763e69839042e630555a.patch:
+    backport upstream patch to fix crash with new poedit
+    (Closes: #839230)
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 24 Oct 2016 20:20:09 +0200
 
diff --git a/debian/patches/e5d68f3851341c59c712763e69839042e630555a.patch b/debian/patches/e5d68f3851341c59c712763e69839042e630555a.patch
new file mode 100644
index 0000000..ef400b8
--- /dev/null
+++ b/debian/patches/e5d68f3851341c59c712763e69839042e630555a.patch
@@ -0,0 +1,66 @@
+From e5d68f3851341c59c712763e69839042e630555a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav at slavik.io>
+Date: Sat, 29 Oct 2016 18:08:35 +0200
+Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20http=5Fclient=5Fconfig=20?=
+ =?UTF-8?q?when=20not=20needed?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don’t pass default http_client_config to http_client if not needed, i.e.
+elsewhere than Windows.
+
+This fixes a crash in C++REST SDK reported by Debian. Cause is unknown,
+but related to http_client_config and when that is not used on Linux
+anyway, why make things harder for everybody.
+---
+ src/http_client_casablanca.cpp | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/http_client_casablanca.cpp b/src/http_client_casablanca.cpp
+index 056fc0a..a4d66e7 100644
+--- a/src/http_client_casablanca.cpp
++++ b/src/http_client_casablanca.cpp
+@@ -169,7 +169,14 @@ class http_client::impl
+ {
+ public:
+     impl(http_client& owner, const std::string& url_prefix, int flags)
+-        : m_owner(owner), m_native(sanitize_url(url_prefix, flags), get_client_config())
++        : m_owner(owner),
++          m_native
++          (
++              sanitize_url(url_prefix, flags)
++            #ifdef _WIN32
++              , get_client_config()
++            #endif
++          )
+     {
+         #define make_wide_str(x) make_wide_str_(x)
+         #define make_wide_str_(x) L ## x
+@@ -361,11 +368,12 @@ class http_client::impl
+         return to_string_t(url);
+     }
+ 
++#ifdef _WIN32
+     // prepare WinHttp configuration
+     static http::client::http_client_config get_client_config()
+     {
+         http::client::http_client_config c;
+-    #ifdef _WIN32
++
+         // WinHttp doesn't share WinInet/MSIE's proxy settings and has its own,
+         // but many users don't have properly configured both. Adopting proxy
+         // settings like this in desktop software is recommended behavior, see
+@@ -385,12 +393,9 @@ class http_client::impl
+                 c.set_proxy(uri(L"//" + std::wstring(ieConfig.lpszProxy)));
+             }
+         }
+-    #endif
+         return c;
+     }
+ 
+-private:
+-#ifdef _WIN32
+     static bool is_windows_xp()
+     {
+         OSVERSIONINFOEX info;
diff --git a/debian/patches/series b/debian/patches/series
index 4a09b37..b0d978e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-desktop.patch
 mv-poedit-dump-legacy.patch
+e5d68f3851341c59c712763e69839042e630555a.patch
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit