Merge ~ogayot/ubuntu/+source/lomiri-download-manager:merge-lp2045635-noble into ubuntu/+source/lomiri-download-manager:debian/sid
- Git
- lp:~ogayot/ubuntu/+source/lomiri-download-manager
- merge-lp2045635-noble
- Merge into debian/sid
Status: | Needs review |
---|---|
Proposed branch: | ~ogayot/ubuntu/+source/lomiri-download-manager:merge-lp2045635-noble |
Merge into: | ubuntu/+source/lomiri-download-manager:debian/sid |
Diff against target: |
917 lines (+422/-21) 6 files modified
debian/changelog (+31/-0) debian/control (+2/-2) debian/patches/1001-drop-deprecated-GetConnectionAppArmorSecurityContext.patch (+387/-0) debian/patches/series (+1/-0) debian/rules (+1/-1) dev/null (+0/-18) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior (community) | Approve | ||
git-ubuntu import | Pending | ||
Review via email: mp+456875@code.launchpad.net |
Commit message
Description of the change
1. A merge of 0.1.2-2 from Debian ; which fixes a FTBFS issue with recent googletest versions.
2. A patch replacing uses of the deprecated GetConnectionAp
Tags
----
[logical](https:/
[split](https:/
[reconstruct](https:/
[new/debian](https:/
[old/debian](https:/
[old/ubuntu](https:/
PPA
---
[ogayot/
Build in PPA
------------
https:/
Tests done
----------
* The package builds and installs properly
* Calling the com.lomiri.
I will need a sponsor to land this :)
Olivier Gayot (ogayot) wrote : | # |
Thank you Sergio! I appreciate this feedback and understand your concern.
Pinky promise, if upstream pushes back on the change or goes for a different implementation, I'll follow up and submit the changes to Ubuntu.
Unmerged commits
- 6a6f1b5... by Olivier Gayot
-
update-maintainer
- 0ad2ab0... by Olivier Gayot
-
reconstruct-
changelog - 80b23ef... by Olivier Gayot
-
merge-changelogs
- 1df2480... by Olivier Gayot
-
* Replace deprecated calls to GetConnectionAp
pArmorSecurityC ontext by calls
to GetConnectionCredentials (LP: #1489489). - a00b62e... by Olivier Gayot
-
* debian/rules:
* debian/control:
+ Drop pkgkde_symbolshelper; no longer used to (try to) manage the
symbols. - ff66e91... by Olivier Gayot
-
* debian/*.symbols:
+ Remove; upstream is C++ and does not aggressively manage their exported
symbols, so these are unhepfully compiler-version-, architecture-, and
compiler-option- dependent. The debhelper-compat 13 default of
-VUpstream- Version is sufficient.
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 9d0f328..49a794d 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,20 @@ |
6 | +lomiri-download-manager (0.1.2-2ubuntu1) noble; urgency=medium |
7 | + |
8 | + * Merge with Debian unstable (LP: #2045635). Remaining changes: |
9 | + - debian/*.symbols: |
10 | + + Remove; upstream is C++ and does not aggressively manage their exported |
11 | + symbols, so these are unhepfully compiler-version-, architecture-, and |
12 | + compiler-option-dependent. The debhelper-compat 13 default of |
13 | + -VUpstream-Version is sufficient. |
14 | + - debian/rules: |
15 | + - debian/control: |
16 | + + Drop pkgkde_symbolshelper; no longer used to (try to) manage the |
17 | + symbols. |
18 | + * Replace deprecated calls to GetConnectionAppArmorSecurityContext by calls |
19 | + to GetConnectionCredentials (LP: #1489489). |
20 | + |
21 | + -- Olivier Gayot <olivier.gayot@canonical.com> Tue, 05 Dec 2023 10:20:56 +0100 |
22 | + |
23 | lomiri-download-manager (0.1.2-2) unstable; urgency=medium |
24 | |
25 | * [debian/*.symbols] Mark unused symbols that would otherwise be optimized out |
26 | @@ -6,6 +23,20 @@ lomiri-download-manager (0.1.2-2) unstable; urgency=medium |
27 | |
28 | -- Marius Gripsgard <mariogrip@debian.org> Thu, 27 Jul 2023 02:13:05 +0200 |
29 | |
30 | +lomiri-download-manager (0.1.2-1ubuntu1) lunar; urgency=medium |
31 | + |
32 | + * debian/*.symbols: |
33 | + + Remove; upstream is C++ and does not aggressively manage their exported |
34 | + symbols, so these are unhepfully compiler-version-, architecture-, and |
35 | + compiler-option-dependent. The debhelper-compat 13 default of |
36 | + -VUpstream-Version is sufficient. |
37 | + * debian/rules: |
38 | + * debian/control: |
39 | + + Drop pkgkde_symbolshelper; no longer used to (try to) manage the |
40 | + symbols. |
41 | + |
42 | + -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 04 Apr 2023 17:06:09 +1000 |
43 | + |
44 | lomiri-download-manager (0.1.2-1) unstable; urgency=medium |
45 | |
46 | * New upstream release. |
47 | diff --git a/debian/control b/debian/control |
48 | index 12e5732..aeadc1a 100644 |
49 | --- a/debian/control |
50 | +++ b/debian/control |
51 | @@ -26,10 +26,10 @@ Build-Depends: cmake, |
52 | network-manager, |
53 | rdfind, |
54 | symlinks, |
55 | - pkg-kde-tools, |
56 | xvfb, |
57 | xauth, |
58 | -Maintainer: Debian UBports Team <team+ubports@tracker.debian.org> |
59 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
60 | +XSBC-Original-Maintainer: Debian UBports Team <team+ubports@tracker.debian.org> |
61 | Uploaders: |
62 | Mike Gabriel <sunweaver@debian.org>, |
63 | Marius Gripsgard <mariogrip@debian.org>, |
64 | diff --git a/debian/libldm-common0.symbols b/debian/libldm-common0.symbols |
65 | deleted file mode 100644 |
66 | index a98fda0..0000000 |
67 | --- a/debian/libldm-common0.symbols |
68 | +++ /dev/null |
69 | @@ -1,168 +0,0 @@ |
70 | -# SymbolsHelper-Confirmed: 0.1.0 amd64 |
71 | -libldm-common.so.0 libldm-common0 #MINVER# |
72 | -*Build-Depends-Package: libldm-common-dev |
73 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC1ENS2_4TypeERK7QString@Base 0.1.0 |
74 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC1ERKS2_@Base 0.1.0 |
75 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC1EiRK7QString@Base 0.1.0 |
76 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC1Ev@Base 0.1.0 |
77 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC2ENS2_4TypeERK7QString@Base 0.1.0 |
78 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC2ERKS2_@Base 0.1.0 |
79 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC2EiRK7QString@Base 0.1.0 |
80 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructC2Ev@Base 0.1.0 |
81 | - _ZN6Lomiri9Transfers6Errors15AuthErrorStructaSERKS2_@Base 0.1.0 |
82 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC1ERK7QStringS5_S5_@Base 0.1.0 |
83 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC1ERKS2_@Base 0.1.0 |
84 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC1Ev@Base 0.1.0 |
85 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC2ERK7QStringS5_S5_@Base 0.1.0 |
86 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC2ERKS2_@Base 0.1.0 |
87 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructC2Ev@Base 0.1.0 |
88 | - _ZN6Lomiri9Transfers6Errors15HashErrorStructaSERKS2_@Base 0.1.0 |
89 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC1ERKS2_@Base 0.1.0 |
90 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC1EiRK7QString@Base 0.1.0 |
91 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC1Ev@Base 0.1.0 |
92 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC2ERKS2_@Base 0.1.0 |
93 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC2EiRK7QString@Base 0.1.0 |
94 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructC2Ev@Base 0.1.0 |
95 | - _ZN6Lomiri9Transfers6Errors15HttpErrorStructaSERKS2_@Base 0.1.0 |
96 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC1ERKS2_@Base 0.1.0 |
97 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC1Ei@Base 0.1.0 |
98 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC1EiRK7QString@Base 0.1.0 |
99 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC1Ev@Base 0.1.0 |
100 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC2ERKS2_@Base 0.1.0 |
101 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC2Ei@Base 0.1.0 |
102 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC2EiRK7QString@Base 0.1.0 |
103 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructC2Ev@Base 0.1.0 |
104 | - _ZN6Lomiri9Transfers6Errors18NetworkErrorStructaSERKS2_@Base 0.1.0 |
105 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC1ERKS2_@Base 0.1.0 |
106 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC1EiRK7QString@Base 0.1.0 |
107 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC1EiRK7QStringiS5_S5_@Base 0.1.0 |
108 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC1EiiRK7QStringS5_@Base 0.1.0 |
109 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC1Ev@Base 0.1.0 |
110 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC2ERKS2_@Base 0.1.0 |
111 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC2EiRK7QString@Base 0.1.0 |
112 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC2EiRK7QStringiS5_S5_@Base 0.1.0 |
113 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC2EiiRK7QStringS5_@Base 0.1.0 |
114 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructC2Ev@Base 0.1.0 |
115 | - _ZN6Lomiri9Transfers6Errors18ProcessErrorStructaSERKS2_@Base 0.1.0 |
116 | - _ZN6Lomiri9Transfers6ErrorslsER13QDBusArgumentRKNS1_15AuthErrorStructE@Base 0.1.0 |
117 | - _ZN6Lomiri9Transfers6ErrorslsER13QDBusArgumentRKNS1_15HashErrorStructE@Base 0.1.0 |
118 | - _ZN6Lomiri9Transfers6ErrorslsER13QDBusArgumentRKNS1_15HttpErrorStructE@Base 0.1.0 |
119 | - _ZN6Lomiri9Transfers6ErrorslsER13QDBusArgumentRKNS1_18NetworkErrorStructE@Base 0.1.0 |
120 | - _ZN6Lomiri9Transfers6ErrorslsER13QDBusArgumentRKNS1_18ProcessErrorStructE@Base 0.1.0 |
121 | - _ZN6Lomiri9Transfers6ErrorsrsERK13QDBusArgumentRNS1_15AuthErrorStructE@Base 0.1.0 |
122 | - _ZN6Lomiri9Transfers6ErrorsrsERK13QDBusArgumentRNS1_15HashErrorStructE@Base 0.1.0 |
123 | - _ZN6Lomiri9Transfers6ErrorsrsERK13QDBusArgumentRNS1_15HttpErrorStructE@Base 0.1.0 |
124 | - _ZN6Lomiri9Transfers6ErrorsrsERK13QDBusArgumentRNS1_18NetworkErrorStructE@Base 0.1.0 |
125 | - _ZN6Lomiri9Transfers6ErrorsrsERK13QDBusArgumentRNS1_18ProcessErrorStructE@Base 0.1.0 |
126 | - _ZN6Lomiri9Transfers6System13HashAlgorithm11getHashAlgoEN18QCryptographicHash9AlgorithmE@Base 0.1.0 |
127 | - _ZN6Lomiri9Transfers6System13HashAlgorithm11getHashAlgoERK7QString@Base 0.1.0 |
128 | - _ZN6Lomiri9Transfers6System13HashAlgorithm11isValidAlgoERK7QString@Base 0.1.0 |
129 | - _ZN6Lomiri9Transfers6System13HashAlgorithm8algoListE@Base 0.1.0 |
130 | - _ZN6Lomiri9Transfers6System14DBusConnection10connectionEv@Base 0.1.0 |
131 | - _ZN6Lomiri9Transfers6System14DBusConnection11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
132 | - _ZN6Lomiri9Transfers6System14DBusConnection11qt_metacastEPKc@Base 0.1.0 |
133 | - _ZN6Lomiri9Transfers6System14DBusConnection11setInstanceEPS2_@Base 0.1.0 |
134 | - _ZN6Lomiri9Transfers6System14DBusConnection14deleteInstanceEv@Base 0.1.0 |
135 | - _ZN6Lomiri9Transfers6System14DBusConnection14registerObjectERK7QStringP7QObject6QFlagsIN15QDBusConnection14RegisterOptionEE@Base 0.1.0 |
136 | - _ZN6Lomiri9Transfers6System14DBusConnection15registerServiceERK7QString@Base 0.1.0 |
137 | - _ZN6Lomiri9Transfers6System14DBusConnection16staticMetaObjectE@Base 0.1.0 |
138 | - _ZN6Lomiri9Transfers6System14DBusConnection16unregisterObjectERK7QStringN15QDBusConnection14UnregisterModeE@Base 0.1.0 |
139 | - _ZN6Lomiri9Transfers6System14DBusConnection17unregisterServiceERK7QString@Base 0.1.0 |
140 | - _ZN6Lomiri9Transfers6System14DBusConnection6_mutexE@Base 0.1.0 |
141 | - _ZN6Lomiri9Transfers6System14DBusConnection8instanceE15QDBusConnection@Base 0.1.0 |
142 | - _ZN6Lomiri9Transfers6System14DBusConnection8instanceEv@Base 0.1.0 |
143 | - _ZN6Lomiri9Transfers6System14DBusConnection9_instanceE@Base 0.1.0 |
144 | - _ZN6Lomiri9Transfers6System14DBusConnectionC1E15QDBusConnectionP7QObject@Base 0.1.0 |
145 | - _ZN6Lomiri9Transfers6System14DBusConnectionC1EP7QObject@Base 0.1.0 |
146 | - _ZN6Lomiri9Transfers6System14DBusConnectionC2E15QDBusConnectionP7QObject@Base 0.1.0 |
147 | - _ZN6Lomiri9Transfers6System14DBusConnectionC2EP7QObject@Base 0.1.0 |
148 | - (optional)_ZN6Lomiri9Transfers6System14DBusConnectionD0Ev@Base 0.1.0 |
149 | - (optional)_ZN6Lomiri9Transfers6System14DBusConnectionD1Ev@Base 0.1.0 |
150 | - (optional)_ZN6Lomiri9Transfers6System14DBusConnectionD2Ev@Base 0.1.0 |
151 | - _ZN6Lomiri9Transfers6System6Logger11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
152 | - _ZN6Lomiri9Transfers6System6Logger11qt_metacastEPKc@Base 0.1.0 |
153 | - _ZN6Lomiri9Transfers6System6Logger11setLogLevelE9QtMsgType@Base 0.1.0 |
154 | - _ZN6Lomiri9Transfers6System6Logger11toStdStringB5cxx11ERK7QString@Base 0.1.0 |
155 | - _ZN6Lomiri9Transfers6System6Logger12setupLoggingE7QString@Base 0.1.0 |
156 | - _ZN6Lomiri9Transfers6System6Logger16staticMetaObjectE@Base 0.1.0 |
157 | - _ZN6Lomiri9Transfers6System6Logger9getLogDirEv@Base 0.1.0 |
158 | - (optional)_ZN6Lomiri9Transfers6System6LoggerD0Ev@Base 0.1.0 |
159 | - (optional)_ZN6Lomiri9Transfers6System6LoggerD1Ev@Base 0.1.0 |
160 | - (optional)_ZN6Lomiri9Transfers6System6LoggerD2Ev@Base 0.1.0 |
161 | - _ZN6Lomiri9Transfers8Metadata10setCommandERK11QStringList@Base 0.1.0 |
162 | - _ZN6Lomiri9Transfers8Metadata10setDeflateEb@Base 0.1.0 |
163 | - _ZN6Lomiri9Transfers8Metadata10setExtractEb@Base 0.1.0 |
164 | - _ZN6Lomiri9Transfers8Metadata11COMMAND_KEYE@Base 0.1.0 |
165 | - _ZN6Lomiri9Transfers8Metadata11DEFLATE_KEYE@Base 0.1.0 |
166 | - _ZN6Lomiri9Transfers8Metadata11EXTRACT_KEYE@Base 0.1.0 |
167 | - _ZN6Lomiri9Transfers8Metadata12setLocalPathERK7QString@Base 0.1.0 |
168 | - _ZN6Lomiri9Transfers8Metadata13CUSTOM_PREFIXE@Base 0.1.0 |
169 | - _ZN6Lomiri9Transfers8Metadata13setObjectPathERK7QString@Base 0.1.0 |
170 | - _ZN6Lomiri9Transfers8Metadata14LOCAL_PATH_KEYE@Base 0.1.0 |
171 | - _ZN6Lomiri9Transfers8Metadata15OBJECT_PATH_KEYE@Base 0.1.0 |
172 | - _ZN6Lomiri9Transfers8Metadata15setClickPackageERK7QString@Base 0.1.0 |
173 | - _ZN6Lomiri9Transfers8Metadata16COMMAND_FILE_KEYE@Base 0.1.0 |
174 | - _ZN6Lomiri9Transfers8Metadata17CLICK_PACKAGE_KEYE@Base 0.1.0 |
175 | - _ZN6Lomiri9Transfers8Metadata18setShowInIndicatorEb@Base 0.1.0 |
176 | - _ZN6Lomiri9Transfers8Metadata21SHOW_IN_INDICATOR_KEYE@Base 0.1.0 |
177 | - _ZN6Lomiri9Transfers8Metadata6APP_IDE@Base 0.1.0 |
178 | - _ZN6Lomiri9Transfers8Metadata8setOwnerERK7QString@Base 0.1.0 |
179 | - _ZN6Lomiri9Transfers8Metadata8setTitleERK7QString@Base 0.1.0 |
180 | - _ZN6Lomiri9Transfers8Metadata9TITLE_KEYE@Base 0.1.0 |
181 | - _ZN6Lomiri9Transfers8Metadata9setCustomE4QMapI7QString8QVariantE@Base 0.1.0 |
182 | - _ZN6Lomiri9Transfers8MetadataC1E4QMapI7QString8QVariantE@Base 0.1.0 |
183 | - _ZN6Lomiri9Transfers8MetadataC1Ev@Base 0.1.0 |
184 | - _ZN6Lomiri9Transfers8MetadataC2E4QMapI7QString8QVariantE@Base 0.1.0 |
185 | - _ZN6Lomiri9Transfers8MetadataC2Ev@Base 0.1.0 |
186 | - _ZNK6Lomiri9Transfers6Errors15AuthErrorStruct7getTypeEv@Base 0.1.0 |
187 | - _ZNK6Lomiri9Transfers6Errors15AuthErrorStruct9getPhraseEv@Base 0.1.0 |
188 | - _ZNK6Lomiri9Transfers6Errors15HashErrorStruct11getChecksumEv@Base 0.1.0 |
189 | - _ZNK6Lomiri9Transfers6Errors15HashErrorStruct11getExpectedEv@Base 0.1.0 |
190 | - _ZNK6Lomiri9Transfers6Errors15HashErrorStruct9getMethodEv@Base 0.1.0 |
191 | - _ZNK6Lomiri9Transfers6Errors15HttpErrorStruct7getCodeEv@Base 0.1.0 |
192 | - _ZNK6Lomiri9Transfers6Errors15HttpErrorStruct9getPhraseEv@Base 0.1.0 |
193 | - _ZNK6Lomiri9Transfers6Errors18NetworkErrorStruct7getCodeEv@Base 0.1.0 |
194 | - _ZNK6Lomiri9Transfers6Errors18NetworkErrorStruct9getPhraseEv@Base 0.1.0 |
195 | - _ZNK6Lomiri9Transfers6Errors18ProcessErrorStruct11getExitCodeEv@Base 0.1.0 |
196 | - _ZNK6Lomiri9Transfers6Errors18ProcessErrorStruct16getStandardErrorEv@Base 0.1.0 |
197 | - _ZNK6Lomiri9Transfers6Errors18ProcessErrorStruct17getStandardOutputEv@Base 0.1.0 |
198 | - _ZNK6Lomiri9Transfers6Errors18ProcessErrorStruct7getCodeEv@Base 0.1.0 |
199 | - _ZNK6Lomiri9Transfers6Errors18ProcessErrorStruct9getPhraseEv@Base 0.1.0 |
200 | - _ZNK6Lomiri9Transfers6System14DBusConnection10metaObjectEv@Base 0.1.0 |
201 | - _ZNK6Lomiri9Transfers6System14DBusConnection4sendERK12QDBusMessage@Base 0.1.0 |
202 | - _ZNK6Lomiri9Transfers6System6Logger10metaObjectEv@Base 0.1.0 |
203 | - _ZNK6Lomiri9Transfers8Metadata10hasCommandEv@Base 0.1.0 |
204 | - _ZNK6Lomiri9Transfers8Metadata10hasDeflateEv@Base 0.1.0 |
205 | - _ZNK6Lomiri9Transfers8Metadata10hasExtractEv@Base 0.1.0 |
206 | - _ZNK6Lomiri9Transfers8Metadata10objectPathEv@Base 0.1.0 |
207 | - _ZNK6Lomiri9Transfers8Metadata12clickPackageEv@Base 0.1.0 |
208 | - _ZNK6Lomiri9Transfers8Metadata12hasLocalPathEv@Base 0.1.0 |
209 | - _ZNK6Lomiri9Transfers8Metadata13hasObjectPathEv@Base 0.1.0 |
210 | - _ZNK6Lomiri9Transfers8Metadata14destinationAppEv@Base 0.1.0 |
211 | - _ZNK6Lomiri9Transfers8Metadata15hasClickPackageEv@Base 0.1.0 |
212 | - _ZNK6Lomiri9Transfers8Metadata15showInIndicatorEv@Base 0.1.0 |
213 | - _ZNK6Lomiri9Transfers8Metadata18hasShowInIndicatorEv@Base 0.1.0 |
214 | - _ZNK6Lomiri9Transfers8Metadata5titleEv@Base 0.1.0 |
215 | - _ZNK6Lomiri9Transfers8Metadata6customEv@Base 0.1.0 |
216 | - _ZNK6Lomiri9Transfers8Metadata7commandEv@Base 0.1.0 |
217 | - _ZNK6Lomiri9Transfers8Metadata7deflateEv@Base 0.1.0 |
218 | - _ZNK6Lomiri9Transfers8Metadata7extractEv@Base 0.1.0 |
219 | - _ZNK6Lomiri9Transfers8Metadata8hasOwnerEv@Base 0.1.0 |
220 | - _ZNK6Lomiri9Transfers8Metadata8hasTitleEv@Base 0.1.0 |
221 | - _ZNK6Lomiri9Transfers8Metadata9hasCustomEv@Base 0.1.0 |
222 | - _ZNK6Lomiri9Transfers8Metadata9localPathEv@Base 0.1.0 |
223 | - _ZTIN6Lomiri9Transfers6System14DBusConnectionE@Base 0.1.0 |
224 | - _ZTIN6Lomiri9Transfers6System6LoggerE@Base 0.1.0 |
225 | - _ZTSN6Lomiri9Transfers6System14DBusConnectionE@Base 0.1.0 |
226 | - _ZTSN6Lomiri9Transfers6System6LoggerE@Base 0.1.0 |
227 | - _ZTVN6Lomiri9Transfers6System14DBusConnectionE@Base 0.1.0 |
228 | - _ZTVN6Lomiri9Transfers6System6LoggerE@Base 0.1.0 |
229 | - _ZlsRSoRK10QByteArray@Base 0.1.0 |
230 | - _ZlsRSoRK10QDBusError@Base 0.1.0 |
231 | - _ZlsRSoRK11QStringList@Base 0.1.0 |
232 | - _ZlsRSoRK4QMapI7QString8QVariantE@Base 0.1.0 |
233 | - _ZlsRSoRK4QMapI7QStringS1_E@Base 0.1.0 |
234 | - _ZlsRSoRK4QUrl@Base 0.1.0 |
235 | - _ZlsRSoRK5QListI10QByteArrayE@Base 0.1.0 |
236 | - _ZlsRSoRK5QListI9QSslErrorE@Base 0.1.0 |
237 | - _ZlsRSoRK7QString@Base 0.1.0 |
238 | diff --git a/debian/liblomiri-download-manager-client0.symbols b/debian/liblomiri-download-manager-client0.symbols |
239 | deleted file mode 100644 |
240 | index ef09359..0000000 |
241 | --- a/debian/liblomiri-download-manager-client0.symbols |
242 | +++ /dev/null |
243 | @@ -1,175 +0,0 @@ |
244 | -# SymbolsHelper-Confirmed: 0.1.0 amd64 powerpc |
245 | -liblomiri-download-manager-client.so.0 liblomiri-download-manager-client0 #MINVER# |
246 | -* Build-Depends-Package: liblomiri-download-manager-client-dev |
247 | - _ZN6Lomiri15DownloadManager12NetworkError11errorStringEv@Base 0.1.0 |
248 | - _ZN6Lomiri15DownloadManager12NetworkError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
249 | - _ZN6Lomiri15DownloadManager12NetworkError11qt_metacastEPKc@Base 0.1.0 |
250 | - _ZN6Lomiri15DownloadManager12NetworkError16staticMetaObjectE@Base 0.1.0 |
251 | - _ZN6Lomiri15DownloadManager12NetworkError4codeEv@Base 0.1.0 |
252 | - _ZN6Lomiri15DownloadManager12NetworkError6phraseEv@Base 0.1.0 |
253 | - _ZN6Lomiri15DownloadManager12NetworkErrorC1ENS_9Transfers6Errors18NetworkErrorStructEP7QObject@Base 0.1.0 |
254 | - _ZN6Lomiri15DownloadManager12NetworkErrorC2ENS_9Transfers6Errors18NetworkErrorStructEP7QObject@Base 0.1.0 |
255 | - _ZN6Lomiri15DownloadManager12NetworkErrorD0Ev@Base 0.1.0 |
256 | - _ZN6Lomiri15DownloadManager12NetworkErrorD1Ev@Base 0.1.0 |
257 | - _ZN6Lomiri15DownloadManager12NetworkErrorD2Ev@Base 0.1.0 |
258 | - _ZN6Lomiri15DownloadManager12ProcessError11errorStringEv@Base 0.1.0 |
259 | - _ZN6Lomiri15DownloadManager12ProcessError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
260 | - _ZN6Lomiri15DownloadManager12ProcessError11qt_metacastEPKc@Base 0.1.0 |
261 | - _ZN6Lomiri15DownloadManager12ProcessError11standardOutEv@Base 0.1.0 |
262 | - _ZN6Lomiri15DownloadManager12ProcessError13standardErrorEv@Base 0.1.0 |
263 | - _ZN6Lomiri15DownloadManager12ProcessError16staticMetaObjectE@Base 0.1.0 |
264 | - _ZN6Lomiri15DownloadManager12ProcessError4codeEv@Base 0.1.0 |
265 | - _ZN6Lomiri15DownloadManager12ProcessError6phraseEv@Base 0.1.0 |
266 | - _ZN6Lomiri15DownloadManager12ProcessError8exitCodeEv@Base 0.1.0 |
267 | - _ZN6Lomiri15DownloadManager12ProcessErrorC1ENS_9Transfers6Errors18ProcessErrorStructEP7QObject@Base 0.1.0 |
268 | - _ZN6Lomiri15DownloadManager12ProcessErrorC2ENS_9Transfers6Errors18ProcessErrorStructEP7QObject@Base 0.1.0 |
269 | - _ZN6Lomiri15DownloadManager12ProcessErrorD0Ev@Base 0.1.0 |
270 | - _ZN6Lomiri15DownloadManager12ProcessErrorD1Ev@Base 0.1.0 |
271 | - _ZN6Lomiri15DownloadManager12ProcessErrorD2Ev@Base 0.1.0 |
272 | - _ZN6Lomiri15DownloadManager13DownloadsList11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
273 | - _ZN6Lomiri15DownloadManager13DownloadsList11qt_metacastEPKc@Base 0.1.0 |
274 | - _ZN6Lomiri15DownloadManager13DownloadsList16staticMetaObjectE@Base 0.1.0 |
275 | - _ZN6Lomiri15DownloadManager13GroupDownload11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
276 | - _ZN6Lomiri15DownloadManager13GroupDownload11qt_metacastEPKc@Base 0.1.0 |
277 | - _ZN6Lomiri15DownloadManager13GroupDownload16staticMetaObjectE@Base 0.1.0 |
278 | - _ZN6Lomiri15DownloadManager13GroupDownload5errorEv@Base 0.1.0 |
279 | - _ZN6Lomiri15DownloadManager13GroupDownload7isErrorEv@Base 0.1.0 |
280 | - _ZN6Lomiri15DownloadManager13GroupDownloadC1E15QDBusObjectPathP7QObject@Base 0.1.0 |
281 | - _ZN6Lomiri15DownloadManager13GroupDownloadC1EPNS0_5ErrorEP7QObject@Base 0.1.0 |
282 | - _ZN6Lomiri15DownloadManager13GroupDownloadC2E15QDBusObjectPathP7QObject@Base 0.1.0 |
283 | - _ZN6Lomiri15DownloadManager13GroupDownloadC2EPNS0_5ErrorEP7QObject@Base 0.1.0 |
284 | - _ZN6Lomiri15DownloadManager13GroupDownloadD0Ev@Base 0.1.0 |
285 | - _ZN6Lomiri15DownloadManager13GroupDownloadD1Ev@Base 0.1.0 |
286 | - _ZN6Lomiri15DownloadManager13GroupDownloadD2Ev@Base 0.1.0 |
287 | - _ZN6Lomiri15DownloadManager5Error11errorStringEv@Base 0.1.0 |
288 | - _ZN6Lomiri15DownloadManager5Error11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
289 | - _ZN6Lomiri15DownloadManager5Error11qt_metacastEPKc@Base 0.1.0 |
290 | - _ZN6Lomiri15DownloadManager5Error16staticMetaObjectE@Base 0.1.0 |
291 | - _ZN6Lomiri15DownloadManager5Error4typeEv@Base 0.1.0 |
292 | - _ZN6Lomiri15DownloadManager5ErrorC1ENS1_4TypeEP7QObject@Base 0.1.0 |
293 | - _ZN6Lomiri15DownloadManager5ErrorC2ENS1_4TypeEP7QObject@Base 0.1.0 |
294 | - _ZN6Lomiri15DownloadManager5ErrorD0Ev@Base 0.1.0 |
295 | - _ZN6Lomiri15DownloadManager5ErrorD1Ev@Base 0.1.0 |
296 | - _ZN6Lomiri15DownloadManager5ErrorD2Ev@Base 0.1.0 |
297 | - _ZN6Lomiri15DownloadManager7Logging6Logger4initENS2_5LevelERK7QString@Base 0.1.0 |
298 | - _ZN6Lomiri15DownloadManager7Manager11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
299 | - _ZN6Lomiri15DownloadManager7Manager11qt_metacastEPKc@Base 0.1.0 |
300 | - _ZN6Lomiri15DownloadManager7Manager12groupCreatedEPNS0_13GroupDownloadE@Base 0.1.0 |
301 | - _ZN6Lomiri15DownloadManager7Manager14downloadsFoundEPNS0_13DownloadsListE@Base 0.1.0 |
302 | - _ZN6Lomiri15DownloadManager7Manager15downloadCreatedEPNS0_8DownloadE@Base 0.1.0 |
303 | - _ZN6Lomiri15DownloadManager7Manager16staticMetaObjectE@Base 0.1.0 |
304 | - _ZN6Lomiri15DownloadManager7Manager19createSystemManagerERK7QStringP7QObject@Base 0.1.0 |
305 | - _ZN6Lomiri15DownloadManager7Manager20createSessionManagerERK7QStringP7QObject@Base 0.1.0 |
306 | - _ZN6Lomiri15DownloadManager7Manager26downloadsWithMetadataFoundERK7QStringS4_PNS0_13DownloadsListE@Base 0.1.0 |
307 | - _ZN6Lomiri15DownloadManager8Download10processingERK7QString@Base 0.1.0 |
308 | - _ZN6Lomiri15DownloadManager8Download11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
309 | - _ZN6Lomiri15DownloadManager8Download11qt_metacastEPKc@Base 0.1.0 |
310 | - _ZN6Lomiri15DownloadManager8Download12titleChangedEv@Base 0.1.0 |
311 | - _ZN6Lomiri15DownloadManager8Download16staticMetaObjectE@Base 0.1.0 |
312 | - _ZN6Lomiri15DownloadManager8Download20clickPackagedChangedEv@Base 0.1.0 |
313 | - _ZN6Lomiri15DownloadManager8Download21destinationAppChangedEv@Base 0.1.0 |
314 | - _ZN6Lomiri15DownloadManager8Download22showInIndicatorChangedEv@Base 0.1.0 |
315 | - _ZN6Lomiri15DownloadManager8Download5errorEPNS0_5ErrorE@Base 0.1.0 |
316 | - _ZN6Lomiri15DownloadManager8Download6pausedEb@Base 0.1.0 |
317 | - _ZN6Lomiri15DownloadManager8Download7resumedEb@Base 0.1.0 |
318 | - _ZN6Lomiri15DownloadManager8Download7startedEb@Base 0.1.0 |
319 | - _ZN6Lomiri15DownloadManager8Download8canceledEb@Base 0.1.0 |
320 | - _ZN6Lomiri15DownloadManager8Download8finishedERK7QString@Base 0.1.0 |
321 | - _ZN6Lomiri15DownloadManager8Download8progressEyy@Base 0.1.0 |
322 | - _ZN6Lomiri15DownloadManager9AuthError11errorStringEv@Base 0.1.0 |
323 | - _ZN6Lomiri15DownloadManager9AuthError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
324 | - _ZN6Lomiri15DownloadManager9AuthError11qt_metacastEPKc@Base 0.1.0 |
325 | - _ZN6Lomiri15DownloadManager9AuthError16staticMetaObjectE@Base 0.1.0 |
326 | - _ZN6Lomiri15DownloadManager9AuthError4typeEv@Base 0.1.0 |
327 | - _ZN6Lomiri15DownloadManager9AuthError6phraseEv@Base 0.1.0 |
328 | - _ZN6Lomiri15DownloadManager9AuthErrorC1ENS_9Transfers6Errors15AuthErrorStructEP7QObject@Base 0.1.0 |
329 | - _ZN6Lomiri15DownloadManager9AuthErrorC2ENS_9Transfers6Errors15AuthErrorStructEP7QObject@Base 0.1.0 |
330 | - _ZN6Lomiri15DownloadManager9AuthErrorD0Ev@Base 0.1.0 |
331 | - _ZN6Lomiri15DownloadManager9AuthErrorD1Ev@Base 0.1.0 |
332 | - _ZN6Lomiri15DownloadManager9AuthErrorD2Ev@Base 0.1.0 |
333 | - _ZN6Lomiri15DownloadManager9DBusError11errorStringEv@Base 0.1.0 |
334 | - _ZN6Lomiri15DownloadManager9DBusError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
335 | - _ZN6Lomiri15DownloadManager9DBusError11qt_metacastEPKc@Base 0.1.0 |
336 | - _ZN6Lomiri15DownloadManager9DBusError16staticMetaObjectE@Base 0.1.0 |
337 | - _ZN6Lomiri15DownloadManager9DBusError4nameEv@Base 0.1.0 |
338 | - _ZN6Lomiri15DownloadManager9DBusError7messageEv@Base 0.1.0 |
339 | - _ZN6Lomiri15DownloadManager9DBusErrorC1E10QDBusErrorP7QObject@Base 0.1.0 |
340 | - _ZN6Lomiri15DownloadManager9DBusErrorC2E10QDBusErrorP7QObject@Base 0.1.0 |
341 | - _ZN6Lomiri15DownloadManager9DBusErrorD0Ev@Base 0.1.0 |
342 | - _ZN6Lomiri15DownloadManager9DBusErrorD1Ev@Base 0.1.0 |
343 | - _ZN6Lomiri15DownloadManager9DBusErrorD2Ev@Base 0.1.0 |
344 | - _ZN6Lomiri15DownloadManager9HashError11errorStringEv@Base 0.1.0 |
345 | - _ZN6Lomiri15DownloadManager9HashError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
346 | - _ZN6Lomiri15DownloadManager9HashError11qt_metacastEPKc@Base 0.1.0 |
347 | - _ZN6Lomiri15DownloadManager9HashError16staticMetaObjectE@Base 0.1.0 |
348 | - _ZN6Lomiri15DownloadManager9HashError6methodEv@Base 0.1.0 |
349 | - _ZN6Lomiri15DownloadManager9HashError8checksumEv@Base 0.1.0 |
350 | - _ZN6Lomiri15DownloadManager9HashError8expectedEv@Base 0.1.0 |
351 | - _ZN6Lomiri15DownloadManager9HashErrorC1ENS_9Transfers6Errors15HashErrorStructEP7QObject@Base 0.1.0 |
352 | - _ZN6Lomiri15DownloadManager9HashErrorC2ENS_9Transfers6Errors15HashErrorStructEP7QObject@Base 0.1.0 |
353 | - _ZN6Lomiri15DownloadManager9HashErrorD0Ev@Base 0.1.0 |
354 | - _ZN6Lomiri15DownloadManager9HashErrorD1Ev@Base 0.1.0 |
355 | - _ZN6Lomiri15DownloadManager9HashErrorD2Ev@Base 0.1.0 |
356 | - _ZN6Lomiri15DownloadManager9HttpError11errorStringEv@Base 0.1.0 |
357 | - _ZN6Lomiri15DownloadManager9HttpError11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1.0 |
358 | - _ZN6Lomiri15DownloadManager9HttpError11qt_metacastEPKc@Base 0.1.0 |
359 | - _ZN6Lomiri15DownloadManager9HttpError16staticMetaObjectE@Base 0.1.0 |
360 | - _ZN6Lomiri15DownloadManager9HttpError4codeEv@Base 0.1.0 |
361 | - _ZN6Lomiri15DownloadManager9HttpError6phraseEv@Base 0.1.0 |
362 | - _ZN6Lomiri15DownloadManager9HttpErrorC1ENS_9Transfers6Errors15HttpErrorStructEP7QObject@Base 0.1.0 |
363 | - _ZN6Lomiri15DownloadManager9HttpErrorC2ENS_9Transfers6Errors15HttpErrorStructEP7QObject@Base 0.1.0 |
364 | - _ZN6Lomiri15DownloadManager9HttpErrorD0Ev@Base 0.1.0 |
365 | - _ZN6Lomiri15DownloadManager9HttpErrorD1Ev@Base 0.1.0 |
366 | - _ZN6Lomiri15DownloadManager9HttpErrorD2Ev@Base 0.1.0 |
367 | - _ZNK6Lomiri15DownloadManager12NetworkError10metaObjectEv@Base 0.1.0 |
368 | - _ZNK6Lomiri15DownloadManager12ProcessError10metaObjectEv@Base 0.1.0 |
369 | - _ZNK6Lomiri15DownloadManager13DownloadsList10metaObjectEv@Base 0.1.0 |
370 | - _ZNK6Lomiri15DownloadManager13GroupDownload10metaObjectEv@Base 0.1.0 |
371 | - _ZNK6Lomiri15DownloadManager5Error10metaObjectEv@Base 0.1.0 |
372 | - _ZNK6Lomiri15DownloadManager7Manager10metaObjectEv@Base 0.1.0 |
373 | - _ZNK6Lomiri15DownloadManager8Download10metaObjectEv@Base 0.1.0 |
374 | - _ZNK6Lomiri15DownloadManager9AuthError10metaObjectEv@Base 0.1.0 |
375 | - _ZNK6Lomiri15DownloadManager9DBusError10metaObjectEv@Base 0.1.0 |
376 | - _ZNK6Lomiri15DownloadManager9HashError10metaObjectEv@Base 0.1.0 |
377 | - _ZNK6Lomiri15DownloadManager9HttpError10metaObjectEv@Base 0.1.0 |
378 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager13DownloadsListEEEC1ERKS5_@Base 0.1.0 |
379 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager13DownloadsListEEEC2ERKS5_@Base 0.1.0 |
380 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager13GroupDownloadEEEC1ERKS5_@Base 0.1.0 |
381 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager13GroupDownloadEEEC2ERKS5_@Base 0.1.0 |
382 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager8DownloadEEEC1ERKS5_@Base 0.1.0 |
383 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvPN6Lomiri15DownloadManager8DownloadEEEC2ERKS5_@Base 0.1.0 |
384 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvRK7QStringS2_PN6Lomiri15DownloadManager13DownloadsListEEEC1ERKS8_@Base 0.1.0 |
385 | -#MISSING: 0.1.0# (optional=templinst|arch=amd64)_ZNSt8functionIFvRK7QStringS2_PN6Lomiri15DownloadManager13DownloadsListEEEC2ERKS8_@Base 0.1.0 |
386 | - _ZTIN6Lomiri15DownloadManager12NetworkErrorE@Base 0.1.0 |
387 | - _ZTIN6Lomiri15DownloadManager12ProcessErrorE@Base 0.1.0 |
388 | - _ZTIN6Lomiri15DownloadManager13DownloadsListE@Base 0.1.0 |
389 | - _ZTIN6Lomiri15DownloadManager13GroupDownloadE@Base 0.1.0 |
390 | - _ZTIN6Lomiri15DownloadManager5ErrorE@Base 0.1.0 |
391 | - _ZTIN6Lomiri15DownloadManager7ManagerE@Base 0.1.0 |
392 | - _ZTIN6Lomiri15DownloadManager8DownloadE@Base 0.1.0 |
393 | - _ZTIN6Lomiri15DownloadManager9AuthErrorE@Base 0.1.0 |
394 | - _ZTIN6Lomiri15DownloadManager9DBusErrorE@Base 0.1.0 |
395 | - _ZTIN6Lomiri15DownloadManager9HashErrorE@Base 0.1.0 |
396 | - _ZTIN6Lomiri15DownloadManager9HttpErrorE@Base 0.1.0 |
397 | - _ZTSN6Lomiri15DownloadManager12NetworkErrorE@Base 0.1.0 |
398 | - _ZTSN6Lomiri15DownloadManager12ProcessErrorE@Base 0.1.0 |
399 | - _ZTSN6Lomiri15DownloadManager13DownloadsListE@Base 0.1.0 |
400 | - _ZTSN6Lomiri15DownloadManager13GroupDownloadE@Base 0.1.0 |
401 | - _ZTSN6Lomiri15DownloadManager5ErrorE@Base 0.1.0 |
402 | - _ZTSN6Lomiri15DownloadManager7ManagerE@Base 0.1.0 |
403 | - _ZTSN6Lomiri15DownloadManager8DownloadE@Base 0.1.0 |
404 | - _ZTSN6Lomiri15DownloadManager9AuthErrorE@Base 0.1.0 |
405 | - _ZTSN6Lomiri15DownloadManager9DBusErrorE@Base 0.1.0 |
406 | - _ZTSN6Lomiri15DownloadManager9HashErrorE@Base 0.1.0 |
407 | - _ZTSN6Lomiri15DownloadManager9HttpErrorE@Base 0.1.0 |
408 | - _ZTVN6Lomiri15DownloadManager12NetworkErrorE@Base 0.1.0 |
409 | - _ZTVN6Lomiri15DownloadManager12ProcessErrorE@Base 0.1.0 |
410 | - _ZTVN6Lomiri15DownloadManager13DownloadsListE@Base 0.1.0 |
411 | - _ZTVN6Lomiri15DownloadManager13GroupDownloadE@Base 0.1.0 |
412 | - _ZTVN6Lomiri15DownloadManager5ErrorE@Base 0.1.0 |
413 | - _ZTVN6Lomiri15DownloadManager7ManagerE@Base 0.1.0 |
414 | - _ZTVN6Lomiri15DownloadManager8DownloadE@Base 0.1.0 |
415 | - _ZTVN6Lomiri15DownloadManager9AuthErrorE@Base 0.1.0 |
416 | - _ZTVN6Lomiri15DownloadManager9DBusErrorE@Base 0.1.0 |
417 | - _ZTVN6Lomiri15DownloadManager9HashErrorE@Base 0.1.0 |
418 | - _ZTVN6Lomiri15DownloadManager9HttpErrorE@Base 0.1.0 |
419 | diff --git a/debian/liblomiri-download-manager-common0.symbols b/debian/liblomiri-download-manager-common0.symbols |
420 | deleted file mode 100644 |
421 | index 0789955..0000000 |
422 | --- a/debian/liblomiri-download-manager-common0.symbols |
423 | +++ /dev/null |
424 | @@ -1,55 +0,0 @@ |
425 | -# SymbolsHelper-Confirmed: 0.1.0 amd64 armel armhf powerpc |
426 | -liblomiri-download-manager-common.so.0 liblomiri-download-manager-common0 #MINVER# |
427 | -* Build-Depends-Package: liblomiri-download-manager-common-dev |
428 | - _ZN6Lomiri15DownloadManager14DownloadStruct10getHeadersEv@Base 0.1.0 |
429 | - _ZN6Lomiri15DownloadManager14DownloadStruct11getMetadataEv@Base 0.1.0 |
430 | - _ZN6Lomiri15DownloadManager14DownloadStruct12getAlgorithmEv@Base 0.1.0 |
431 | - _ZN6Lomiri15DownloadManager14DownloadStruct6getUrlEv@Base 0.1.0 |
432 | - _ZN6Lomiri15DownloadManager14DownloadStruct7getHashEv@Base 0.1.0 |
433 | - _ZN6Lomiri15DownloadManager14DownloadStructC1ERK7QString@Base 0.1.0 |
434 | - _ZN6Lomiri15DownloadManager14DownloadStructC1ERK7QStringRK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
435 | - _ZN6Lomiri15DownloadManager14DownloadStructC1ERK7QStringS4_S4_RK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
436 | - _ZN6Lomiri15DownloadManager14DownloadStructC1ERKS1_@Base 0.1.0 |
437 | - _ZN6Lomiri15DownloadManager14DownloadStructC1Ev@Base 0.1.0 |
438 | - _ZN6Lomiri15DownloadManager14DownloadStructC2ERK7QString@Base 0.1.0 |
439 | - _ZN6Lomiri15DownloadManager14DownloadStructC2ERK7QStringRK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
440 | - _ZN6Lomiri15DownloadManager14DownloadStructC2ERK7QStringS4_S4_RK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
441 | - _ZN6Lomiri15DownloadManager14DownloadStructC2ERKS1_@Base 0.1.0 |
442 | - _ZN6Lomiri15DownloadManager14DownloadStructC2Ev@Base 0.1.0 |
443 | - _ZN6Lomiri15DownloadManager14DownloadStructaSERKS1_@Base 0.1.0 |
444 | - _ZN6Lomiri15DownloadManager19DownloadStateStruct7isValidEv@Base 0.1.0 |
445 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC1ERKS1_@Base 0.1.0 |
446 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC1EiRK7QStringS4_@Base 0.1.0 |
447 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC1EiRK7QStringS4_S4_@Base 0.1.0 |
448 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC1EiRK7QStringS4_S4_RK4QMapIS2_8QVariantE@Base 0.1.0 |
449 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC1Ev@Base 0.1.0 |
450 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC2ERKS1_@Base 0.1.0 |
451 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC2EiRK7QStringS4_@Base 0.1.0 |
452 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC2EiRK7QStringS4_S4_@Base 0.1.0 |
453 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC2EiRK7QStringS4_S4_RK4QMapIS2_8QVariantE@Base 0.1.0 |
454 | - _ZN6Lomiri15DownloadManager19DownloadStateStructC2Ev@Base 0.1.0 |
455 | - _ZN6Lomiri15DownloadManager19DownloadStateStructaSERKS1_@Base 0.1.0 |
456 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC1ERK7QStringS4_S4_@Base 0.1.0 |
457 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC1ERKS1_@Base 0.1.0 |
458 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC1Ev@Base 0.1.0 |
459 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC2ERK7QStringS4_S4_@Base 0.1.0 |
460 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC2ERKS1_@Base 0.1.0 |
461 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructC2Ev@Base 0.1.0 |
462 | - (optional)_ZN6Lomiri15DownloadManager19GroupDownloadStructD1Ev@Base 0.1.1-1 |
463 | - (optional)_ZN6Lomiri15DownloadManager19GroupDownloadStructD2Ev@Base 0.1.1-1 |
464 | - _ZN6Lomiri15DownloadManager19GroupDownloadStructaSERKS1_@Base 0.1.0 |
465 | - _ZN6Lomiri15DownloadManagerlsER13QDBusArgumentRKNS0_14DownloadStructE@Base 0.1.0 |
466 | - _ZN6Lomiri15DownloadManagerlsER13QDBusArgumentRKNS0_19DownloadStateStructE@Base 0.1.0 |
467 | - _ZN6Lomiri15DownloadManagerlsER13QDBusArgumentRKNS0_19GroupDownloadStructE@Base 0.1.0 |
468 | - _ZN6Lomiri15DownloadManagerrsERK13QDBusArgumentRNS0_14DownloadStructE@Base 0.1.0 |
469 | - _ZN6Lomiri15DownloadManagerrsERK13QDBusArgumentRNS0_19DownloadStateStructE@Base 0.1.0 |
470 | - _ZN6Lomiri15DownloadManagerrsERK13QDBusArgumentRNS0_19GroupDownloadStructE@Base 0.1.0 |
471 | - _ZNK6Lomiri15DownloadManager19DownloadStateStruct11getFilePathEv@Base 0.1.0 |
472 | - _ZNK6Lomiri15DownloadManager19DownloadStateStruct11getMetadataEv@Base 0.1.0 |
473 | - _ZNK6Lomiri15DownloadManager19DownloadStateStruct6getUrlEv@Base 0.1.0 |
474 | - _ZNK6Lomiri15DownloadManager19DownloadStateStruct7getHashEv@Base 0.1.0 |
475 | - _ZNK6Lomiri15DownloadManager19DownloadStateStruct8getStateEv@Base 0.1.0 |
476 | - _ZNK6Lomiri15DownloadManager19GroupDownloadStruct12getLocalFileEv@Base 0.1.0 |
477 | - _ZNK6Lomiri15DownloadManager19GroupDownloadStruct6getUrlEv@Base 0.1.0 |
478 | - _ZNK6Lomiri15DownloadManager19GroupDownloadStruct7getHashEv@Base 0.1.0 |
479 | - _ZlsRSo5QListIN6Lomiri15DownloadManager19GroupDownloadStructEE@Base 0.1.0 |
480 | diff --git a/debian/liblomiri-upload-manager-common0.symbols b/debian/liblomiri-upload-manager-common0.symbols |
481 | deleted file mode 100644 |
482 | index 814970b..0000000 |
483 | --- a/debian/liblomiri-upload-manager-common0.symbols |
484 | +++ /dev/null |
485 | @@ -1,18 +0,0 @@ |
486 | -# SymbolsHelper-Confirmed: 0.1.0 amd64 |
487 | -liblomiri-upload-manager-common.so.0 liblomiri-upload-manager-common0 #MINVER# |
488 | -*Build-Depends-Package: liblomiri-upload-manager-common-dev |
489 | - _ZN6Lomiri13UploadManager12UploadStruct10getHeadersEv@Base 0.1.0 |
490 | - _ZN6Lomiri13UploadManager12UploadStruct11getFilePathEv@Base 0.1.0 |
491 | - _ZN6Lomiri13UploadManager12UploadStruct11getMetadataEv@Base 0.1.0 |
492 | - _ZN6Lomiri13UploadManager12UploadStruct6getUrlEv@Base 0.1.0 |
493 | - _ZN6Lomiri13UploadManager12UploadStructC1ERK7QStringS4_@Base 0.1.0 |
494 | - _ZN6Lomiri13UploadManager12UploadStructC1ERK7QStringS4_RK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
495 | - _ZN6Lomiri13UploadManager12UploadStructC1ERKS1_@Base 0.1.0 |
496 | - _ZN6Lomiri13UploadManager12UploadStructC1Ev@Base 0.1.0 |
497 | - _ZN6Lomiri13UploadManager12UploadStructC2ERK7QStringS4_@Base 0.1.0 |
498 | - _ZN6Lomiri13UploadManager12UploadStructC2ERK7QStringS4_RK4QMapIS2_8QVariantERKS5_IS2_S2_E@Base 0.1.0 |
499 | - _ZN6Lomiri13UploadManager12UploadStructC2ERKS1_@Base 0.1.0 |
500 | - _ZN6Lomiri13UploadManager12UploadStructC2Ev@Base 0.1.0 |
501 | - _ZN6Lomiri13UploadManager12UploadStructaSERKS1_@Base 0.1.0 |
502 | - _ZN6Lomiri13UploadManagerlsER13QDBusArgumentRKNS0_12UploadStructE@Base 0.1.0 |
503 | - _ZN6Lomiri13UploadManagerrsERK13QDBusArgumentRNS0_12UploadStructE@Base 0.1.0 |
504 | diff --git a/debian/patches/1001-drop-deprecated-GetConnectionAppArmorSecurityContext.patch b/debian/patches/1001-drop-deprecated-GetConnectionAppArmorSecurityContext.patch |
505 | new file mode 100644 |
506 | index 0000000..da51073 |
507 | --- /dev/null |
508 | +++ b/debian/patches/1001-drop-deprecated-GetConnectionAppArmorSecurityContext.patch |
509 | @@ -0,0 +1,387 @@ |
510 | +Description: Drop deprecated calls to GetConnectionAppArmorSecurityContext |
511 | + Around 10 years ago, we introduced GetConnectionAppArmorSecurityContext() in |
512 | + DBus in Ubuntu. Upstream pushed back and instead exposed the AppArmor's |
513 | + context in org.freedesktop.DBus.GetConnectionCredentials(). |
514 | + So far, we have maintained GetconnectionAppArmorSecurityContext() as a delta |
515 | + in Ubuntu so that existing software do not break. |
516 | + However, the recommended way (and the only portable way) is to use |
517 | + GetConnectionCredentials() instead. Furthermore, it is about time we drop |
518 | + support for the former in Ubuntu. |
519 | + . |
520 | + The patch is inspired from 4c4d7961261b41ac41f24c8ce75563ab12f6b74c from the |
521 | + https://gitlab.com/ubports/development/core/lomiri-thumbnailer/ repository. |
522 | +Author: Olivier Gayot <olivier.gayot@canonical.com> |
523 | +Bug-Ubuntu: https://launchpad.net/bugs/1489489 |
524 | +Bug-Debian: https://bugs.debian.org/1057467 |
525 | +Forwarded: https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/24 |
526 | +Last-Update: 2023-12-05 |
527 | +--- |
528 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
529 | +--- a/src/common/priv/lomiri/transfers/system/apparmor.cpp |
530 | ++++ b/src/common/priv/lomiri/transfers/system/apparmor.cpp |
531 | +@@ -19,6 +19,7 @@ |
532 | + #include <errno.h> |
533 | + #include <lomiri/util/Dbus.h> |
534 | + #include <lomiri/util/SnapPath.h> |
535 | ++#include <assert.h> |
536 | + #include <sys/types.h> |
537 | + #include <unistd.h> |
538 | + #include <QDBusConnection> |
539 | +@@ -37,6 +38,8 @@ |
540 | + namespace System { |
541 | + |
542 | + QString AppArmor::UNCONFINED_ID = "unconfined"; |
543 | ++QString AppArmor::LINUX_SECURITY_LABEL = "LinuxSecurityLabel"; |
544 | ++ |
545 | + |
546 | + AppArmor::AppArmor(DBusConnection* connection, |
547 | + QObject* parent) |
548 | +@@ -68,15 +71,38 @@ |
549 | + } |
550 | + |
551 | + QString |
552 | ++AppArmor::labelFromCredentials(const QVariantMap &map) |
553 | ++{ |
554 | ++ // The contents of this map are described in the specification here: |
555 | ++ // http://dbus.freedesktop.org/doc/dbus-specification.html#bus-messages-get-connection-credentials |
556 | ++ QByteArray label = map.value(LINUX_SECURITY_LABEL).value<QByteArray>(); |
557 | ++ |
558 | ++ if (label.size() == 0) { |
559 | ++ return ""; |
560 | ++ } |
561 | ++ |
562 | ++ // The label is null terminated. |
563 | ++ assert(label[label.size()-1] == '\0'); |
564 | ++ label.truncate(label.size() - 1); |
565 | ++ // Trim the mode off the end of the label. |
566 | ++ int pos = label.lastIndexOf(' '); |
567 | ++ if (pos > 0 && label.endsWith(')') && label[pos+1] == '(') |
568 | ++ { |
569 | ++ label.truncate(pos); // LCOV_EXCL_LINE |
570 | ++ } |
571 | ++ return QString::fromUtf8(label.constData(), label.size()); |
572 | ++} |
573 | ++ |
574 | ++QString |
575 | + AppArmor::appId(QString caller) { |
576 | +- QScopedPointer<PendingReply<QString> > reply( |
577 | +- _dbus->GetConnectionAppArmorSecurityContext(caller)); |
578 | ++ QScopedPointer<PendingReply<QVariantMap> > reply( |
579 | ++ _dbus->GetConnectionCredentials(caller)); |
580 | + // blocking but should be ok for now |
581 | + reply->waitForFinished(); |
582 | + if (reply->isError()) { |
583 | + return ""; |
584 | + } |
585 | +- return reply->value(); |
586 | ++ return labelFromCredentials(reply->value()); |
587 | + } |
588 | + |
589 | + bool |
590 | +@@ -97,8 +123,8 @@ |
591 | + return; |
592 | + } |
593 | + |
594 | +- QScopedPointer<PendingReply<QString> > reply ( |
595 | +- _dbus->GetConnectionAppArmorSecurityContext(connName)); |
596 | ++ QScopedPointer<PendingReply<QVariantMap> > reply( |
597 | ++ _dbus->GetConnectionCredentials(connName)); |
598 | + // blocking but should be ok for now |
599 | + reply->waitForFinished(); |
600 | + if (reply->isError()) { |
601 | +@@ -109,7 +135,7 @@ |
602 | + return; |
603 | + } else { |
604 | + // use the returned value |
605 | +- details->appId = reply->value(); |
606 | ++ details->appId = labelFromCredentials(reply->value()); |
607 | + |
608 | + if (details->appId.isEmpty() || details->appId == UNCONFINED_ID) { |
609 | + LOG(INFO) << "UNCONFINED APP"; |
610 | +--- a/src/common/priv/lomiri/transfers/system/apparmor.h |
611 | ++++ b/src/common/priv/lomiri/transfers/system/apparmor.h |
612 | +@@ -60,11 +60,13 @@ |
613 | + virtual bool isConfined(QString appId); |
614 | + |
615 | + static QString UNCONFINED_ID; |
616 | ++ static QString LINUX_SECURITY_LABEL; |
617 | + |
618 | + private: |
619 | + void getSecurityDetails(const QString& connName, |
620 | + SecurityDetails* details); |
621 | + QString getLocalPath(const QString& appId); |
622 | ++ QString labelFromCredentials(const QVariantMap &map); |
623 | + |
624 | + private: |
625 | + const char* BASE_ACCOUNT_URL = "/com/lomiri/applications/%1"; |
626 | +--- a/src/common/priv/lomiri/transfers/system/dbus_proxy.h |
627 | ++++ b/src/common/priv/lomiri/transfers/system/dbus_proxy.h |
628 | +@@ -54,14 +54,14 @@ |
629 | + return asyncCallWithArgumentList(QLatin1String("GetAdtAuditSessionData"), argumentList); |
630 | + } |
631 | + |
632 | +- virtual PendingReply<QString>* GetConnectionAppArmorSecurityContext(const QString &in0) |
633 | ++ virtual PendingReply<QVariantMap>* GetConnectionCredentials(const QString &in0) |
634 | + { |
635 | + QList<QVariant> argumentList; |
636 | + argumentList << QVariant::fromValue(in0); |
637 | +- QDBusPendingReply<QString> reply = asyncCallWithArgumentList( |
638 | +- QLatin1String("GetConnectionAppArmorSecurityContext"), |
639 | +- argumentList); |
640 | +- auto wrapper = new PendingReply<QString>(reply); |
641 | ++ QDBusPendingReply<QVariantMap> reply = asyncCallWithArgumentList( |
642 | ++ QLatin1String("GetConnectionCredentials"), |
643 | ++ argumentList); |
644 | ++ auto wrapper = new PendingReply<QVariantMap>(reply); |
645 | + return wrapper; |
646 | + } |
647 | + |
648 | +--- a/src/common/priv/lomiri/transfers/system/org.freedesktop.DBus.xml |
649 | ++++ b/src/common/priv/lomiri/transfers/system/org.freedesktop.DBus.xml |
650 | +@@ -63,9 +63,9 @@ |
651 | + <arg direction="in" type="s"/> |
652 | + <arg direction="out" type="ay"/> |
653 | + </method> |
654 | +- <method name="GetConnectionAppArmorSecurityContext"> |
655 | ++ <method name="GetConnectionCredentials"> |
656 | + <arg direction="in" type="s"/> |
657 | +- <arg direction="out" type="s"/> |
658 | ++ <arg direction="out" type="a{sv}"/> |
659 | + </method> |
660 | + <method name="ReloadConfig"> |
661 | + </method> |
662 | +--- a/tests/downloads/daemon/dbus_proxy.h |
663 | ++++ b/tests/downloads/daemon/dbus_proxy.h |
664 | +@@ -37,8 +37,8 @@ |
665 | + MOCK_METHOD1(AddMatch, QDBusPendingReply<>(const QString&)); |
666 | + MOCK_METHOD1(GetAdtAuditSessionData, |
667 | + QDBusPendingReply<QByteArray>(const QString&)); |
668 | +- MOCK_METHOD1(GetConnectionAppArmorSecurityContext, |
669 | +- PendingReply<QString>*(const QString&)); |
670 | ++ MOCK_METHOD1(GetConnectionCredentials, |
671 | ++ PendingReply<QVariantMap>*(const QString&)); |
672 | + MOCK_METHOD1(GetConnectionSELinuxSecurityContext, |
673 | + QDBusPendingReply<QByteArray>(const QString&)); |
674 | + MOCK_METHOD1(GetConnectionUnixProcessID, |
675 | +--- a/tests/downloads/daemon/test_apparmor.cpp |
676 | ++++ b/tests/downloads/daemon/test_apparmor.cpp |
677 | +@@ -48,13 +48,13 @@ |
678 | + QString caller = "my app"; |
679 | + auto dbusProxy = new MockDBusProxy(); |
680 | + auto conn = new MockDBusConnection(); |
681 | +- auto reply = new MockPendingReply<QString>(); |
682 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
683 | + |
684 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(conn, _)) |
685 | + .Times(1) |
686 | + .WillOnce(Return(dbusProxy)); |
687 | + |
688 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(caller)) |
689 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(caller)) |
690 | + .Times(1) |
691 | + .WillOnce(Return(reply)); |
692 | + |
693 | +@@ -78,15 +78,18 @@ |
694 | + TestAppArmor::testAppId() { |
695 | + QString caller = "my app"; |
696 | + QString expectedAppId = "APPID"; |
697 | ++ QVariantMap credentials = { |
698 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("APPID (enforce)") + '\0'}, |
699 | ++ }; |
700 | + auto dbusProxy = new MockDBusProxy(); |
701 | + auto conn = new MockDBusConnection(); |
702 | +- auto reply = new MockPendingReply<QString>(); |
703 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
704 | + |
705 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(conn, _)) |
706 | + .Times(1) |
707 | + .WillOnce(Return(dbusProxy)); |
708 | + |
709 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(caller)) |
710 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(caller)) |
711 | + .Times(1) |
712 | + .WillOnce(Return(reply)); |
713 | + |
714 | +@@ -99,7 +102,7 @@ |
715 | + |
716 | + EXPECT_CALL(*reply, value()) |
717 | + .Times(1) |
718 | +- .WillOnce(Return(expectedAppId)); |
719 | ++ .WillOnce(Return(credentials)); |
720 | + |
721 | + QScopedPointer<AppArmor> appArmor(new AppArmor(conn)); |
722 | + |
723 | +--- a/tests/downloads/daemon/test_download_manager.cpp |
724 | ++++ b/tests/downloads/daemon/test_download_manager.cpp |
725 | +@@ -145,13 +145,16 @@ |
726 | + SignalBarrier spy(_man, SIGNAL(downloadCreated(QDBusObjectPath))); |
727 | + DownloadStruct downStruct(url, metadata, headers); |
728 | + |
729 | ++ QVariantMap credentials = { |
730 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("unconfined") + '\0'}, |
731 | ++ }; |
732 | + auto dbusProxy = new MockDBusProxy(); |
733 | +- auto reply = new MockPendingReply<QString>(); |
734 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
735 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
736 | + .Times(1) |
737 | + .WillOnce(Return(dbusProxy)); |
738 | + |
739 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
740 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
741 | + .Times(1) |
742 | + .WillOnce(Return(reply)); |
743 | + |
744 | +@@ -164,7 +167,7 @@ |
745 | + |
746 | + EXPECT_CALL(*reply, value()) |
747 | + .Times(1) |
748 | +- .WillOnce(Return("TEST_APP_ID")); |
749 | ++ .WillOnce(Return(credentials)); |
750 | + |
751 | + // set the expectations of the factory since is the one that |
752 | + // creates the downloads. The matchers will ensure that the |
753 | +@@ -277,13 +280,16 @@ |
754 | + .Times(1) |
755 | + .WillRepeatedly(Return(down.data())); |
756 | + |
757 | ++ QVariantMap credentials = { |
758 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("TEST_APP_ID (enforce)") + '\0'}, |
759 | ++ }; |
760 | + auto dbusProxy = new MockDBusProxy(); |
761 | +- auto reply = new MockPendingReply<QString>(); |
762 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
763 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
764 | + .Times(1) |
765 | + .WillOnce(Return(dbusProxy)); |
766 | + |
767 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
768 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
769 | + .Times(1) |
770 | + .WillOnce(Return(reply)); |
771 | + |
772 | +@@ -296,7 +302,7 @@ |
773 | + |
774 | + EXPECT_CALL(*reply, value()) |
775 | + .Times(1) |
776 | +- .WillOnce(Return("TEST_APP_ID")); |
777 | ++ .WillOnce(Return(credentials)); |
778 | + |
779 | + // expected actions to be performed on the download |
780 | + EXPECT_CALL(*down.data(), setThrottle(_man->defaultThrottle())) |
781 | +@@ -508,14 +514,17 @@ |
782 | + void |
783 | + TestDownloadManager::testGetAllDownloadsUnconfined() { |
784 | + QString expectedAppId = "unconfined"; |
785 | ++ QVariantMap credentials = { |
786 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("unconfined") + '\0'}, |
787 | ++ }; |
788 | + auto dbusProxy = new MockDBusProxy(); |
789 | +- auto reply = new MockPendingReply<QString>(); |
790 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
791 | + |
792 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
793 | + .Times(1) |
794 | + .WillOnce(Return(dbusProxy)); |
795 | + |
796 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
797 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
798 | + .Times(1) |
799 | + .WillOnce(Return(reply)); |
800 | + |
801 | +@@ -528,7 +537,7 @@ |
802 | + |
803 | + EXPECT_CALL(*reply, value()) |
804 | + .Times(1) |
805 | +- .WillOnce(Return(expectedAppId)); |
806 | ++ .WillOnce(Return(credentials)); |
807 | + |
808 | + QStringList expectedPaths; |
809 | + expectedPaths.append("/first/path/object"); |
810 | +@@ -552,14 +561,17 @@ |
811 | + void |
812 | + TestDownloadManager::testGetAllDownloadsConfined() { |
813 | + QString expectedAppId = "APPID"; |
814 | ++ QVariantMap credentials = { |
815 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("APPID (enforce)") + '\0'}, |
816 | ++ }; |
817 | + auto dbusProxy = new MockDBusProxy(); |
818 | +- auto reply = new MockPendingReply<QString>(); |
819 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
820 | + |
821 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
822 | + .Times(1) |
823 | + .WillOnce(Return(dbusProxy)); |
824 | + |
825 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
826 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
827 | + .Times(1) |
828 | + .WillOnce(Return(reply)); |
829 | + |
830 | +@@ -572,7 +584,7 @@ |
831 | + |
832 | + EXPECT_CALL(*reply, value()) |
833 | + .Times(1) |
834 | +- .WillOnce(Return(expectedAppId)); |
835 | ++ .WillOnce(Return(credentials)); |
836 | + |
837 | + // create several downloads with diff app ids to check that we |
838 | + // do getonly those with the correct app id |
839 | +@@ -621,14 +633,17 @@ |
840 | + void |
841 | + TestDownloadManager::testAllDownloadsWithMetadataUnconfined() { |
842 | + QString expectedAppId = "unconfined"; |
843 | ++ QVariantMap credentials = { |
844 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("unconfined") + '\0'}, |
845 | ++ }; |
846 | + auto dbusProxy = new MockDBusProxy(); |
847 | +- auto reply = new MockPendingReply<QString>(); |
848 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
849 | + |
850 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
851 | + .Times(1) |
852 | + .WillOnce(Return(dbusProxy)); |
853 | + |
854 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
855 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
856 | + .Times(1) |
857 | + .WillOnce(Return(reply)); |
858 | + |
859 | +@@ -641,7 +656,7 @@ |
860 | + |
861 | + EXPECT_CALL(*reply, value()) |
862 | + .Times(1) |
863 | +- .WillOnce(Return(expectedAppId)); |
864 | ++ .WillOnce(Return(credentials)); |
865 | + |
866 | + // create downloads to be used to filter |
867 | + auto key = QString("filter"); |
868 | +@@ -700,14 +715,17 @@ |
869 | + void |
870 | + TestDownloadManager::testAllDownloadsWithMetadataConfined() { |
871 | + QString expectedAppId = "APPID"; |
872 | ++ QVariantMap credentials = { |
873 | ++ {AppArmor::LINUX_SECURITY_LABEL, QByteArray("APPID (enforce)") + '\0'}, |
874 | ++ }; |
875 | + auto dbusProxy = new MockDBusProxy(); |
876 | +- auto reply = new MockPendingReply<QString>(); |
877 | ++ auto reply = new MockPendingReply<QVariantMap>(); |
878 | + |
879 | + EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _)) |
880 | + .Times(1) |
881 | + .WillOnce(Return(dbusProxy)); |
882 | + |
883 | +- EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_)) |
884 | ++ EXPECT_CALL(*dbusProxy, GetConnectionCredentials(_)) |
885 | + .Times(1) |
886 | + .WillOnce(Return(reply)); |
887 | + |
888 | +@@ -720,7 +738,7 @@ |
889 | + |
890 | + EXPECT_CALL(*reply, value()) |
891 | + .Times(1) |
892 | +- .WillOnce(Return(expectedAppId)); |
893 | ++ .WillOnce(Return(credentials)); |
894 | + |
895 | + auto key = QString("filter"); |
896 | + auto value = QString("coconut"); |
897 | diff --git a/debian/patches/series b/debian/patches/series |
898 | index f82a722..c475c61 100644 |
899 | --- a/debian/patches/series |
900 | +++ b/debian/patches/series |
901 | @@ -1,2 +1,3 @@ |
902 | 2001_build-without-Werror.patch |
903 | 0001-upgrade-cpp-standard-to-cpp17.patch |
904 | +1001-drop-deprecated-GetConnectionAppArmorSecurityContext.patch |
905 | diff --git a/debian/rules b/debian/rules |
906 | index 753c80c..d884c44 100755 |
907 | --- a/debian/rules |
908 | +++ b/debian/rules |
909 | @@ -53,7 +53,7 @@ override_dh_missing: |
910 | dh_missing --fail-missing |
911 | |
912 | %: |
913 | - dh $@ --with pkgkde_symbolshelper |
914 | + dh $@ |
915 | |
916 | override_dh_installdeb: |
917 | dh_apparmor --profile-name=usr.lib.lomiri-download-manager.ldm-extractor -plomiri-download-manager |
Thanks, Olivier.
Package-wise, everything LGTM. The package builds fine, which means that the build-time tests are passing. git range-diff is OK.
The only thing that's making me slightly uncomfortable is your patch :-). Not because I don't like, but because I'd rather see some feedback from upstream before you go ahead and ship it to our users. OTOH, I really like that you were thorough in the patch description, and also when submitting the patch to Debian *and* upstream. Thanks for that.
I will take my chances here and sponsor the upload for you, mostly because I know that, if upstream finds any issues with your patch, you will replicate the fixes here as well.
Thanks.
Uploaded:
$ dput lomiri- download- manager_ 0.1.2-2ubuntu1_ source. changes work/lomiri- download- manager/ lomiri- download- manager_ 0.1.2-2ubuntu1_ source. changes: Valid signature from 106DA1C8C3CBBF14 work/lomiri- download- manager/ lomiri- download- manager_ 0.1.2-2ubuntu1. dsc: Valid signature from 106DA1C8C3CBBF14 download- manager_ 0.1.2-2ubuntu1. dsc: done. download- manager_ 0.1.2-2ubuntu1. debian. tar.xz: done. download- manager_ 0.1.2-2ubuntu1_ source. buildinfo: done. download- manager_ 0.1.2-2ubuntu1_ source. changes: done.
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/
Checking signature on .dsc
gpg: /home/sergio/
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading lomiri-
Uploading lomiri-
Uploading lomiri-
Uploading lomiri-
Successfully uploaded packages.