From d92d3dbbe165f940230caf5011ce3fd9abd9c07e Mon Sep 17 00:00:00 2001
From: Alejandro Alvarez Ayllon <aalvarez@cern.ch>
Date: Feb 20 2017 10:55:38 +0000
Subject: Release 3.6.3


---

diff --git a/fts-boost-unit-test.patch b/fts-boost-unit-test.patch
deleted file mode 100644
index 4b591b2..0000000
--- a/fts-boost-unit-test.patch
+++ /dev/null
@@ -1,440 +0,0 @@
-diff --git a/test/unit/cli/Snapshot.cpp b/test/unit/cli/Snapshot.cpp
-index dd918de..32753c8 100644
---- a/test/unit/cli/Snapshot.cpp
-+++ b/test/unit/cli/Snapshot.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/property_tree/json_parser.hpp>
- 
- #include "cli/Snapshot.h"
-diff --git a/test/unit/cli/rest/HttpRequest.cpp b/test/unit/cli/rest/HttpRequest.cpp
-index cf8d420..40cdba8 100644
---- a/test/unit/cli/rest/HttpRequest.cpp
-+++ b/test/unit/cli/rest/HttpRequest.cpp
-@@ -19,7 +19,8 @@
-  */
- 
- #include <boost/algorithm/string.hpp>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/exception/cli_exception.h"
- #include "cli/exception/rest_failure.h"
-diff --git a/test/unit/cli/rest/ResponseParser.cpp b/test/unit/cli/rest/ResponseParser.cpp
-index 9b7205a..9b6d8e0 100644
---- a/test/unit/cli/rest/ResponseParser.cpp
-+++ b/test/unit/cli/rest/ResponseParser.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/rest/ResponseParser.h"
- 
-diff --git a/test/unit/cli/rest/RestBanning.cpp b/test/unit/cli/rest/RestBanning.cpp
-index 53e8c4e..4517bff 100644
---- a/test/unit/cli/rest/RestBanning.cpp
-+++ b/test/unit/cli/rest/RestBanning.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- #include <boost/property_tree/json_parser.hpp>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/rest/RestBanning.h"
- #include "MockHttpRequest.h"
-diff --git a/test/unit/cli/rest/RestDeletion.cpp b/test/unit/cli/rest/RestDeletion.cpp
-index d212187..5261a4b 100644
---- a/test/unit/cli/rest/RestDeletion.cpp
-+++ b/test/unit/cli/rest/RestDeletion.cpp
-@@ -15,7 +15,9 @@
-  */
- 
- #include <boost/property_tree/json_parser.hpp>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
-+#include <set>
- 
- #include "cli/rest/RestDeletion.h"
- 
-diff --git a/test/unit/cli/rest/RestModifyJob.cpp b/test/unit/cli/rest/RestModifyJob.cpp
-index 2b9f5f5..2adba32 100644
---- a/test/unit/cli/rest/RestModifyJob.cpp
-+++ b/test/unit/cli/rest/RestModifyJob.cpp
-@@ -15,7 +15,8 @@
-  */
- 
- #include <boost/property_tree/json_parser.hpp>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/rest/RestModifyJob.h"
- #include "MockHttpRequest.h"
-diff --git a/test/unit/cli/rest/RestSubmission.cpp b/test/unit/cli/rest/RestSubmission.cpp
-index fd98147..f772404 100644
---- a/test/unit/cli/rest/RestSubmission.cpp
-+++ b/test/unit/cli/rest/RestSubmission.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/property_tree/json_parser.hpp>
- 
- #include "cli/rest/RestSubmission.h"
-diff --git a/test/unit/cli/ui/CliBaseTest.cpp b/test/unit/cli/ui/CliBaseTest.cpp
-index 992b96a..3d42227 100644
---- a/test/unit/cli/ui/CliBaseTest.cpp
-+++ b/test/unit/cli/ui/CliBaseTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/CliBase.h"
- 
-diff --git a/test/unit/cli/ui/DnCliTest.cpp b/test/unit/cli/ui/DnCliTest.cpp
-index 70313d0..99a461a 100644
---- a/test/unit/cli/ui/DnCliTest.cpp
-+++ b/test/unit/cli/ui/DnCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/DnCli.h"
- 
-diff --git a/test/unit/cli/ui/JobIdCliTest.cpp b/test/unit/cli/ui/JobIdCliTest.cpp
-index 29489f8..d2c4fa7 100644
---- a/test/unit/cli/ui/JobIdCliTest.cpp
-+++ b/test/unit/cli/ui/JobIdCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/JobIdCli.h"
- 
-diff --git a/test/unit/cli/ui/ListTransferCliTest.cpp b/test/unit/cli/ui/ListTransferCliTest.cpp
-index e7e92e5..83a8d26 100644
---- a/test/unit/cli/ui/ListTransferCliTest.cpp
-+++ b/test/unit/cli/ui/ListTransferCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/ListTransferCli.h"
- 
-diff --git a/test/unit/cli/ui/SetCfgCli.cpp b/test/unit/cli/ui/SetCfgCli.cpp
-index 52b2d1b..d75eeda 100644
---- a/test/unit/cli/ui/SetCfgCli.cpp
-+++ b/test/unit/cli/ui/SetCfgCli.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/SetCfgCli.h"
- 
-diff --git a/test/unit/cli/ui/SubmitTransferCliTest.cpp b/test/unit/cli/ui/SubmitTransferCliTest.cpp
-index c311021..361aa9b 100644
---- a/test/unit/cli/ui/SubmitTransferCliTest.cpp
-+++ b/test/unit/cli/ui/SubmitTransferCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/SubmitTransferCli.h"
- #include "common/JobParameterHandler.h"
-diff --git a/test/unit/cli/ui/TransferStatusCliTest.cpp b/test/unit/cli/ui/TransferStatusCliTest.cpp
-index 8d2589b..1dd740c 100644
---- a/test/unit/cli/ui/TransferStatusCliTest.cpp
-+++ b/test/unit/cli/ui/TransferStatusCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/TransferStatusCli.h"
- 
-diff --git a/test/unit/cli/ui/VoNameCliTest.cpp b/test/unit/cli/ui/VoNameCliTest.cpp
-index 0bb1abb..30ff469 100644
---- a/test/unit/cli/ui/VoNameCliTest.cpp
-+++ b/test/unit/cli/ui/VoNameCliTest.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "cli/ui/VoNameCli.h"
- 
-diff --git a/test/unit/common/CfgParser.cpp b/test/unit/common/CfgParser.cpp
-index 4b6ca41..228ae14 100644
---- a/test/unit/common/CfgParser.cpp
-+++ b/test/unit/common/CfgParser.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/CfgParser.h"
- 
-diff --git a/test/unit/common/ConcurrentQueue.cpp b/test/unit/common/ConcurrentQueue.cpp
-index 07c3be9..4f9dd3d 100644
---- a/test/unit/common/ConcurrentQueue.cpp
-+++ b/test/unit/common/ConcurrentQueue.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/ConcurrentQueue.h"
- 
-diff --git a/test/unit/common/DaemonTools.cpp b/test/unit/common/DaemonTools.cpp
-index 9a92ba3..aed6f47 100644
---- a/test/unit/common/DaemonTools.cpp
-+++ b/test/unit/common/DaemonTools.cpp
-@@ -17,7 +17,9 @@
- #include <grp.h>
- #include <pwd.h>
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
-+#include <fstream>
- 
- #include "common/DaemonTools.h"
- #include "common/Exceptions.h"
-diff --git a/test/unit/common/JobStatusHandler.cpp b/test/unit/common/JobStatusHandler.cpp
-index 0e19bc3..691d34d 100644
---- a/test/unit/common/JobStatusHandler.cpp
-+++ b/test/unit/common/JobStatusHandler.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/JobStatusHandler.h"
- #include "db/generic/JobStatus.h"
-diff --git a/test/unit/common/Logger.cpp b/test/unit/common/Logger.cpp
-index a4dc4ce..92250a5 100644
---- a/test/unit/common/Logger.cpp
-+++ b/test/unit/common/Logger.cpp
-@@ -14,8 +14,10 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/filesystem.hpp>
-+#include <fstream>
- 
- #include "common/Logger.h"
- 
-diff --git a/test/unit/common/PidTools.cpp b/test/unit/common/PidTools.cpp
-index 7c52fbb..8ece63d 100644
---- a/test/unit/common/PidTools.cpp
-+++ b/test/unit/common/PidTools.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include "common/PidTools.h"
- 
- using namespace fts3::common;
-diff --git a/test/unit/common/ThreadPool.cpp b/test/unit/common/ThreadPool.cpp
-index 69f5876..0f43834 100644
---- a/test/unit/common/ThreadPool.cpp
-+++ b/test/unit/common/ThreadPool.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include <boost/any.hpp>
- 
-diff --git a/test/unit/common/Uri.cpp b/test/unit/common/Uri.cpp
-index 11d9aab..f9aa843 100644
---- a/test/unit/common/Uri.cpp
-+++ b/test/unit/common/Uri.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/Uri.h"
- 
-diff --git a/test/unit/common/UserProxyEnv.cpp b/test/unit/common/UserProxyEnv.cpp
-index 1059100..fe16fb2 100644
---- a/test/unit/common/UserProxyEnv.cpp
-+++ b/test/unit/common/UserProxyEnv.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/UserProxyEnv.h"
- 
-diff --git a/test/unit/common/panic.cpp b/test/unit/common/panic.cpp
-index 756608e..a4f8bc9 100644
---- a/test/unit/common/panic.cpp
-+++ b/test/unit/common/panic.cpp
-@@ -15,7 +15,8 @@
-  */
- 
- #include <signal.h>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/thread.hpp>
- 
- #include "common/panic.h"
-diff --git a/test/unit/config/ServerConfig.cpp b/test/unit/config/ServerConfig.cpp
-index 638422d..721123f 100644
---- a/test/unit/config/ServerConfig.cpp
-+++ b/test/unit/config/ServerConfig.cpp
-@@ -18,7 +18,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "common/Exceptions.h"
- #include "config/ServerConfig.h"
-diff --git a/test/unit/config/ServerConfigReader.cpp b/test/unit/config/ServerConfigReader.cpp
-index 571efd5..88768b7 100644
---- a/test/unit/config/ServerConfigReader.cpp
-+++ b/test/unit/config/ServerConfigReader.cpp
-@@ -18,8 +18,10 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/filesystem.hpp>
-+#include <fstream>
- 
- #include "common/Exceptions.h"
- #include "config/ServerConfigReader.h"
-diff --git a/test/unit/msg-bus/MsgBus.cpp b/test/unit/msg-bus/MsgBus.cpp
-index f6e0849..b61c257 100644
---- a/test/unit/msg-bus/MsgBus.cpp
-+++ b/test/unit/msg-bus/MsgBus.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/function.hpp>
- 
-diff --git a/test/unit/server/services/optimizer/Optimizer.cpp b/test/unit/server/services/optimizer/Optimizer.cpp
-index 55a403b..060eb2d 100644
---- a/test/unit/server/services/optimizer/Optimizer.cpp
-+++ b/test/unit/server/services/optimizer/Optimizer.cpp
-@@ -20,7 +20,8 @@
- 
- #include <boost/range/adaptor/map.hpp>
- #include <boost/range/algorithm/copy.hpp>
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- 
- #include "server/services/optimizer/Optimizer.h"
- #include "server/services/optimizer/OptimizerConstants.h"
-diff --git a/test/unit/url-copy/AutoInterruptThread.cpp b/test/unit/url-copy/AutoInterruptThread.cpp
-index ea8e393..1c16af4 100644
---- a/test/unit/url-copy/AutoInterruptThread.cpp
-+++ b/test/unit/url-copy/AutoInterruptThread.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include "url-copy/AutoInterruptThread.h"
- 
- 
-diff --git a/test/unit/url-copy/UrlCopyProcess.cpp b/test/unit/url-copy/UrlCopyProcess.cpp
-index 737cdbe..7a0e540 100644
---- a/test/unit/url-copy/UrlCopyProcess.cpp
-+++ b/test/unit/url-copy/UrlCopyProcess.cpp
-@@ -14,7 +14,8 @@
-  * limitations under the License.
-  */
- 
--#include <boost/test/included/unit_test.hpp>
-+#include <boost/test/unit_test_suite.hpp>
-+#include <boost/test/test_tools.hpp>
- #include "url-copy/UrlCopyProcess.h"
- 
- 
diff --git a/fts-include.patch b/fts-include.patch
new file mode 100644
index 0000000..261c549
--- /dev/null
+++ b/fts-include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/cli/MsgPrinter.h b/src/cli/MsgPrinter.h
+index 3c317396..714457ef 100644
+--- a/src/cli/MsgPrinter.h
++++ b/src/cli/MsgPrinter.h
+@@ -25,6 +25,7 @@
+ #include "JsonOutput.h"
+ #include "exception/cli_exception.h"
+ 
++#include <iostream>
+ #include <string>
+ #include <vector>
+ #include <ostream>
diff --git a/fts-subject.patch b/fts-subject.patch
deleted file mode 100644
index 5da40b5..0000000
--- a/fts-subject.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/server/services/webservice/ws/CGsiAdapter.cpp b/src/server/services/webservice/ws/CGsiAdapter.cpp
-index 3ff0eb3..33e9181 100644
---- a/src/server/services/webservice/ws/CGsiAdapter.cpp
-+++ b/src/server/services/webservice/ws/CGsiAdapter.cpp
-@@ -168,7 +168,9 @@ std::string CGsiAdapter::initHostDn()
-     if (!cert)
-         return std::string();
- 
--    dn = cert->name;
-+    char namebuf[2048];
-+    X509_NAME *name = X509_get_subject_name(cert);
-+    dn = X509_NAME_oneline(name, namebuf, sizeof(namebuf));
-     X509_free(cert);
- 
-     return dn;
-
diff --git a/fts-test-disable-snapshot.patch b/fts-test-disable-snapshot.patch
deleted file mode 100644
index 87ce715..0000000
--- a/fts-test-disable-snapshot.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/test/unit/cli/CMakeLists.txt b/test/unit/cli/CMakeLists.txt
-index 3327916..2e6732c 100644
---- a/test/unit/cli/CMakeLists.txt
-+++ b/test/unit/cli/CMakeLists.txt
-@@ -20,5 +20,3 @@ include_directories (${CMAKE_BINARY_DIR}/src/ws-ifce/gsoap)
- 
- add_subdirectory (rest)
- add_subdirectory (ui)
--
--define_test (Snapshot fts_cli_common)
-diff --git a/test/unit/cli/Snapshot.cpp b/test/unit/cli/Snapshot.cpp
-deleted file mode 100644
-index 32753c8..0000000
---- a/test/unit/cli/Snapshot.cpp
-+++ /dev/null
-@@ -1,100 +0,0 @@
--/*
-- * Copyright (c) CERN 2013-2015
-- *
-- * Copyright (c) Members of the EMI Collaboration. 2010-2013
-- *  See  http://www.eu-emi.eu/partners for details on the copyright
-- *  holders.
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- *    http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--#include <boost/test/unit_test_suite.hpp>
--#include <boost/test/test_tools.hpp>
--#include <boost/property_tree/json_parser.hpp>
--
--#include "cli/Snapshot.h"
--
--using fts3::cli::Snapshot;
--namespace pt = boost::property_tree;
--
--
--BOOST_AUTO_TEST_SUITE(cli)
--BOOST_AUTO_TEST_SUITE(SnapshotTest)
--
--
--static const std::string SNAPSHOT =
--    "{"
--    "   \"active\": 10,"
--    "   \"avg_queued\": 100,"
--    "   \"avg_throughput\": [ {\"15\": 15.1}, {\"5\": 5.3}, {\"30\": 30.2}, {\"60\": 60.4} ],"
--    "   \"dest_se\": \"srm://dst.desy.de\","
--    "   \"failed\": 5,"
--    "   \"finished\": 10,"
--    "   \"frequent_error\": [ {\"count\": 3}, {\"reason\": \"some error string\"} ],"
--    "   \"max_active\": 20,"
--    "   \"source_se\": \"srm://src.cern.ch\","
--    "   \"submitted\": 30,"
--    "   \"success_ratio\": 0.75,"
--    "   \"vo_name\": \"dteam\""
--    "}"
--;
--
--
--static std::string toString(const pt::ptree &out)
--{
--    std::stringstream stream;
--    pt::write_json(stream, out);
--    return stream.str();
--}
--
--
--static std::string getExpected(const std::string &json)
--{
--    std::stringstream stream;
--    // put the JSON message into stream
--    stream << json;
--    pt::ptree out;
--    // create a ptree from the stream
--    pt::read_json(stream, out);
--    // get the json from the ptree (this ensures white-spaces should be used in the same way as in result)
--    return toString(out);
--}
--
--
--BOOST_FIXTURE_TEST_CASE (SnapshotPrint, Snapshot)
--{
--    // prepare snapshot instance
--    vo = "dteam";
--    src_se = "srm://src.cern.ch";
--    dst_se = "srm://dst.desy.de";
--    active = 10;
--    max_active = 20;
--    failed = 5;
--    finished = 10;
--    submitted = 30;
--    avg_queued = 100;
--    _15 = 15.1;
--    _30 = 30.2;
--    _5  = 5.3;
--    _60 = 60.4;
--    success_ratio = 0.75;
--    frequent_error = std::make_pair(3, "some error string");
--    // print it to string
--    pt::ptree result;
--    print(result);
--    // check if the result matches the expected one
--    BOOST_CHECK_EQUAL(getExpected(SNAPSHOT), toString(result));
--}
--
--BOOST_AUTO_TEST_SUITE_END()
--BOOST_AUTO_TEST_SUITE_END()
diff --git a/fts-test-hostname.patch b/fts-test-hostname.patch
deleted file mode 100644
index 3454e2b..0000000
--- a/fts-test-hostname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/test/unit/common/Uri.cpp b/test/unit/common/Uri.cpp
-index f9aa843..3ebea13 100644
---- a/test/unit/common/Uri.cpp
-+++ b/test/unit/common/Uri.cpp
-@@ -65,17 +65,5 @@ BOOST_AUTO_TEST_CASE(lanTransfer)
- }
- 
- 
--BOOST_AUTO_TEST_CASE(hostname)
--{
--    char hostname[512];
--    FILE *hostnameFile = popen("/bin/hostname -f", "r");
--    fgets(hostname, sizeof(hostname), hostnameFile);
--    pclose(hostnameFile);
--    hostname[strlen(hostname) - 1] = '\0';
--
--    BOOST_CHECK_EQUAL(getFullHostname(), hostname);
--}
--
--
- BOOST_AUTO_TEST_SUITE_END()
- BOOST_AUTO_TEST_SUITE_END()
diff --git a/fts-test-submit-transfer.patch b/fts-test-submit-transfer.patch
deleted file mode 100644
index 3dc7c41..0000000
--- a/fts-test-submit-transfer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/cli/ui/SubmitTransferCli.cpp b/src/cli/ui/SubmitTransferCli.cpp
-index 824aba1..8cae813 100644
---- a/src/cli/ui/SubmitTransferCli.cpp
-+++ b/src/cli/ui/SubmitTransferCli.cpp
-@@ -38,9 +38,6 @@ SubmitTransferCli::SubmitTransferCli()
- {
-     delegate = true;
- 
--    /// 8 housrs in seconds
--    static const int eight_hours = 28800;
--
-     // by default we don't use checksum
-     checksum = false;
- 
-@@ -58,9 +55,9 @@ SubmitTransferCli::SubmitTransferCli()
-         ("source-token,S", po::value<std::string>(),
-             "The source space token or its description (for SRM 2.2 transfers).")
-         ("compare-checksums,K", "Compare checksums between source and destination.")
--        ("copy-pin-lifetime", po::value<int>()->implicit_value(eight_hours)->default_value(-1),
-+        ("copy-pin-lifetime", po::value<int>()->default_value(-1),
-             "Pin lifetime of the copy of the file (seconds), if the argument is not specified a default value of 28800 seconds (8 hours) is used.")
--        ("bring-online", po::value<int>()->implicit_value(eight_hours)->default_value(-1),
-+        ("bring-online", po::value<int>()->default_value(-1),
-             "Bring online timeout expressed in seconds, if the argument is not specified a default value of 28800 seconds (8 hours) is used.")
-         ("reuse,r", "enable session reuse for the transfer job")
-         ("multi-hop,m", "enable multi-hopping")
diff --git a/fts-unit-segv.patch b/fts-unit-segv.patch
deleted file mode 100644
index 21d2346..0000000
--- a/fts-unit-segv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/test/unit/cli/ui/SetCfgCli.cpp b/test/unit/cli/ui/SetCfgCli.cpp
-index 927c1dc..52b2d1b 100644
---- a/test/unit/cli/ui/SetCfgCli.cpp
-+++ b/test/unit/cli/ui/SetCfgCli.cpp
-@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_SUITE(SetCfgCliTest)
- BOOST_AUTO_TEST_CASE (SetCfgCliOverflow)
- {
-     SetCfgCli cli;
--    std::vector<std::string> argv{
-+    std::vector<const char*> argv{
-         "prog_name",
-         "-s",
-         "https://fts3-server:8080",
-@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (SetCfgCliOverflow)
- BOOST_AUTO_TEST_CASE (SetCfgCliBadLexicalCast)
- {
-     SetCfgCli cli;
--    std::vector<std::string> argv2 {
-+    std::vector<const char*> argv2 {
-         "prog_name",
-         "-s",
-         "https://fts3-server:8080",
-
diff --git a/fts.spec b/fts.spec
index 7f0b226..4ec95ea 100644
--- a/fts.spec
+++ b/fts.spec
@@ -9,26 +9,21 @@
 %endif
 
 Name:       fts
-Version:    3.5.7
-Release:    3%{?dist}
+Version:    3.6.3
+Release:    1%{?dist}
 Summary:    File Transfer Service V3
 Group:      System Environment/Daemons
 License:    ASL 2.0
 URL:        http://fts3-service.web.cern.ch/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  git clone https://gitlab.cern.ch/fts/fts3.git -b master --depth=1 fts-3.5.7
-#  cd fts-3.5.7
-#  git checkout v3.5.7
+#  git clone https://gitlab.cern.ch/fts/fts3.git -b master --depth=1 fts-3.6.3
+#  cd fts-3.6.3
+#  git checkout v3.6.3
 #  cd ..
-#  tar --exclude-vcs -vczf fts-3.5.7.tar.gz fts-3.5.7
+#  tar --exclude-vcs -vczf fts-3.6.3.tar.gz fts-3.6.3
 Source0: %{name}-%{version}.tar.gz
-Patch0:  fts-boost-unit-test.patch
-Patch1:  fts-subject.patch
-Patch2:  fts-test-disable-snapshot.patch
-Patch3:  fts-test-submit-transfer.patch
-Patch4:  fts-unit-segv.patch
-Patch5:  fts-test-hostname.patch
+Patch0:  %{name}-include.patch
 
 %if 0%{?el5}
 BuildRequires:  activemq-cpp-library
@@ -56,13 +51,10 @@ BuildRequires:  gfal2-devel >= 2.9.0
 BuildRequires:  glib2-devel
 BuildRequires:  globus-gsi-credential-devel
 BuildRequires:  gridsite-devel
-BuildRequires:  gsoap-devel
-BuildRequires:  json-c-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  openldap-devel
 BuildRequires:  protobuf-devel
 BuildRequires:  pugixml-devel
-BuildRequires:  python2-devel
 BuildRequires:  voms-devel
 BuildRequires:  checkpolicy, selinux-policy-devel, selinux-policy-doc 
 %if %systemd
@@ -201,11 +193,6 @@ The File Transfer Service V3 mysql plug-in
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 # Make sure the version in the spec file and the version used
@@ -320,7 +307,6 @@ exit 0
     /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 %else
     /sbin/chkconfig --add fts-info-publisher
-    /sbin/chkconfig --add fts-myosg-updater
     /sbin/chkconfig --add fts-bdii-cache-updater
 %endif
 exit 0
@@ -329,17 +315,13 @@ exit 0
 if [ $1 -eq 0 ] ; then
 %if %systemd
     /bin/systemctl stop fts-info-publisher.service > /dev/null 2>&1 || :
-    /bin/systemctl stop fts-myosg-updater.service > /dev/null 2>&1 || :
     /bin/systemctl stop fts-bdii-cache-updater.service > /dev/null 2>&1 || :
     /bin/systemctl --no-reload disable fts-info-publisher.service > /dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable fts-myosg-updater.service > /dev/null 2>&1 || :
     /bin/systemctl --no-reload disable fts-bdii-cache-updater.service > /dev/null 2>&1 || :
 %else
     /sbin/service fts-info-publisher stop >/dev/null 2>&1
-    /sbin/service fts-myosg-updater stop >/dev/null 2>&1
     /sbin/service fts-bdii-cache-updater stop >/dev/null 2>&1
     /sbin/chkconfig --del fts-info-publisher
-    /sbin/chkconfig --del fts-myosg-updater
     /sbin/chkconfig --del fts-bdii-cache-updater
 %endif
 fi
@@ -457,26 +439,20 @@ fi
 %files infosys
 %{_sbindir}/fts_bdii_cache_updater
 %{_sbindir}/fts_info_publisher
-%{_sbindir}/fts_myosg_updater
 %config(noreplace) %attr(0644,fts3,root) %{_var}/lib/fts3/bdii_cache.xml
-%config(noreplace) %attr(0644,fts3,root) %{_var}/lib/fts3/myosg.xml
 
 %if %systemd
 %attr(0644,root,root) %{_unitdir}/fts-info-publisher.service
-%attr(0644,root,root) %{_unitdir}/fts-myosg-updater.service
 %attr(0644,root,root) %{_unitdir}/fts-bdii-cache-updater.service
 %else
 %attr(0755,root,root) %{_initddir}/fts-info-publisher
-%attr(0755,root,root) %{_initddir}/fts-myosg-updater
 %attr(0755,root,root) %{_initddir}/fts-bdii-cache-updater
 %endif
 
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/fts-info-publisher
-%attr(0755,root,root) %{_sysconfdir}/cron.daily/fts-myosg-updater
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/fts-bdii-cache-updater
 %{_mandir}/man8/fts_bdii_cache_updater.8.gz
 %{_mandir}/man8/fts_info_publisher.8.gz
-%{_mandir}/man8/fts_myosg_updater.8.gz
 
 %files msg
 %{_sbindir}/fts_msg_bulk
@@ -501,13 +477,8 @@ fi
 %{_libdir}/libfts_db_generic.so*
 %{_libdir}/libfts_msg_ifce.so*
 %{_libdir}/libfts_proxy.so*
-%{_libdir}/libfts_server_gsoap_transfer.so*
 %{_libdir}/libfts_server_lib.so*
 %{_libdir}/libfts_cli_common.so*
-%{_libdir}/libfts_ws_ifce_client.so*
-%{_libdir}/libfts_ws_ifce_server.so*
-%{_libdir}/libfts_delegation_api_simple.so*
-%{_libdir}/libfts_delegation_api_cpp.so*
 %{_libdir}/libfts_msg_bus.so*
 %{_libdir}/libfts_url_copy.so*
 %doc README.md
@@ -527,6 +498,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:./build/test/unit
 ./build/test/unit/unit --log_level=all --report_level=detailed
 
 %changelog
+* Mon Feb 20 2017  Alejandro Alvarez Ayllon <aalvarez@cern.ch> - 3.6.3-1
+- New upstream release
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild