Merge lp:~thomas-voss/trust-store/fix-1452341 into lp:trust-store
- fix-1452341
- Merge into trunk
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~thomas-voss/trust-store/fix-1452341 | ||||
Merge into: | lp:trust-store | ||||
Diff against target: |
305 lines (+17/-183) 7 files modified
CMakeLists.txt (+2/-3) debian/changelog (+6/-0) debian/control (+5/-11) debian/libtrust-store1.symbols (+0/-162) debian/rules (+1/-6) src/core/trust/mir/agent.cpp (+1/-1) src/core/trust/mir/prompt_main.cpp (+2/-0) |
||||
To merge this branch: | bzr merge lp:~thomas-voss/trust-store/fix-1452341 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt (community) | Approve | ||
Marcus Tomlinson (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Pete Woods (community) | Approve | ||
Review via email: mp+265629@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-08-31.
Commit message
Bump major revision to account for toolchain update.
Description of the change
Bump major revision to account for toolchain update.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:107
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Marcus Tomlinson (marcustomlinson) wrote : | # |
Very OCD I know:
86 Description: Test files for libtrust-store1
"libtrust-store2" now
Marcus Tomlinson (marcustomlinson) wrote : | # |
Top approving again to mark rev.108 as approved.
Unmerged revisions
- 108. By Thomas Voß
-
Fix package name in description.
- 107. By Thomas Voß
-
Fix minor compilation issues.
Account for major version bump and rename .install file. - 106. By Thomas Voß
-
Bump major revision to account for toolchain update. Fixes LP:#1452341
- 105. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
Preview Diff
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2014-09-19 19:51:37 +0000 | |||
3 | +++ CMakeLists.txt 2015-07-23 08:28:52 +0000 | |||
4 | @@ -43,12 +43,11 @@ | |||
5 | 43 | ) | 43 | ) |
6 | 44 | endif() | 44 | endif() |
7 | 45 | 45 | ||
8 | 46 | pkg_check_modules(GFLAGS libgflags REQUIRED) | ||
9 | 47 | pkg_check_modules(GLOG libglog REQUIRED) | 46 | pkg_check_modules(GLOG libglog REQUIRED) |
10 | 48 | pkg_check_modules(PROCESS_CPP process-cpp REQUIRED) | 47 | pkg_check_modules(PROCESS_CPP process-cpp REQUIRED) |
11 | 49 | 48 | ||
14 | 50 | set(TRUST_STORE_VERSION_MAJOR 1) | 49 | set(TRUST_STORE_VERSION_MAJOR 2) |
15 | 51 | set(TRUST_STORE_VERSION_MINOR 1) | 50 | set(TRUST_STORE_VERSION_MINOR 0) |
16 | 52 | set(TRUST_STORE_VERSION_PATCH 0) | 51 | set(TRUST_STORE_VERSION_PATCH 0) |
17 | 53 | 52 | ||
18 | 54 | include(CTest) | 53 | include(CTest) |
19 | 55 | 54 | ||
20 | === modified file 'debian/changelog' | |||
21 | --- debian/changelog 2015-02-13 13:54:28 +0000 | |||
22 | +++ debian/changelog 2015-07-23 08:28:52 +0000 | |||
23 | @@ -1,3 +1,9 @@ | |||
24 | 1 | trust-store (2.0.0) wily; urgency=medium | ||
25 | 2 | |||
26 | 3 | * Bump major revision to account for toolchain update. Fixes LP:#1452341 | ||
27 | 4 | |||
28 | 5 | -- Thomas Voß <thomas.voss@canonical.com> Thu, 23 Jul 2015 09:22:15 +0200 | ||
29 | 6 | |||
30 | 1 | trust-store (1.1.0+15.04.20150213-0ubuntu1) vivid; urgency=medium | 7 | trust-store (1.1.0+15.04.20150213-0ubuntu1) vivid; urgency=medium |
31 | 2 | 8 | ||
32 | 3 | [ thomas-voss ] | 9 | [ thomas-voss ] |
33 | 4 | 10 | ||
34 | === modified file 'debian/control' | |||
35 | --- debian/control 2014-10-09 18:12:53 +0000 | |||
36 | +++ debian/control 2015-07-23 08:28:52 +0000 | |||
37 | @@ -6,10 +6,6 @@ | |||
38 | 6 | doxygen, | 6 | doxygen, |
39 | 7 | google-mock, | 7 | google-mock, |
40 | 8 | graphviz, | 8 | graphviz, |
41 | 9 | # We rely on C++11 features, and to prevent from ABI breaks | ||
42 | 10 | # in libstdc++ causing us issues, we explicitly select a G++ | ||
43 | 11 | # version. | ||
44 | 12 | g++-4.9, | ||
45 | 13 | libapparmor-dev, | 9 | libapparmor-dev, |
46 | 14 | libboost-program-options-dev, | 10 | libboost-program-options-dev, |
47 | 15 | libboost-system-dev, | 11 | libboost-system-dev, |
48 | @@ -34,7 +30,7 @@ | |||
49 | 34 | # upstream branch | 30 | # upstream branch |
50 | 35 | Vcs-Bzr: lp:trust-store | 31 | Vcs-Bzr: lp:trust-store |
51 | 36 | 32 | ||
53 | 37 | Package: libtrust-store1 | 33 | Package: libtrust-store2 |
54 | 38 | Architecture: any | 34 | Architecture: any |
55 | 39 | Multi-Arch: same | 35 | Multi-Arch: same |
56 | 40 | Pre-Depends: ${misc:Pre-Depends}, | 36 | Pre-Depends: ${misc:Pre-Depends}, |
57 | @@ -52,7 +48,7 @@ | |||
58 | 52 | Multi-Arch: same | 48 | Multi-Arch: same |
59 | 53 | Pre-Depends: ${misc:Pre-Depends}, | 49 | Pre-Depends: ${misc:Pre-Depends}, |
60 | 54 | Recommends: libtrust-store-doc, | 50 | Recommends: libtrust-store-doc, |
62 | 55 | Depends: libtrust-store1 (= ${binary:Version}), | 51 | Depends: libtrust-store2 (= ${binary:Version}), |
63 | 56 | ${misc:Depends}, | 52 | ${misc:Depends}, |
64 | 57 | Description: C++11 library for persisting trust requests - dev files | 53 | Description: C++11 library for persisting trust requests - dev files |
65 | 58 | Provides a common implementation of a trust store to be used by trusted | 54 | Provides a common implementation of a trust store to be used by trusted |
66 | @@ -64,10 +60,8 @@ | |||
67 | 64 | Package: trust-store-bin | 60 | Package: trust-store-bin |
68 | 65 | Section: devel | 61 | Section: devel |
69 | 66 | Architecture: any | 62 | Architecture: any |
71 | 67 | Depends: libtrust-store1 (= ${binary:Version}), | 63 | Depends: libtrust-store2 (= ${binary:Version}), |
72 | 68 | ${misc:Depends}, | 64 | ${misc:Depends}, |
73 | 69 | Replaces: libtrust-store1 (<< 1.1.0+14.10.20141008), | ||
74 | 70 | Breaks: libtrust-store1 (<< 1.1.0+14.10.20141008), | ||
75 | 71 | Description: Daemon binaries to be used by services. | 65 | Description: Daemon binaries to be used by services. |
76 | 72 | Provides a common implementation of a trust store to be used by trusted | 66 | Provides a common implementation of a trust store to be used by trusted |
77 | 73 | helpers. | 67 | helpers. |
78 | @@ -77,10 +71,10 @@ | |||
79 | 77 | Package: trust-store-tests | 71 | Package: trust-store-tests |
80 | 78 | Section: libdevel | 72 | Section: libdevel |
81 | 79 | Architecture: any | 73 | Architecture: any |
83 | 80 | Depends: libtrust-store1 (= ${binary:Version}), | 74 | Depends: libtrust-store2 (= ${binary:Version}), |
84 | 81 | ${misc:Depends}, | 75 | ${misc:Depends}, |
85 | 82 | Suggests: libtrust-store-dev, | 76 | Suggests: libtrust-store-dev, |
87 | 83 | Description: Test files for libtrust-store1 | 77 | Description: Test files for libtrust-store2 |
88 | 84 | Provides a common implementation of a trust store to be used by trusted | 78 | Provides a common implementation of a trust store to be used by trusted |
89 | 85 | helpers. | 79 | helpers. |
90 | 86 | . | 80 | . |
91 | 87 | 81 | ||
92 | === removed file 'debian/libtrust-store1.symbols' | |||
93 | --- debian/libtrust-store1.symbols 2014-10-15 18:23:38 +0000 | |||
94 | +++ debian/libtrust-store1.symbols 1970-01-01 00:00:00 +0000 | |||
95 | @@ -1,162 +0,0 @@ | |||
96 | 1 | libtrust-store.so.1 libtrust-store1 #MINVER# | ||
97 | 2 | (c++)"core::trust::WhiteListingAgent::always_grant_for_unconfined()@Base" 1.1.0+14.10.20141015 | ||
98 | 3 | (c++)"core::trust::WhiteListingAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.1.0+14.10.20141015 | ||
99 | 4 | (c++)"core::trust::WhiteListingAgent::WhiteListingAgent(std::function<bool (core::trust::Agent::RequestParameters const&)>, std::shared_ptr<core::trust::Agent> const&)@Base" 1.1.0+14.10.20141015 | ||
100 | 5 | (c++)"core::trust::WhiteListingAgent::~WhiteListingAgent()@Base" 1.1.0+14.10.20141015 | ||
101 | 6 | (c++)"typeinfo for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015 | ||
102 | 7 | (c++)"typeinfo name for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015 | ||
103 | 8 | (c++)"vtable for core::trust::WhiteListingAgent@Base" 1.1.0+14.10.20141015 | ||
104 | 9 | (c++)"core::trust::i18n::default_text_domain()@Base" 1.1.0+14.10.20141008.1 | ||
105 | 10 | (c++)"core::trust::i18n::service_text_domain()@Base" 1.1.0+14.10.20141008.1 | ||
106 | 11 | (c++)"core::trust::i18n::set_service_text_domain(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1 | ||
107 | 12 | (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1 | ||
108 | 13 | (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1.0+14.10.20141008.1 | ||
109 | 14 | (c++)"core::trust::CachedAgent::Configuration::~Configuration()@Base" 1.0.0+14.10.20140806.7 | ||
110 | 15 | (c++)"core::trust::CachedAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
111 | 16 | (c++)"core::trust::CachedAgent::Reporter::report_cached_answer_found(core::trust::Agent::RequestParameters const&, core::trust::Request const&)@Base" 1.0.0+14.10.20140814.1 | ||
112 | 17 | (c++)"core::trust::CachedAgent::Reporter::report_user_prompted_for_trust(core::trust::Agent::RequestParameters const&, core::trust::Request::Answer const&)@Base" 1.0.0+14.10.20140814.1 | ||
113 | 18 | (c++)"core::trust::CachedAgent::CachedAgent(core::trust::CachedAgent::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
114 | 19 | (c++)"core::trust::create_default_store(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1 | ||
115 | 20 | (c++)"core::trust::process_trust_request(core::trust::RequestParameters const&)@Base" 0.0.1+14.10.20140717.8 | ||
116 | 21 | (c++)"core::trust::CachedAgentGlogReporter::report_cached_answer_found(core::trust::Agent::RequestParameters const&, core::trust::Request const&)@Base" 1.0.0+14.10.20140814.1 | ||
117 | 22 | (c++)"core::trust::CachedAgentGlogReporter::report_user_prompted_for_trust(core::trust::Agent::RequestParameters const&, core::trust::Request::Answer const&)@Base" 1.0.0+14.10.20140814.1 | ||
118 | 23 | (c++)"core::trust::CachedAgentGlogReporter::CachedAgentGlogReporter(core::trust::CachedAgentGlogReporter::Configuration const&)@Base" 1.0.0+14.10.20140814.1 | ||
119 | 24 | (c++)"core::trust::CachedAgentGlogReporter::~CachedAgentGlogReporter()@Base" 1.0.0+14.10.20140814.1 | ||
120 | 25 | (c++)"core::trust::AppIdFormattingTrustAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140826.1 | ||
121 | 26 | (c++)"core::trust::AppIdFormattingTrustAgent::AppIdFormattingTrustAgent(std::shared_ptr<core::trust::Agent> const&)@Base" 1.0.0+14.10.20140826.1 | ||
122 | 27 | (c++)"core::trust::AppIdFormattingTrustAgent::~AppIdFormattingTrustAgent()@Base" 1.0.0+14.10.20140826.1 | ||
123 | 28 | (c++)"core::trust::expose_store_to_bus_with_name(std::shared_ptr<core::trust::Store> const&, std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1 | ||
124 | 29 | (c++)"core::trust::resolve_store_on_bus_with_name(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1 | ||
125 | 30 | (c++)"core::trust::expose_store_to_session_with_name(std::shared_ptr<core::trust::Store> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1 | ||
126 | 31 | (c++)"core::trust::resolve_store_in_session_with_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1 | ||
127 | 32 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::InvocationArguments::~InvocationArguments()@Base" 0.0.1+14.10.20140717.8 | ||
128 | 33 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::exec_prompt_provider_with_arguments(core::trust::mir::PromptProviderHelper::InvocationArguments const&)@Base" 0.0.1+14.10.20140717.8 | ||
129 | 34 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptProviderHelper::PromptProviderHelper(core::trust::mir::PromptProviderHelper::CreationArguments const&)@Base" 0.0.1+14.10.20140717.8 | ||
130 | 35 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::create_prompt_session_sync(core::trust::TaggedInteger<core::trust::tag::Pid, int>, void (*)(MirPromptSession*, MirPromptSessionState, void*), void*)@Base" 1.0.0+14.10.20140806.7 | ||
131 | 36 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::ConnectionVirtualTable()@Base" 1.0.0+14.10.20141001 | ||
132 | 37 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection*)@Base" 0.0.1+14.10.20140717.8 | ||
133 | 38 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::release_sync()@Base" 0.0.1+14.10.20140717.8 | ||
134 | 39 | (c++|arch=amd64 arm64)"core::trust::mir::PromptSessionVirtualTable::mir_client_fd_callback(MirPromptSession*, unsigned long, int const*, void*)@Base" 1.0.0+14.10.20140806.7 | ||
135 | 40 | (c++|arch=i386 armhf)"core::trust::mir::PromptSessionVirtualTable::mir_client_fd_callback(MirPromptSession*, unsigned int, int const*, void*)@Base" 1.0.0+14.10.20140806.7 | ||
136 | 41 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::new_fd_for_prompt_provider()@Base" 0.0.1+14.10.20140717.8 | ||
137 | 42 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::PromptSessionVirtualTable()@Base" 1.0.0+14.10.20141001 | ||
138 | 43 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::PromptSessionVirtualTable::PromptSessionVirtualTable(MirPromptSession*)@Base" 0.0.1+14.10.20140717.8 | ||
139 | 44 | (c++)"core::trust::mir::connect(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140717.8 | ||
140 | 45 | (c++)"core::trust::mir::create_agent_for_mir_connection(MirConnection*)@Base" 0.0.1+14.10.20140717.8 | ||
141 | 46 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::on_trust_session_changed_state(MirPromptSession*, MirPromptSessionState, void*)@Base" 0.0.1+14.10.20140717.8 | ||
142 | 47 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
143 | 48 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::translator_only_accepting_exit_status_success()@Base" 0.0.1+14.10.20140717.8 | ||
144 | 49 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::Agent(std::shared_ptr<core::trust::mir::ConnectionVirtualTable> const&, std::shared_ptr<core::trust::mir::PromptProviderHelper> const&, std::function<core::trust::Request::Answer (core::posix::wait::Result const&)> const&)@Base" 0.0.1+14.10.20140717.8 | ||
145 | 50 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::Agent::~Agent()@Base" 0.0.1+14.10.20140717.8 | ||
146 | 51 | (c++|arch=amd64 i386 armhf arm64)"core::trust::mir::operator==(core::trust::mir::PromptProviderHelper::InvocationArguments const&, core::trust::mir::PromptProviderHelper::InvocationArguments const&)@Base" 0.0.1+14.10.20140717.8 | ||
147 | 52 | (c++)"core::trust::dbus::create_per_user_agent_for_bus_connection(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.10.20140806.7 | ||
148 | 53 | (c++)"core::trust::dbus::create_multi_user_agent_for_bus_connection(std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0+14.10.20140806.7 | ||
149 | 54 | (c++)"core::trust::Agent::RequestParameters::~RequestParameters()@Base" 1.0.0+14.10.20140806.7 | ||
150 | 55 | (c++)"core::trust::Store::Query::Errors::NoCurrentResult::~NoCurrentResult()@Base" 0.0.1+14.10.20140717.8 | ||
151 | 56 | (c++)"core::trust::Store::Query::Errors::QueryIsInErrorState::~QueryIsInErrorState()@Base" 0.0.1+14.10.20140717.8 | ||
152 | 57 | (c++)"core::trust::Store::Errors::ErrorResettingStore::~ErrorResettingStore()@Base" 0.0.1+14.10.20140626.1 | ||
153 | 58 | (c++)"core::trust::remote::dbus::Agent::Stub::send(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
154 | 59 | (c++)"core::trust::remote::dbus::Agent::Stub::Stub(core::trust::remote::dbus::Agent::Stub::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
155 | 60 | (c++)"core::trust::remote::dbus::Agent::Stub::~Stub()@Base" 1.0.0+14.10.20140806.7 | ||
156 | 61 | (c++)"core::trust::remote::dbus::Agent::Skeleton::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
157 | 62 | (c++)"core::trust::remote::dbus::Agent::Skeleton::Skeleton(core::trust::remote::dbus::Agent::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
158 | 63 | (c++)"core::trust::remote::dbus::Agent::Skeleton::~Skeleton()@Base" 1.0.0+14.10.20140806.7 | ||
159 | 64 | (c++)"core::trust::remote::Agent::Stub::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
160 | 65 | (c++)"core::trust::remote::Agent::Skeleton::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
161 | 66 | (c++)"core::trust::remote::Agent::Skeleton::Skeleton(std::shared_ptr<core::trust::Agent> const&)@Base" 1.0.0+14.10.20140806.7 | ||
162 | 67 | (c++)"core::trust::remote::posix::Stub::start_accept()@Base" 1.0.0+14.10.20140806.7 | ||
163 | 68 | (c++)"core::trust::remote::posix::Stub::on_new_session(boost::system::error_code const&, std::shared_ptr<core::trust::remote::posix::Stub::Session> const&)@Base" 1.0.0+14.10.20140806.7 | ||
164 | 69 | (c++)"core::trust::remote::posix::Stub::create_stub_for_configuration(core::trust::remote::posix::Stub::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
165 | 70 | (c++)"core::trust::remote::posix::Stub::get_sock_opt_credentials_resolver()@Base" 1.0.0+14.10.20140806.7 | ||
166 | 71 | (c++)"core::trust::remote::posix::Stub::handle_error_from_socket_operation_for_uid(boost::system::error_code const&, core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7 | ||
167 | 72 | (c++)"core::trust::remote::posix::Stub::send(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
168 | 73 | (c++)"core::trust::remote::posix::Stub::Session::Registry::add_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>, std::shared_ptr<core::trust::remote::posix::Stub::Session>)@Base" 1.0.0+14.10.20140806.7 | ||
169 | 74 | (c++)"core::trust::remote::posix::Stub::Session::Registry::remove_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7 | ||
170 | 75 | (c++)"core::trust::remote::posix::Stub::Session::Registry::resolve_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>)@Base" 1.0.0+14.10.20140806.7 | ||
171 | 76 | (c++)"core::trust::remote::posix::Stub::Session::Session(boost::asio::io_service&)@Base" 1.0.0+14.10.20140806.7 | ||
172 | 77 | (c++)"core::trust::remote::posix::Stub::Stub(core::trust::remote::posix::Stub::Configuration)@Base" 1.0.0+14.10.20140806.7 | ||
173 | 78 | (c++)"core::trust::remote::posix::Stub::~Stub()@Base" 1.0.0+14.10.20140806.7 | ||
174 | 79 | (c++)"core::trust::remote::posix::Skeleton::start_read()@Base" 1.0.0+14.10.20140806.7 | ||
175 | 80 | (c++|arch=amd64 arm64 ppc64el)"core::trust::remote::posix::Skeleton::on_read_finished(boost::system::error_code const&, unsigned long)@Base" 1.0.0+14.10.20140806.7 | ||
176 | 81 | (c++|arch=i386 armhf powerpc)"core::trust::remote::posix::Skeleton::on_read_finished(boost::system::error_code const&, unsigned int)@Base" 1.0.0+14.10.20140806.7 | ||
177 | 82 | (c++)"core::trust::remote::posix::Skeleton::process_incoming_request(core::trust::remote::posix::Request const&)@Base" 1.0.0+14.10.20140806.7 | ||
178 | 83 | (c++)"core::trust::remote::posix::Skeleton::create_skeleton_for_configuration(core::trust::remote::posix::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
179 | 84 | (c++)"core::trust::remote::posix::Skeleton::Skeleton(core::trust::remote::posix::Skeleton::Configuration const&)@Base" 1.0.0+14.10.20140806.7 | ||
180 | 85 | (c++)"core::trust::remote::posix::Skeleton::~Skeleton()@Base" 1.0.0+14.10.20140806.7 | ||
181 | 86 | (c++)"core::trust::remote::helpers::proc_stat_start_time_resolver()@Base" 1.0.0+14.10.20140806.7 | ||
182 | 87 | (c++)"core::trust::remote::helpers::aa_get_task_con_app_id_resolver()@Base" 1.0.0+14.10.20140806.7 | ||
183 | 88 | (c++)"core::trust::operator==(core::trust::Agent::RequestParameters const&, core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7 | ||
184 | 89 | (c++)"core::trust::operator==(core::trust::Request const&, core::trust::Request const&)@Base" 0.0.1+14.10.20140626.1 | ||
185 | 90 | (c++)"core::trust::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::trust::Request::Answer const&)@Base" 0.0.1+14.10.20140626.1 | ||
186 | 91 | (c++)"core::trust::operator<<(std::basic_ostream<char, std::char_traits<char> >&, core::trust::Request const&)@Base" 0.0.1+14.10.20140626.1 | ||
187 | 92 | (c++)"core::trust::remote::posix::Stub::has_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>) const@Base" 1.0.0+14.10.20140806.7 | ||
188 | 93 | (c++)"core::trust::remote::posix::Stub::Session::Registry::has_session_for_uid(core::trust::TaggedInteger<core::trust::tag::Uid, unsigned int>) const@Base" 1.0.0+14.10.20140806.7 | ||
189 | 94 | (c++)"typeinfo for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7 | ||
190 | 95 | (c++)"typeinfo for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1 | ||
191 | 96 | (c++)"typeinfo for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1 | ||
192 | 97 | (c++)"typeinfo for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1 | ||
193 | 98 | (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8 | ||
194 | 99 | (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
195 | 100 | (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
196 | 101 | (c++|arch=amd64 i386 armhf arm64)"typeinfo for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8 | ||
197 | 102 | (c++)"typeinfo for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7 | ||
198 | 103 | (c++)"typeinfo for core::trust::Agent@Base" 0.0.1+14.10.20140717.8 | ||
199 | 104 | (c++)"typeinfo for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8 | ||
200 | 105 | (c++)"typeinfo for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8 | ||
201 | 106 | (c++)"typeinfo for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1 | ||
202 | 107 | (c++)"typeinfo for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1 | ||
203 | 108 | (c++)"typeinfo for core::trust::Store@Base" 0.0.1+14.10.20140626.1 | ||
204 | 109 | (c++)"typeinfo for core::trust::Token@Base" 0.0.1+14.10.20140626.1 | ||
205 | 110 | (c++)"typeinfo for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
206 | 111 | (c++)"typeinfo for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
207 | 112 | (c++)"typeinfo for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
208 | 113 | (c++)"typeinfo for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
209 | 114 | (c++)"typeinfo for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7 | ||
210 | 115 | (c++)"typeinfo for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7 | ||
211 | 116 | (c++)"typeinfo for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
212 | 117 | (c++)"typeinfo name for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7 | ||
213 | 118 | (c++)"typeinfo name for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1 | ||
214 | 119 | (c++)"typeinfo name for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1 | ||
215 | 120 | (c++)"typeinfo name for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1 | ||
216 | 121 | (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8 | ||
217 | 122 | (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
218 | 123 | (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
219 | 124 | (c++|arch=amd64 i386 armhf arm64)"typeinfo name for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8 | ||
220 | 125 | (c++)"typeinfo name for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7 | ||
221 | 126 | (c++)"typeinfo name for core::trust::Agent@Base" 0.0.1+14.10.20140717.8 | ||
222 | 127 | (c++)"typeinfo name for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8 | ||
223 | 128 | (c++)"typeinfo name for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8 | ||
224 | 129 | (c++)"typeinfo name for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1 | ||
225 | 130 | (c++)"typeinfo name for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1 | ||
226 | 131 | (c++)"typeinfo name for core::trust::Store@Base" 0.0.1+14.10.20140626.1 | ||
227 | 132 | (c++)"typeinfo name for core::trust::Token@Base" 0.0.1+14.10.20140626.1 | ||
228 | 133 | (c++)"typeinfo name for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
229 | 134 | (c++)"typeinfo name for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
230 | 135 | (c++)"typeinfo name for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
231 | 136 | (c++)"typeinfo name for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
232 | 137 | (c++)"typeinfo name for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7 | ||
233 | 138 | (c++)"typeinfo name for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7 | ||
234 | 139 | (c++)"typeinfo name for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
235 | 140 | (c++)"vtable for core::trust::CachedAgent::Reporter@Base" 1.0.0+14.10.20140814.1 | ||
236 | 141 | (c++)"vtable for core::trust::CachedAgent@Base" 1.0.0+14.10.20140806.7 | ||
237 | 142 | (c++)"vtable for core::trust::CachedAgentGlogReporter@Base" 1.0.0+14.10.20140814.1 | ||
238 | 143 | (c++)"vtable for core::trust::AppIdFormattingTrustAgent@Base" 1.0.0+14.10.20140826.1 | ||
239 | 144 | (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::PromptProviderHelper@Base" 0.0.1+14.10.20140717.8 | ||
240 | 145 | (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::ConnectionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
241 | 146 | (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::PromptSessionVirtualTable@Base" 0.0.1+14.10.20140717.8 | ||
242 | 147 | (c++|arch=amd64 i386 armhf arm64)"vtable for core::trust::mir::Agent@Base" 0.0.1+14.10.20140717.8 | ||
243 | 148 | (c++)"vtable for core::trust::Agent::Registry@Base" 1.0.0+14.10.20140806.7 | ||
244 | 149 | (c++)"vtable for core::trust::Agent@Base" 0.0.1+14.10.20140717.8 | ||
245 | 150 | (c++)"vtable for core::trust::Store::Query::Errors::NoCurrentResult@Base" 0.0.1+14.10.20140717.8 | ||
246 | 151 | (c++)"vtable for core::trust::Store::Query::Errors::QueryIsInErrorState@Base" 0.0.1+14.10.20140717.8 | ||
247 | 152 | (c++)"vtable for core::trust::Store::Query@Base" 0.0.1+14.10.20140626.1 | ||
248 | 153 | (c++)"vtable for core::trust::Store::Errors::ErrorResettingStore@Base" 0.0.1+14.10.20140626.1 | ||
249 | 154 | (c++)"vtable for core::trust::Store@Base" 0.0.1+14.10.20140626.1 | ||
250 | 155 | (c++)"vtable for core::trust::Token@Base" 0.0.1+14.10.20140626.1 | ||
251 | 156 | (c++)"vtable for core::trust::remote::dbus::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
252 | 157 | (c++)"vtable for core::trust::remote::dbus::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
253 | 158 | (c++)"vtable for core::trust::remote::Agent::Stub@Base" 1.0.0+14.10.20140806.7 | ||
254 | 159 | (c++)"vtable for core::trust::remote::Agent::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
255 | 160 | (c++)"vtable for core::trust::remote::posix::Stub::Session::Registry@Base" 1.0.0+14.10.20140806.7 | ||
256 | 161 | (c++)"vtable for core::trust::remote::posix::Stub@Base" 1.0.0+14.10.20140806.7 | ||
257 | 162 | (c++)"vtable for core::trust::remote::posix::Skeleton@Base" 1.0.0+14.10.20140806.7 | ||
258 | 163 | 0 | ||
259 | === renamed file 'debian/libtrust-store1.install' => 'debian/libtrust-store2.install' | |||
260 | === modified file 'debian/rules' | |||
261 | --- debian/rules 2014-08-06 11:22:28 +0000 | |||
262 | +++ debian/rules 2015-07-23 08:28:52 +0000 | |||
263 | @@ -5,11 +5,6 @@ | |||
264 | 5 | 5 | ||
265 | 6 | include /usr/share/dpkg/default.mk | 6 | include /usr/share/dpkg/default.mk |
266 | 7 | 7 | ||
267 | 8 | # Explicitly selecting a G{CC,++}-version here to avoid accidental | ||
268 | 9 | # ABI breaks introduced by toolchain updates. | ||
269 | 10 | export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 | ||
270 | 11 | export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 | ||
271 | 12 | |||
272 | 13 | # Mir is an optional build dependency | 8 | # Mir is an optional build dependency |
273 | 14 | ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 armhf)) | 9 | ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 armhf)) |
274 | 15 | TRUST_STORE_MIR_AGENT_ENABLED = ON | 10 | TRUST_STORE_MIR_AGENT_ENABLED = ON |
275 | @@ -24,4 +19,4 @@ | |||
276 | 24 | dh $@ --fail-missing | 19 | dh $@ --fail-missing |
277 | 25 | 20 | ||
278 | 26 | override_dh_auto_configure: | 21 | override_dh_auto_configure: |
280 | 27 | dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DTRUST_STORE_MIR_AGENT_ENABLED=$(TRUST_STORE_MIR_AGENT_ENABLED) | 22 | dh_auto_configure -- -DTRUST_STORE_MIR_AGENT_ENABLED=$(TRUST_STORE_MIR_AGENT_ENABLED) |
281 | 28 | 23 | ||
282 | === modified file 'src/core/trust/mir/agent.cpp' | |||
283 | --- src/core/trust/mir/agent.cpp 2014-10-07 19:27:18 +0000 | |||
284 | +++ src/core/trust/mir/agent.cpp 2015-07-23 08:28:52 +0000 | |||
285 | @@ -96,7 +96,7 @@ | |||
286 | 96 | mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection) | 96 | mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection) |
287 | 97 | : connection{connection} | 97 | : connection{connection} |
288 | 98 | { | 98 | { |
290 | 99 | if (mir_connection_is_valid(connection) == mir_false) throw InvalidMirConnection | 99 | if (not mir_connection_is_valid(connection)) throw InvalidMirConnection |
291 | 100 | { | 100 | { |
292 | 101 | "Cannot create instance for invalid connection to Mir." | 101 | "Cannot create instance for invalid connection to Mir." |
293 | 102 | }; | 102 | }; |
294 | 103 | 103 | ||
295 | === modified file 'src/core/trust/mir/prompt_main.cpp' | |||
296 | --- src/core/trust/mir/prompt_main.cpp 2015-02-13 12:07:56 +0000 | |||
297 | +++ src/core/trust/mir/prompt_main.cpp 2015-07-23 08:28:52 +0000 | |||
298 | @@ -39,6 +39,8 @@ | |||
299 | 39 | #include "prompt_config.h" | 39 | #include "prompt_config.h" |
300 | 40 | #include "prompt_main.h" | 40 | #include "prompt_main.h" |
301 | 41 | 41 | ||
302 | 42 | #include <iostream> | ||
303 | 43 | |||
304 | 42 | namespace cli = core::trust::mir::cli; | 44 | namespace cli = core::trust::mir::cli; |
305 | 43 | namespace env = core::trust::mir::env; | 45 | namespace env = core::trust::mir::env; |
306 | 44 | 46 |
Looks reasonable to me. Good luck getting the symbols removal though, though.