1 |
commit: 16b0199b7774379301c92946006e6e01f4c51e87 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 19:26:42 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 22:59:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b0199b |
7 |
|
8 |
dev-cpp/libcmis: Drop <0.5.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-cpp/libcmis/Manifest | 2 - |
14 |
.../libcmis/files/libcmis-0.5.2-boost-1.68.patch | 25 ------- |
15 |
.../files/libcmis-0.5.2-fix-gdrive-2fa.patch | 70 ------------------ |
16 |
.../files/libcmis-0.5.2-oauth2-encode.patch | 69 ------------------ |
17 |
.../libcmis/libcmis-0.5.2_pre20160820-r1.ebuild | 85 ---------------------- |
18 |
dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild | 77 -------------------- |
19 |
6 files changed, 328 deletions(-) |
20 |
|
21 |
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest |
22 |
index 2065d178dde..c1568ef2f82 100644 |
23 |
--- a/dev-cpp/libcmis/Manifest |
24 |
+++ b/dev-cpp/libcmis/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde |
27 |
-DIST libcmis-0.5.2_pre20160820.tar.gz 285100 BLAKE2B 980200d1a56240d8d069aba2ad349ec02e90d345bad4956f6cbbea3606f9f90951523804293b349ad0419dd2db6db294a45a97872469105c1ba392c888fab332 SHA512 4b6d0fc4d80444fea2c5eb16621b92a10b41c58128cc8a355caca50f12648ed5113bd977cc5dbe8971e3dbc11f9d7ae8d45c9d2aa19f37c83659141af135bd1a |
28 |
-DIST libcmis-0.5.2_pre20180118.tar.gz 291080 BLAKE2B 1cb5664dcb0bef7f5a04c422b21ac54a9b70d38dec74d688327732630e4a134a88c7262d763a39d1730eda1cd45f5d3c3d47a56099959d01bf5e23972181a793 SHA512 630cf7e5c31266e2b55ca093aa942fc373eb24bbb5b9aedd687f67f1b3c6b627a3bdb58878859449bcb340626f3e1bdafa2b9cbb5e61e8e4336c45b804fca7a9 |
29 |
|
30 |
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch |
31 |
deleted file mode 100644 |
32 |
index 767464242f7..00000000000 |
33 |
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch |
34 |
+++ /dev/null |
35 |
@@ -1,25 +0,0 @@ |
36 |
-From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001 |
37 |
-From: rezso <rezso@×××××.net> |
38 |
-Date: Tue, 4 Sep 2018 01:18:10 +0200 |
39 |
-Subject: tdf#119344 fix libcmis build with boost 1.68 |
40 |
- |
41 |
-Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045 |
42 |
-Reviewed-on: https://gerrit.libreoffice.org/59958 |
43 |
-Tested-by: Jenkins |
44 |
-Reviewed-by: Michael Stahl <Michael.Stahl@×××.de> |
45 |
- |
46 |
---- a/src/libcmis/xml-utils.cxx |
47 |
-+++ b/src/libcmis/xml-utils.cxx |
48 |
-@@ -31,7 +31,12 @@ |
49 |
- #include <sstream> |
50 |
- #include <stdlib.h> |
51 |
- |
52 |
-+#include <boost/version.hpp> |
53 |
-+#if (BOOST_VERSION >= 106800) |
54 |
-+#include <boost/uuid/detail/sha1.hpp> |
55 |
-+#else |
56 |
- #include <boost/uuid/sha1.hpp> |
57 |
-+#endif |
58 |
- #include <curl/curl.h> |
59 |
- |
60 |
- #include "xml-utils.hxx" |
61 |
|
62 |
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch |
63 |
deleted file mode 100644 |
64 |
index 3c19e99a5ba..00000000000 |
65 |
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch |
66 |
+++ /dev/null |
67 |
@@ -1,70 +0,0 @@ |
68 |
-From 1effce6d286ba3a9f467e15074b532d2ba4b7c98 Mon Sep 17 00:00:00 2001 |
69 |
-From: =?UTF-8?q?Szymon=20K=C5=82os?= <eszkadev@×××××.com> |
70 |
-Date: Wed, 29 Mar 2017 17:45:10 +0200 |
71 |
-Subject: [PATCH] Fix 2FA for Google Drive |
72 |
- |
73 |
---- |
74 |
- src/libcmis/oauth2-providers.cxx | 15 +++++++++++++-- |
75 |
- 1 file changed, 13 insertions(+), 2 deletions(-) |
76 |
- |
77 |
-diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx |
78 |
-index 74c0fec..dd872dd 100644 |
79 |
---- a/src/libcmis/oauth2-providers.cxx |
80 |
-+++ b/src/libcmis/oauth2-providers.cxx |
81 |
-@@ -37,6 +37,7 @@ |
82 |
- #define CHALLENGE_PAGE_ACTION_LEN sizeof( CHALLENGE_PAGE_ACTION ) - 1 |
83 |
- #define PIN_FORM_ACTION "/signin/challenge/ipp" |
84 |
- #define PIN_FORM_ACTION_LEN sizeof( PIN_FORM_ACTION ) - 1 |
85 |
-+#define PIN_INPUT_NAME "Pin" |
86 |
- |
87 |
- using namespace std; |
88 |
- |
89 |
-@@ -152,7 +153,7 @@ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUr |
90 |
- } |
91 |
- |
92 |
- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink; |
93 |
-- loginChallengePost += "Pin="; |
94 |
-+ loginChallengePost += string( PIN_INPUT_NAME ) + "="; |
95 |
- loginChallengePost += string( pin ); |
96 |
- |
97 |
- istringstream loginChallengeIs( loginChallengePost ); |
98 |
-@@ -291,6 +292,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& |
99 |
- if ( reader == NULL ) return 0; |
100 |
- |
101 |
- bool readInputField = false; |
102 |
-+ bool bIsRightForm = false; |
103 |
-+ bool bHasPinField = false; |
104 |
- |
105 |
- while ( true ) |
106 |
- { |
107 |
-@@ -301,6 +304,12 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& |
108 |
- // Find the redirect link |
109 |
- if ( xmlStrEqual( nodeName, BAD_CAST( "form" ) ) ) |
110 |
- { |
111 |
-+ // 2FA: Don't add fields form other forms not having pin field |
112 |
-+ if ( bIsRightForm && !bHasPinField ) |
113 |
-+ post = string( "" ); |
114 |
-+ if ( bIsRightForm && bHasPinField ) |
115 |
-+ break; |
116 |
-+ |
117 |
- xmlChar* action = xmlTextReaderGetAttribute( reader, |
118 |
- BAD_CAST( "action" )); |
119 |
- |
120 |
-@@ -311,7 +320,7 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& |
121 |
- bool bChallengePage = ( strncmp( (char*)action, |
122 |
- CHALLENGE_PAGE_ACTION, |
123 |
- CHALLENGE_PAGE_ACTION_LEN ) == 0 ); |
124 |
-- bool bIsRightForm = ( strncmp( (char*)action, |
125 |
-+ bIsRightForm = ( strncmp( (char*)action, |
126 |
- PIN_FORM_ACTION, |
127 |
- PIN_FORM_ACTION_LEN ) == 0 ); |
128 |
- if ( ( xmlStrlen( action ) > 0 ) |
129 |
-@@ -332,6 +341,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& |
130 |
- BAD_CAST( "name" )); |
131 |
- xmlChar* value = xmlTextReaderGetAttribute( reader, |
132 |
- BAD_CAST( "value" )); |
133 |
-+ if ( name != NULL && strcmp( (char*)name, PIN_INPUT_NAME ) == 0 ) |
134 |
-+ bHasPinField = true; |
135 |
- if ( ( name != NULL ) && ( value!= NULL ) ) |
136 |
- { |
137 |
- if ( ( xmlStrlen( name ) > 0) && ( xmlStrlen( value ) > 0) ) |
138 |
|
139 |
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch |
140 |
deleted file mode 100644 |
141 |
index c6a99074c50..00000000000 |
142 |
--- a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch |
143 |
+++ /dev/null |
144 |
@@ -1,69 +0,0 @@ |
145 |
-From 33f7485dedea90e0f80c6348fa8ac5f27c5052e0 Mon Sep 17 00:00:00 2001 |
146 |
-From: Stephan Bergmann <sbergman@××××××.com> |
147 |
-Date: Tue, 4 Sep 2018 16:45:00 +0200 |
148 |
-Subject: Properly encode OAuth2 credentials |
149 |
- |
150 |
-Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 |
151 |
-Reviewed-on: https://gerrit.libreoffice.org/59986 |
152 |
-Tested-by: Jenkins |
153 |
-Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
154 |
- |
155 |
---- a/src/libcmis/oauth2-providers.cxx |
156 |
-+++ b/src/libcmis/oauth2-providers.cxx |
157 |
-@@ -26,6 +26,8 @@ |
158 |
- * instead of those above. |
159 |
- */ |
160 |
- |
161 |
-+#include <cassert> |
162 |
-+ |
163 |
- #include <libxml/HTMLparser.h> |
164 |
- #include <libxml/xmlreader.h> |
165 |
- |
166 |
-@@ -45,6 +47,29 @@ |
167 |
- #define HTML_PARSE_RECOVER 0 |
168 |
- #endif |
169 |
- |
170 |
-+namespace { |
171 |
-+ |
172 |
-+// See <https://url.spec.whatwg.org/#concept-urlencoded-byte-serializer>: |
173 |
-+void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) { |
174 |
-+ assert(buffer); |
175 |
-+ for (string::const_iterator i = data.begin(); i != data.end(); ++i) { |
176 |
-+ unsigned char c = static_cast<unsigned char>(*i); |
177 |
-+ if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9') |
178 |
-+ || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z')) |
179 |
-+ { |
180 |
-+ *buffer += static_cast<char>(c); |
181 |
-+ } else { |
182 |
-+ static const char hex[16] = { |
183 |
-+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; |
184 |
-+ *buffer += '%'; |
185 |
-+ *buffer += hex[c >> 4]; |
186 |
-+ *buffer += hex[c & 0xF]; |
187 |
-+ } |
188 |
-+ } |
189 |
-+} |
190 |
-+ |
191 |
-+} |
192 |
-+ |
193 |
- string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl, |
194 |
- const string& username, const string& password ) |
195 |
- { |
196 |
-@@ -97,7 +120,7 @@ |
197 |
- return string( ); |
198 |
- |
199 |
- loginEmailPost += "Email="; |
200 |
-- loginEmailPost += string( username ); |
201 |
-+ addXWwwFormUrlencoded(&loginEmailPost, username); |
202 |
- |
203 |
- istringstream loginEmailIs( loginEmailPost ); |
204 |
- string loginEmailRes; |
205 |
-@@ -119,7 +142,7 @@ |
206 |
- return string( ); |
207 |
- |
208 |
- loginPasswdPost += "Passwd="; |
209 |
-- loginPasswdPost += string( password ); |
210 |
-+ addXWwwFormUrlencoded(&loginPasswdPost, password); |
211 |
- |
212 |
- istringstream loginPasswdIs( loginPasswdPost ); |
213 |
- string loginPasswdRes; |
214 |
|
215 |
diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild |
216 |
deleted file mode 100644 |
217 |
index 8377602271d..00000000000 |
218 |
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild |
219 |
+++ /dev/null |
220 |
@@ -1,85 +0,0 @@ |
221 |
-# Copyright 1999-2018 Gentoo Foundation |
222 |
-# Distributed under the terms of the GNU General Public License v2 |
223 |
- |
224 |
-EAPI=6 |
225 |
- |
226 |
-if [[ ${PV} = 9999 ]]; then |
227 |
- EGIT_REPO_URI="https://github.com/tdf/libcmis.git" |
228 |
- SCM_ECLASS="git-r3" |
229 |
-elif [[ ${PV} = *_pre* ]]; then |
230 |
- SCM_ECLASS="vcs-snapshot" |
231 |
- snapshot=d2054a12e3f52fff8e96341e8c48f0dcd75e2e2a |
232 |
- SRC_URI="https://github.com/tdf/${PN}/archive/${snapshot}.tar.gz -> ${P}.tar.gz" |
233 |
- unset snapshot |
234 |
-else |
235 |
- SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
236 |
-fi |
237 |
-inherit alternatives autotools flag-o-matic ${SCM_ECLASS} |
238 |
-unset SCM_ECLASS |
239 |
- |
240 |
-DESCRIPTION="C++ client library for the CMIS interface" |
241 |
-HOMEPAGE="https://github.com/tdf/libcmis" |
242 |
- |
243 |
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" |
244 |
-SLOT="0.5" |
245 |
- |
246 |
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 |
247 |
-[[ ${PV} == 9999 ]] || \ |
248 |
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" |
249 |
- |
250 |
-IUSE="man static-libs test" |
251 |
- |
252 |
-COMMON_DEPEND=" |
253 |
- dev-libs/boost:= |
254 |
- dev-libs/libxml2 |
255 |
- net-misc/curl |
256 |
-" |
257 |
-DEPEND="${COMMON_DEPEND} |
258 |
- virtual/pkgconfig |
259 |
- man? ( |
260 |
- app-text/docbook2X |
261 |
- dev-libs/libxslt |
262 |
- ) |
263 |
- test? ( |
264 |
- dev-util/cppcheck |
265 |
- dev-util/cppunit |
266 |
- ) |
267 |
-" |
268 |
-RDEPEND="${COMMON_DEPEND} |
269 |
- !<dev-cpp/libcmis-0.5.0 |
270 |
-" |
271 |
- |
272 |
-RESTRICT="test" |
273 |
- |
274 |
-PATCHES=( "${FILESDIR}/${PN}-0.5.2-fix-gdrive-2fa.patch" ) |
275 |
- |
276 |
-src_prepare() { |
277 |
- default |
278 |
- [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf |
279 |
-} |
280 |
- |
281 |
-src_configure() { |
282 |
- # bug 618778 |
283 |
- append-cxxflags -std=c++14 |
284 |
- |
285 |
- econf \ |
286 |
- --program-suffix=-${SLOT} \ |
287 |
- --disable-werror \ |
288 |
- $(use_with man) \ |
289 |
- $(use_enable static-libs static) \ |
290 |
- $(use_enable test tests) \ |
291 |
- --enable-client |
292 |
-} |
293 |
- |
294 |
-src_install() { |
295 |
- default |
296 |
- find "${D}" -name '*.la' -delete || die |
297 |
-} |
298 |
- |
299 |
-pkg_postinst() { |
300 |
- alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]" |
301 |
-} |
302 |
- |
303 |
-pkg_postrm() { |
304 |
- alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]" |
305 |
-} |
306 |
|
307 |
diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild |
308 |
deleted file mode 100644 |
309 |
index 2707ed8b630..00000000000 |
310 |
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild |
311 |
+++ /dev/null |
312 |
@@ -1,77 +0,0 @@ |
313 |
-# Copyright 1999-2018 Gentoo Foundation |
314 |
-# Distributed under the terms of the GNU General Public License v2 |
315 |
- |
316 |
-EAPI=7 |
317 |
- |
318 |
-if [[ ${PV} = 9999 ]]; then |
319 |
- EGIT_REPO_URI="https://github.com/tdf/libcmis.git" |
320 |
- inherit git-r3 |
321 |
-elif [[ ${PV} = *_pre* ]]; then |
322 |
- COMMIT=738528d790b2b1d52d9b72d673842969a852815d |
323 |
- SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
324 |
-else |
325 |
- SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
326 |
-fi |
327 |
-inherit autotools flag-o-matic |
328 |
- |
329 |
-DESCRIPTION="C++ client library for the CMIS interface" |
330 |
-HOMEPAGE="https://github.com/tdf/libcmis" |
331 |
- |
332 |
-LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" |
333 |
-SLOT="0.5" |
334 |
- |
335 |
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 |
336 |
-[[ ${PV} == 9999 ]] || \ |
337 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
338 |
- |
339 |
-IUSE="man static-libs test" |
340 |
- |
341 |
-RDEPEND=" |
342 |
- dev-libs/boost:= |
343 |
- dev-libs/libxml2 |
344 |
- net-misc/curl |
345 |
-" |
346 |
-DEPEND="${RDEPEND}" |
347 |
-BDEPEND=" |
348 |
- virtual/pkgconfig |
349 |
- man? ( |
350 |
- app-text/docbook2X |
351 |
- dev-libs/libxslt |
352 |
- ) |
353 |
- test? ( |
354 |
- dev-util/cppcheck |
355 |
- dev-util/cppunit |
356 |
- ) |
357 |
-" |
358 |
- |
359 |
-RESTRICT="test" |
360 |
- |
361 |
-PATCHES=( |
362 |
- "${FILESDIR}/${PN}-0.5.2-boost-1.68.patch" |
363 |
- "${FILESDIR}/${PN}-0.5.2-oauth2-encode.patch" |
364 |
-) |
365 |
- |
366 |
-[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}" |
367 |
- |
368 |
-src_prepare() { |
369 |
- default |
370 |
- [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf |
371 |
-} |
372 |
- |
373 |
-src_configure() { |
374 |
- # bug 618778 |
375 |
- append-cxxflags -std=c++14 |
376 |
- |
377 |
- econf \ |
378 |
- --program-suffix=-$(ver_cut 1-2) \ |
379 |
- --disable-werror \ |
380 |
- $(use_with man) \ |
381 |
- $(use_enable static-libs static) \ |
382 |
- $(use_enable test tests) \ |
383 |
- --enable-client |
384 |
-} |
385 |
- |
386 |
-src_install() { |
387 |
- default |
388 |
- find "${D}" -name '*.la' -delete || die |
389 |
-} |