upload libmis 0.5.1

Change-Id: I13feacdbf5d86798424167c89f768040ba7b01ce
Reviewed-on: https://gerrit.libreoffice.org/22927
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

3 files changed, 0 insertions, 137 deletions

diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk
index 78f11a1b76ea..9880947385d2 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
 						external/libcmis/libcmis-libxml2_compatibility.patch \
-						external/libcmis/tdf90351.patch \
-						external/libcmis/http_auth.patch \
 ))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/http_auth.patch b/external/libcmis/http_auth.patch
deleted file mode 100644
index ac5bf0c29214..000000000000
--- a/external/libcmis/http_auth.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From eca14219ea6f63ae10630ee5b4e246eb77db3ccd Mon Sep 17 00:00:00 2001
-From: Vasily Melenchuk <vasily.melenchuk@cib.de>
-Date: Wed, 15 Jul 2015 11:54:52 +0200
-Subject: [PATCH] do not require password to be not empty to use http
- authentication credentials
-
----
- src/libcmis/http-session.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx
-index 49ff258..d3122ea 100644
---- a/src/libcmis/http-session.cxx
-+++ b/src/libcmis/http-session.cxx
-@@ -522,7 +522,7 @@ void HttpSession::httpRunRequest( string url, vector< string > headers, bool red
-         headers_slist = curl_slist_append( headers_slist,
-                                            m_oauth2Handler->getHttpHeader( ).c_str( ) );
-     }
--    else if ( !getUsername().empty() && !getPassword().empty() )
-+    else if ( !getUsername().empty() )
-     {
-         curl_easy_setopt( m_curlHandle, CURLOPT_HTTPAUTH, m_authMethod );
- #if LIBCURL_VERSION_VALUE >= 0x071301
--- 
-1.9.5.msysgit.0
-
diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch
deleted file mode 100644
index 0a6156e05e73..000000000000
--- a/external/libcmis/tdf90351.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 2b85882048847a3d2076a8ac0ed63d905aeea1dd Mon Sep 17 00:00:00 2001
-From: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-Date: Wed, 8 Jul 2015 14:26:01 +0200
-Subject: [PATCH] tdf#90351: response does not always contain cmis:baseTypeId
-
-So if we know which object we just created, don't rely on the server
-response to tell us.
----
- src/libcmis/atom-document.cxx | 4 ++--
- src/libcmis/atom-folder.cxx   | 4 ++--
- src/libcmis/atom-session.cxx  | 6 +++---
- src/libcmis/atom-session.hxx  | 3 ++-
- 4 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/libcmis/atom-document.cxx b/src/libcmis/atom-document.cxx
-index b7f28b3..49cfd45 100644
---- a/src/libcmis/atom-document.cxx
-+++ b/src/libcmis/atom-document.cxx
-@@ -280,7 +280,7 @@ libcmis::DocumentPtr AtomDocument::checkOut( ) throw ( libcmis::Exception )
-     if ( NULL == doc )
-         throw libcmis::Exception( "Failed to parse object infos" );
- 
--    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc );
-+    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc, AtomPubSession::RESULT_DOCUMENT );
-     xmlFreeDoc( doc );
- 
-     libcmis::DocumentPtr pwc = boost::dynamic_pointer_cast< libcmis::Document >( created );
-@@ -377,7 +377,7 @@ libcmis::DocumentPtr AtomDocument::checkIn( bool isMajor, string comment,
-         throw libcmis::Exception( "Failed to parse object infos" );
- 
- 
--    libcmis::ObjectPtr newVersion = getSession( )->createObjectFromEntryDoc( doc );
-+    libcmis::ObjectPtr newVersion = getSession( )->createObjectFromEntryDoc( doc, AtomPubSession::RESULT_DOCUMENT );
- 
-     if ( newVersion->getId( ) == getId( ) )
-         refreshImpl( doc );
-diff --git a/src/libcmis/atom-folder.cxx b/src/libcmis/atom-folder.cxx
-index 7947883..55ac2a9 100644
---- a/src/libcmis/atom-folder.cxx
-+++ b/src/libcmis/atom-folder.cxx
-@@ -170,7 +170,7 @@ libcmis::FolderPtr AtomFolder::createFolder( const PropertyPtrMap& properties )
-     if ( NULL == doc )
-         throw libcmis::Exception( "Failed to parse object infos" );
- 
--    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc );
-+    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc, AtomPubSession::RESULT_FOLDER );
-     xmlFreeDoc( doc );
- 
-     libcmis::FolderPtr newFolder = boost::dynamic_pointer_cast< libcmis::Folder >( created );
-@@ -244,7 +244,7 @@ libcmis::DocumentPtr AtomFolder::createDocument( const PropertyPtrMap& propertie
-             throw libcmis::Exception( "Missing expected response from server" );
-     }
- 
--    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc );
-+    libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc, AtomPubSession::RESULT_DOCUMENT );
-     xmlFreeDoc( doc );
- 
-     libcmis::DocumentPtr newDocument = boost::dynamic_pointer_cast< libcmis::Document >( created );
-diff --git a/src/libcmis/atom-session.cxx b/src/libcmis/atom-session.cxx
-index ffa93a7..e470884 100644
---- a/src/libcmis/atom-session.cxx
-+++ b/src/libcmis/atom-session.cxx
-@@ -201,7 +201,7 @@ bool AtomPubSession::setRepository( string repositoryId )
-     return found;
- }
- 
--libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
-+libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc, ResultObjectType res )
- {
-     libcmis::ObjectPtr cmisObject;
- 
-@@ -222,11 +222,11 @@ libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
-                 string baseType = libcmis::getXPathValue( xpathCtx, baseTypeReq );
- 
-                 xmlNodePtr node = xpathObj->nodesetval->nodeTab[0];
--                if ( baseType == "cmis:folder" )
-+                if ( res == RESULT_FOLDER || baseType == "cmis:folder" )
-                 {
-                     cmisObject.reset( new AtomFolder( this, node ) );
-                 }
--                else if ( baseType == "cmis:document" )
-+                else if ( res == RESULT_DOCUMENT || baseType == "cmis:document" )
-                 {
-                     cmisObject.reset( new AtomDocument( this, node ) );
-                 }
-diff --git a/src/libcmis/atom-session.hxx b/src/libcmis/atom-session.hxx
-index c887b6d..953aa17 100644
---- a/src/libcmis/atom-session.hxx
-+++ b/src/libcmis/atom-session.hxx
-@@ -37,6 +37,7 @@ class AtomPubSession : public BaseSession
-         AtomRepositoryPtr m_repository;
- 
-     public:
-+        enum ResultObjectType { RESULT_DYNAMIC, RESULT_FOLDER, RESULT_DOCUMENT };
-         AtomPubSession( std::string sAtomPubUrl, std::string repositoryId,
-                         std::string username, std::string password, bool noSslCheck = false,
-                         libcmis::OAuth2DataPtr oauth2 = libcmis::OAuth2DataPtr(),
-@@ -58,7 +59,7 @@ class AtomPubSession : public BaseSession
- 
-         // Utility methods
- 
--        libcmis::ObjectPtr createObjectFromEntryDoc( xmlDocPtr doc );
-+        libcmis::ObjectPtr createObjectFromEntryDoc( xmlDocPtr doc, ResultObjectType res=RESULT_DYNAMIC );
- 
-         std::vector< libcmis::ObjectTypePtr > getChildrenTypes( std::string url )
-             throw ( libcmis::Exception );
--- 
-2.1.4
-