From 116b90ec29b8e0911aa1eb8dfa5d9c185742ab85 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Sun, 27 Oct 2013 15:39:41 +0100 Subject: release 0.3-1~bpo70+1 --- debian/patches/backport | 23 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/backport create mode 100644 debian/patches/series (limited to 'debian/patches') diff --git a/debian/patches/backport b/debian/patches/backport new file mode 100644 index 0000000..9e2ccdd --- /dev/null +++ b/debian/patches/backport @@ -0,0 +1,23 @@ +Description: Replace (map|set)::emplace with insert. +Author: Timo Weingärtner + +--- ssh-agent-filter-0.3.orig/ssh-agent-filter.C ++++ ssh-agent-filter-0.3/ssh-agent-filter.C +@@ -245,7 +245,7 @@ void setup_filters () { + if (debug) std::clog << "key allowed by matching comment" << std::endl; + } + +- if (allow) allowed_pubkeys.emplace(std::move(key)); ++ if (allow) allowed_pubkeys.insert(std::move(key)); + else { + bool confirm{false}; + +@@ -266,7 +266,7 @@ void setup_filters () { + if (debug) std::clog << "key allowed with confirmation by catch-all (-A)" << std::endl; + } + +- if (confirm) confirmed_pubkeys.emplace(std::move(key), std::move(comm)); ++ if (confirm) confirmed_pubkeys.insert(make_pair(std::move(key), std::move(comm))); + } + + if (debug) std::clog << std::endl; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6fce45f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +backport -- cgit v1.2.3