diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-02-17 20:26:42 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-02-17 23:59:27 +0100 |
commit | 16b0199b7774379301c92946006e6e01f4c51e87 (patch) | |
tree | 59aea913eba548ed80f11c2464e03cac951faef2 /dev-cpp | |
parent | app-text/libwpg: Drop 0.3.2 (diff) | |
download | gentoo-16b0199b7774379301c92946006e6e01f4c51e87.tar.gz gentoo-16b0199b7774379301c92946006e6e01f4c51e87.tar.bz2 gentoo-16b0199b7774379301c92946006e6e01f4c51e87.zip |
dev-cpp/libcmis: Drop <0.5.2
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/libcmis/Manifest | 2 | ||||
-rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch | 25 | ||||
-rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch | 70 | ||||
-rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch | 69 | ||||
-rw-r--r-- | dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild | 85 | ||||
-rw-r--r-- | dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild | 77 |
6 files changed, 0 insertions, 328 deletions
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest index 2065d178dde5..c1568ef2f82e 100644 --- a/dev-cpp/libcmis/Manifest +++ b/dev-cpp/libcmis/Manifest @@ -1,3 +1 @@ DIST libcmis-0.5.2.tar.gz 295020 BLAKE2B 325eacedd87eb1888a439c727a648c5aeb8d58c9b80add9761ffc55381193b71b589865d13ecd55177faafa935642685001f60456c1354e037989b29e9451c05 SHA512 45d8cd6d420a9593b46e1f2d6fbf384ea248cb218b0db6326ee2f082ff29100b65a2cc999ccb849e61df4f4ed7c3721b09addc6c322ef03c6c93f8c0acc02bde -DIST libcmis-0.5.2_pre20160820.tar.gz 285100 BLAKE2B 980200d1a56240d8d069aba2ad349ec02e90d345bad4956f6cbbea3606f9f90951523804293b349ad0419dd2db6db294a45a97872469105c1ba392c888fab332 SHA512 4b6d0fc4d80444fea2c5eb16621b92a10b41c58128cc8a355caca50f12648ed5113bd977cc5dbe8971e3dbc11f9d7ae8d45c9d2aa19f37c83659141af135bd1a -DIST libcmis-0.5.2_pre20180118.tar.gz 291080 BLAKE2B 1cb5664dcb0bef7f5a04c422b21ac54a9b70d38dec74d688327732630e4a134a88c7262d763a39d1730eda1cd45f5d3c3d47a56099959d01bf5e23972181a793 SHA512 630cf7e5c31266e2b55ca093aa942fc373eb24bbb5b9aedd687f67f1b3c6b627a3bdb58878859449bcb340626f3e1bdafa2b9cbb5e61e8e4336c45b804fca7a9 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 deleted file mode 100644 index 767464242f78..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001 -From: rezso <rezso@rezso.net> -Date: Tue, 4 Sep 2018 01:18:10 +0200 -Subject: tdf#119344 fix libcmis build with boost 1.68 - -Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045 -Reviewed-on: https://gerrit.libreoffice.org/59958 -Tested-by: Jenkins -Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> - ---- a/src/libcmis/xml-utils.cxx -+++ b/src/libcmis/xml-utils.cxx -@@ -31,7 +31,12 @@ - #include <sstream> - #include <stdlib.h> - -+#include <boost/version.hpp> -+#if (BOOST_VERSION >= 106800) -+#include <boost/uuid/detail/sha1.hpp> -+#else - #include <boost/uuid/sha1.hpp> -+#endif - #include <curl/curl.h> - - #include "xml-utils.hxx" 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 deleted file mode 100644 index 3c19e99a5ba9..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1effce6d286ba3a9f467e15074b532d2ba4b7c98 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Szymon=20K=C5=82os?= <eszkadev@gmail.com> -Date: Wed, 29 Mar 2017 17:45:10 +0200 -Subject: [PATCH] Fix 2FA for Google Drive - ---- - src/libcmis/oauth2-providers.cxx | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx -index 74c0fec..dd872dd 100644 ---- a/src/libcmis/oauth2-providers.cxx -+++ b/src/libcmis/oauth2-providers.cxx -@@ -37,6 +37,7 @@ - #define CHALLENGE_PAGE_ACTION_LEN sizeof( CHALLENGE_PAGE_ACTION ) - 1 - #define PIN_FORM_ACTION "/signin/challenge/ipp" - #define PIN_FORM_ACTION_LEN sizeof( PIN_FORM_ACTION ) - 1 -+#define PIN_INPUT_NAME "Pin" - - using namespace std; - -@@ -152,7 +153,7 @@ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUr - } - - loginChallengeLink = "https://accounts.google.com" + loginChallengeLink; -- loginChallengePost += "Pin="; -+ loginChallengePost += string( PIN_INPUT_NAME ) + "="; - loginChallengePost += string( pin ); - - istringstream loginChallengeIs( loginChallengePost ); -@@ -291,6 +292,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - if ( reader == NULL ) return 0; - - bool readInputField = false; -+ bool bIsRightForm = false; -+ bool bHasPinField = false; - - while ( true ) - { -@@ -301,6 +304,12 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - // Find the redirect link - if ( xmlStrEqual( nodeName, BAD_CAST( "form" ) ) ) - { -+ // 2FA: Don't add fields form other forms not having pin field -+ if ( bIsRightForm && !bHasPinField ) -+ post = string( "" ); -+ if ( bIsRightForm && bHasPinField ) -+ break; -+ - xmlChar* action = xmlTextReaderGetAttribute( reader, - BAD_CAST( "action" )); - -@@ -311,7 +320,7 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - bool bChallengePage = ( strncmp( (char*)action, - CHALLENGE_PAGE_ACTION, - CHALLENGE_PAGE_ACTION_LEN ) == 0 ); -- bool bIsRightForm = ( strncmp( (char*)action, -+ bIsRightForm = ( strncmp( (char*)action, - PIN_FORM_ACTION, - PIN_FORM_ACTION_LEN ) == 0 ); - if ( ( xmlStrlen( action ) > 0 ) -@@ -332,6 +341,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - BAD_CAST( "name" )); - xmlChar* value = xmlTextReaderGetAttribute( reader, - BAD_CAST( "value" )); -+ if ( name != NULL && strcmp( (char*)name, PIN_INPUT_NAME ) == 0 ) -+ bHasPinField = true; - if ( ( name != NULL ) && ( value!= NULL ) ) - { - if ( ( xmlStrlen( name ) > 0) && ( xmlStrlen( value ) > 0) ) 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 deleted file mode 100644 index c6a99074c502..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 33f7485dedea90e0f80c6348fa8ac5f27c5052e0 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Tue, 4 Sep 2018 16:45:00 +0200 -Subject: Properly encode OAuth2 credentials - -Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 -Reviewed-on: https://gerrit.libreoffice.org/59986 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann <sbergman@redhat.com> - ---- a/src/libcmis/oauth2-providers.cxx -+++ b/src/libcmis/oauth2-providers.cxx -@@ -26,6 +26,8 @@ - * instead of those above. - */ - -+#include <cassert> -+ - #include <libxml/HTMLparser.h> - #include <libxml/xmlreader.h> - -@@ -45,6 +47,29 @@ - #define HTML_PARSE_RECOVER 0 - #endif - -+namespace { -+ -+// See <https://url.spec.whatwg.org/#concept-urlencoded-byte-serializer>: -+void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) { -+ assert(buffer); -+ for (string::const_iterator i = data.begin(); i != data.end(); ++i) { -+ unsigned char c = static_cast<unsigned char>(*i); -+ if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9') -+ || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z')) -+ { -+ *buffer += static_cast<char>(c); -+ } else { -+ static const char hex[16] = { -+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; -+ *buffer += '%'; -+ *buffer += hex[c >> 4]; -+ *buffer += hex[c & 0xF]; -+ } -+ } -+} -+ -+} -+ - string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl, - const string& username, const string& password ) - { -@@ -97,7 +120,7 @@ - return string( ); - - loginEmailPost += "Email="; -- loginEmailPost += string( username ); -+ addXWwwFormUrlencoded(&loginEmailPost, username); - - istringstream loginEmailIs( loginEmailPost ); - string loginEmailRes; -@@ -119,7 +142,7 @@ - return string( ); - - loginPasswdPost += "Passwd="; -- loginPasswdPost += string( password ); -+ addXWwwFormUrlencoded(&loginPasswdPost, password); - - istringstream loginPasswdIs( loginPasswdPost ); - string loginPasswdRes; diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild deleted file mode 100644 index 8377602271d8..000000000000 --- a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/tdf/libcmis.git" - SCM_ECLASS="git-r3" -elif [[ ${PV} = *_pre* ]]; then - SCM_ECLASS="vcs-snapshot" - snapshot=d2054a12e3f52fff8e96341e8c48f0dcd75e2e2a - SRC_URI="https://github.com/tdf/${PN}/archive/${snapshot}.tar.gz -> ${P}.tar.gz" - unset snapshot -else - SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi -inherit alternatives autotools flag-o-matic ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="C++ client library for the CMIS interface" -HOMEPAGE="https://github.com/tdf/libcmis" - -LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" -SLOT="0.5" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == 9999 ]] || \ -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" - -IUSE="man static-libs test" - -COMMON_DEPEND=" - dev-libs/boost:= - dev-libs/libxml2 - net-misc/curl -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - man? ( - app-text/docbook2X - dev-libs/libxslt - ) - test? ( - dev-util/cppcheck - dev-util/cppunit - ) -" -RDEPEND="${COMMON_DEPEND} - !<dev-cpp/libcmis-0.5.0 -" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-0.5.2-fix-gdrive-2fa.patch" ) - -src_prepare() { - default - [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf -} - -src_configure() { - # bug 618778 - append-cxxflags -std=c++14 - - econf \ - --program-suffix=-${SLOT} \ - --disable-werror \ - $(use_with man) \ - $(use_enable static-libs static) \ - $(use_enable test tests) \ - --enable-client -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]" -} - -pkg_postrm() { - alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]" -} diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild deleted file mode 100644 index 2707ed8b6300..000000000000 --- a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/tdf/libcmis.git" - inherit git-r3 -elif [[ ${PV} = *_pre* ]]; then - COMMIT=738528d790b2b1d52d9b72d673842969a852815d - SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi -inherit autotools flag-o-matic - -DESCRIPTION="C++ client library for the CMIS interface" -HOMEPAGE="https://github.com/tdf/libcmis" - -LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" -SLOT="0.5" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="man static-libs test" - -RDEPEND=" - dev-libs/boost:= - dev-libs/libxml2 - net-misc/curl -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - man? ( - app-text/docbook2X - dev-libs/libxslt - ) - test? ( - dev-util/cppcheck - dev-util/cppunit - ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-0.5.2-boost-1.68.patch" - "${FILESDIR}/${PN}-0.5.2-oauth2-encode.patch" -) - -[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - default - [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf -} - -src_configure() { - # bug 618778 - append-cxxflags -std=c++14 - - econf \ - --program-suffix=-$(ver_cut 1-2) \ - --disable-werror \ - $(use_with man) \ - $(use_enable static-libs static) \ - $(use_enable test tests) \ - --enable-client -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} |