Skip to content

Commit 06cb3ea

Browse files
authored
Merge pull request bareos#1790
Add droplet compatible storage backend
2 parents 4a22055 + 31cac50 commit 06cb3ea

File tree

140 files changed

+5063
-1291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+5063
-1291
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
- add openssl 3 ulc [PR #1683]
1010
- Add backport tool [PR #1639]
1111
- Add FreeBSD 13.3 and 14.0 [PR #1765]
12+
- Add droplet compatible storage backend [PR #1790]
1213

1314
### Changed
1415
- github actions: PyPi: install setuptools [PR #1589]
@@ -259,6 +260,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
259260
[PR #1787]: https://github.com/bareos/bareos/pull/1787
260261
[PR #1788]: https://github.com/bareos/bareos/pull/1788
261262
[PR #1789]: https://github.com/bareos/bareos/pull/1789
263+
[PR #1790]: https://github.com/bareos/bareos/pull/1790
262264
[PR #1793]: https://github.com/bareos/bareos/pull/1793
263265
[PR #1795]: https://github.com/bareos/bareos/pull/1795
264266
[PR #1805]: https://github.com/bareos/bareos/pull/1805

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ include(BareosGetDistInfo)
122122
include(BareosCopyDllsToBinDir)
123123
include(RemoveNDebugFlag)
124124
include(ForceOption)
125+
125126
set(BUILDNAME
126127
"${BAREOS_FULL_VERSION}"
127128
CACHE STRING "site name variable for CDash"

LICENSE.txt

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,6 +2010,158 @@ License: Other
20102010
source code, you may redistribute such embedded portions in such object form
20112011
without including the above copyright and permission notices.
20122012

2013+
Files:
2014+
third-party/Microsoft.GSL/*
2015+
Copyright: 2015 Microsoft Corporation.
2016+
License: MIT
2017+
Copyright (c) 2015 Microsoft Corporation. All rights reserved.
2018+
2019+
This code is licensed under the MIT License (MIT).
2020+
.
2021+
Permission is hereby granted, free of charge, to any person obtaining a copy
2022+
of this software and associated documentation files (the "Software"), to deal
2023+
in the Software without restriction, including without limitation the rights
2024+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
2025+
of the Software, and to permit persons to whom the Software is furnished to do
2026+
so, subject to the following conditions:
2027+
.
2028+
The above copyright notice and this permission notice shall be included in all
2029+
copies or substantial portions of the Software.
2030+
.
2031+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2032+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2033+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2034+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2035+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2036+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2037+
THE SOFTWARE.
2038+
2039+
Files:
2040+
third-party/tl-expected/*
2041+
Copyright: see license text
2042+
License: Other
2043+
Creative Commons Legal Code
2044+
.
2045+
CC0 1.0 Universal
2046+
.
2047+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
2048+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
2049+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
2050+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
2051+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
2052+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
2053+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
2054+
HEREUNDER.
2055+
.
2056+
Statement of Purpose
2057+
.
2058+
The laws of most jurisdictions throughout the world automatically confer
2059+
exclusive Copyright and Related Rights (defined below) upon the creator
2060+
and subsequent owner(s) (each and all, an "owner") of an original work of
2061+
authorship and/or a database (each, a "Work").
2062+
.
2063+
Certain owners wish to permanently relinquish those rights to a Work for
2064+
the purpose of contributing to a commons of creative, cultural and
2065+
scientific works ("Commons") that the public can reliably and without fear
2066+
of later claims of infringement build upon, modify, incorporate in other
2067+
works, reuse and redistribute as freely as possible in any form whatsoever
2068+
and for any purposes, including without limitation commercial purposes.
2069+
These owners may contribute to the Commons to promote the ideal of a free
2070+
culture and the further production of creative, cultural and scientific
2071+
works, or to gain reputation or greater distribution for their Work in
2072+
part through the use and efforts of others.
2073+
.
2074+
For these and/or other purposes and motivations, and without any
2075+
expectation of additional consideration or compensation, the person
2076+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
2077+
is an owner of Copyright and Related Rights in the Work, voluntarily
2078+
elects to apply CC0 to the Work and publicly distribute the Work under its
2079+
terms, with knowledge of his or her Copyright and Related Rights in the
2080+
Work and the meaning and intended legal effect of CC0 on those rights.
2081+
.
2082+
1. Copyright and Related Rights. A Work made available under CC0 may be
2083+
protected by copyright and related or neighboring rights ("Copyright and
2084+
Related Rights"). Copyright and Related Rights include, but are not
2085+
limited to, the following:
2086+
.
2087+
i. the right to reproduce, adapt, distribute, perform, display,
2088+
communicate, and translate a Work;
2089+
ii. moral rights retained by the original author(s) and/or performer(s);
2090+
iii. publicity and privacy rights pertaining to a person's image or
2091+
likeness depicted in a Work;
2092+
iv. rights protecting against unfair competition in regards to a Work,
2093+
subject to the limitations in paragraph 4(a), below;
2094+
v. rights protecting the extraction, dissemination, use and reuse of data
2095+
in a Work;
2096+
vi. database rights (such as those arising under Directive 96/9/EC of the
2097+
European Parliament and of the Council of 11 March 1996 on the legal
2098+
protection of databases, and under any national implementation
2099+
thereof, including any amended or successor version of such
2100+
directive); and
2101+
vii. other similar, equivalent or corresponding rights throughout the
2102+
world based on applicable law or treaty, and any national
2103+
implementations thereof.
2104+
.
2105+
2. Waiver. To the greatest extent permitted by, but not in contravention
2106+
of, applicable law, Affirmer hereby overtly, fully, permanently,
2107+
irrevocably and unconditionally waives, abandons, and surrenders all of
2108+
Affirmer's Copyright and Related Rights and associated claims and causes
2109+
of action, whether now known or unknown (including existing as well as
2110+
future claims and causes of action), in the Work (i) in all territories
2111+
worldwide, (ii) for the maximum duration provided by applicable law or
2112+
treaty (including future time extensions), (iii) in any current or future
2113+
medium and for any number of copies, and (iv) for any purpose whatsoever,
2114+
including without limitation commercial, advertising or promotional
2115+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
2116+
member of the public at large and to the detriment of Affirmer's heirs and
2117+
successors, fully intending that such Waiver shall not be subject to
2118+
revocation, rescission, cancellation, termination, or any other legal or
2119+
equitable action to disrupt the quiet enjoyment of the Work by the public
2120+
as contemplated by Affirmer's express Statement of Purpose.
2121+
.
2122+
3. Public License Fallback. Should any part of the Waiver for any reason
2123+
be judged legally invalid or ineffective under applicable law, then the
2124+
Waiver shall be preserved to the maximum extent permitted taking into
2125+
account Affirmer's express Statement of Purpose. In addition, to the
2126+
extent the Waiver is so judged Affirmer hereby grants to each affected
2127+
person a royalty-free, non transferable, non sublicensable, non exclusive,
2128+
irrevocable and unconditional license to exercise Affirmer's Copyright and
2129+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
2130+
maximum duration provided by applicable law or treaty (including future
2131+
time extensions), (iii) in any current or future medium and for any number
2132+
of copies, and (iv) for any purpose whatsoever, including without
2133+
limitation commercial, advertising or promotional purposes (the
2134+
"License"). The License shall be deemed effective as of the date CC0 was
2135+
applied by Affirmer to the Work. Should any part of the License for any
2136+
reason be judged legally invalid or ineffective under applicable law, such
2137+
partial invalidity or ineffectiveness shall not invalidate the remainder
2138+
of the License, and in such case Affirmer hereby affirms that he or she
2139+
will not (i) exercise any of his or her remaining Copyright and Related
2140+
Rights in the Work or (ii) assert any associated claims and causes of
2141+
action with respect to the Work, in either case contrary to Affirmer's
2142+
express Statement of Purpose.
2143+
.
2144+
4. Limitations and Disclaimers.
2145+
.
2146+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
2147+
surrendered, licensed or otherwise affected by this document.
2148+
b. Affirmer offers the Work as-is and makes no representations or
2149+
warranties of any kind concerning the Work, express, implied,
2150+
statutory or otherwise, including without limitation warranties of
2151+
title, merchantability, fitness for a particular purpose, non
2152+
infringement, or the absence of latent or other defects, accuracy, or
2153+
the present or absence of errors, whether or not discoverable, all to
2154+
the greatest extent permissible under applicable law.
2155+
c. Affirmer disclaims responsibility for clearing rights of other persons
2156+
that may apply to the Work or any use thereof, including without
2157+
limitation any person's Copyright and Related Rights in the Work.
2158+
Further, Affirmer disclaims responsibility for obtaining any necessary
2159+
consents, permissions or other rights required for any use of the
2160+
Work.
2161+
d. Affirmer understands and acknowledges that Creative Commons is not a
2162+
party to this document and has no duty or obligation with respect to
2163+
this CC0 or use of the Work.
2164+
20132165
Files:
20142166
third-party/utf8cpp/*
20152167
Copyright: see license text

cmake/BareosCpmPackages.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,28 @@ CPMAddPackage(
5252
OPTIONS "BUILD_SHARED_LIBS OFF"
5353
)
5454

55+
CPMAddPackage(
56+
NAME Microsoft.GSL
57+
VERSION "4.0.0"
58+
GITHUB_REPOSITORY "microsoft/GSL"
59+
EXCLUDE_FROM_ALL
60+
)
61+
62+
CPMAddPackage(
63+
NAME tl-expected
64+
VERSION "1.0.0"
65+
GITHUB_REPOSITORY "TartanLlama/expected"
66+
GIT_TAG "v1.1.0"
67+
DOWNLOAD_ONLY YES
68+
)
69+
if(tl-expected_ADDED)
70+
add_library(expected INTERFACE)
71+
target_include_directories(
72+
expected INTERFACE ${CPM_PACKAGE_tl-expected_SOURCE_DIR}/include
73+
)
74+
add_library(tl::expected ALIAS expected)
75+
endif()
76+
5577
CPMAddPackage(
5678
NAME utf8cpp
5779
VERSION 2.3.4

contrib/misc/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
# 02110-1301, USA.
1919

2020
add_subdirectory(bsmc)
21+
add_subdirectory(chunk_check)
2122
add_subdirectory(triggerjob)
2223
add_subdirectory(reschedule_job_as_full)
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# BAREOS® - Backup Archiving REcovery Open Sourced
2+
#
3+
# Copyright (C) 2024 Bareos GmbH & Co. KG
4+
#
5+
# This program is Free Software; you can redistribute it and/or
6+
# modify it under the terms of version three of the GNU Affero General Public
7+
# License as published by the Free Software Foundation and included
8+
# in the file LICENSE.
9+
#
10+
# This program is distributed in the hope that it will be useful, but
11+
# WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
# Affero General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU Affero General Public License
16+
# along with this program; if not, write to the Free Software
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18+
# 02110-1301, USA.
19+
20+
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
21+
22+
install(
23+
FILES chunk_check.py
24+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
25+
WORLD_READ WORLD_EXECUTE
26+
DESTINATION "${bindir}"
27+
)

0 commit comments

Comments
 (0)