Skip to content

Commit

Permalink
Merge pull request #690
Browse files Browse the repository at this point in the history
include Droplet as subtree with squashed history
  • Loading branch information
arogge committed Dec 14, 2020
2 parents bdd4869 + 86036dd commit d32e9b1
Show file tree
Hide file tree
Showing 223 changed files with 59,341 additions and 5 deletions.
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

36 changes: 36 additions & 0 deletions core/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,42 @@ Permission is granted to anyone to use this software for any purpose, including
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

i)
We included the Scality Droplet source code which is released under the BSD License and uses this abbreviated license term:

* Copyright (C) 2010 SCALITY SA. All rights reserved.
* http://www.scality.com
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY SCALITY SA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL SCALITY SA OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
* official policies, either expressed or implied, of SCALITY SA.
*
* https://github.com/scality/Droplet


===========================================

2.
Expand Down
1 change: 0 additions & 1 deletion core/src/droplet
Submodule droplet deleted from 19beaf
44 changes: 44 additions & 0 deletions core/src/droplet/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.*.sw*
*.o
*.lo
*.a
*.gcno
*.gcda
*.la
Makefile.in
Makefile
aclocal.m4
autom4te.cache
chunk
compile
configure.in
configure
config.*
depcomp
droplet-1.0.pc
droplet-3.0.pc
examples/idrangetest
examples/idtest
examples/srwskey
install-sh
missing
stamp-h1
libdroplet/cdmi/.dirstamp
libdroplet/s3/.dirstamp
libdroplet/src/.dirstamp
libtool
ltmain.sh
m4/lt*
m4/libtool.m4
examples/recurse
tests/test_req
tests/dpl_perf_test
tools/dplsh
.deps
.libs
libdroplet.spec
ylwrap
.dirstamp
cscope.out
html/
test-driver
1 change: 1 addition & 0 deletions core/src/droplet/AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Vianney Rancurel
48 changes: 48 additions & 0 deletions core/src/droplet/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2020-2020 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
# License as published by the Free Software Foundation and included
# in the file LICENSE.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")

message(STATUS "Try to configure LibDroplet")
list(APPEND CMAKE_MESSAGE_INDENT " ")

cmake_minimum_required(VERSION 3.0)
project(droplet C)

set(default_build_type "Debug")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

include(FindLibXml2)
include(Findjsonc)
include(FindOpenSSL)

if(${JSONC_FOUND}
AND ${OPENSSL_FOUND}
AND ${LIBXML2_FOUND}
)
add_subdirectory(libdroplet)
message(STATUS "LibDroplet ready to be built")
else()
message(STATUS "LibDroplet not configured to be built")
endif(
${JSONC_FOUND}
AND ${OPENSSL_FOUND}
AND ${LIBXML2_FOUND}
)

list(REMOVE_AT CMAKE_MESSAGE_INDENT -1)
33 changes: 33 additions & 0 deletions core/src/droplet/COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2010 SCALITY SA. All rights reserved.
* http://www.scality.com
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY SCALITY SA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL SCALITY SA OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
* official policies, either expressed or implied, of SCALITY SA.
*
* https://github.com/scality/Droplet
*/
Empty file added core/src/droplet/ChangeLog
Empty file.
Loading

0 comments on commit d32e9b1

Please sign in to comment.