15 files changed, 267 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..01da890
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,26 @@
+opentracing-cpp (1.6.0-4) unstable; urgency=medium
+
+  * Fix build on riscv64. Thanks to Eric Long! (Closes: #1019062)
+  * Update standards version to 4.6.1.0
+
+ -- Stephen Gelman <ssgelm@debian.org>  Tue, 11 Oct 2022 16:20:18 -0500
+
+opentracing-cpp (1.6.0-3) unstable; urgency=medium
+
+  [ Luca Falavigna ]
+  * debian/patches/catch_SIGSTKSZ.patch:
+    - Fix FTBFS with glibc 2.34 (Closes: #1017132).
+
+ -- Stephen Gelman <ssgelm@debian.org>  Tue, 30 Aug 2022 14:01:20 -0500
+
+opentracing-cpp (1.6.0-2) unstable; urgency=medium
+
+  * Upload to unstable
+
+ -- Stephen Gelman <ssgelm@debian.org>  Sun, 07 Nov 2021 00:42:53 -0500
+
+opentracing-cpp (1.6.0-1) experimental; urgency=medium
+
+  * Initial release (Closes: #991193)
+
+ -- Stephen Gelman <ssgelm@debian.org>  Wed, 14 Jul 2021 11:52:00 -0500
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b7eda6b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,28 @@
+Source: opentracing-cpp
+Priority: optional
+Maintainer: Stephen Gelman <ssgelm@debian.org>
+Build-Depends: debhelper-compat (= 13),
+               cmake,
+Standards-Version: 4.6.1.0
+Section: libs
+Homepage: https://github.com/opentracing/opentracing-cpp/
+Vcs-Browser: https://salsa.debian.org/ssgelm/opentracing-cpp
+Vcs-Git: https://salsa.debian.org/ssgelm/opentracing-cpp.git
+Rules-Requires-Root: no
+
+Package: libopentracing-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: libopentracing1 (= ${binary:Version}), ${misc:Depends}
+Description: OpenTracing API for C++ Dev Libraries
+ C++ implementation of the OpenTracing API see http://opentracing.io
+ for additional information. Library is in libopentracing1
+
+Package: libopentracing1
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenTracing API for C++
+ C++ implementation of the OpenTracing API see http://opentracing.io
+ for additional information
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..1ba432e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,119 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: opentracing-cpp
+Source: https://github.com/opentracing/opentracing-cpp
+
+Files: *
+Copyright: 2016-2021 The OpenTracing Authors
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2021 Stephen Gelman <ssgelm@debian.org>
+License: Expat
+
+Files: 3rd_party/include/opentracing/catch2/*
+Copyright: 2017 Two Blue Cubes Ltd.
+License: BSL-1.0
+
+Files: 3rd_party/include/opentracing/expected/*
+Copyright: 2016 Martin Moene
+License: Expat
+
+Files: 3rd_party/include/opentracing/variant/*
+Copyright: MapBox
+License: BSD-3-Clause
+
+Files: 3rd_party/include/opentracing/variant/recursive_wrapper.hpp
+Copyright: 2002-2003 Eric Friedman
+           2002-2003 Itay Maman
+License: BSL-1.0
+
+Files: mocktracer/src/base64.cpp
+Copyright: 2016-2017 Lyft Inc.
+License: Apache-2.0
+
+License: Apache-2.0
+ 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.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or
+ organization obtaining a copy of the software and accompanying
+ documentation covered by this license (the "Software") to use,
+ reproduce, display, distribute, execute, and transmit the Software,
+ and to prepare derivative works of the Software, and to permit
+ third-parties to whom the Software is furnished to do so, all
+ subject to the following:
+ .
+ The copyright notices in the Software and this entire statement,
+ including the above license grant, this restriction and the
+ following disclaimer, must be included in all copies of the
+ Software, in whole or in part, and all derivative works of the
+ Software, unless such copies or derivative works are solely in the
+ form of machine-executable object code generated by a source
+ language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE
+ DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
+ LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: BSD-3-Clause
+ 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.
+ - Neither the name "MapBox" nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER 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.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libopentracing-dev.install b/debian/libopentracing-dev.install
new file mode 100644
index 0000000..a20bb42
--- /dev/null
+++ b/debian/libopentracing-dev.install
@@ -0,0 +1,4 @@
+usr/include/opentracing/*
+usr/lib/*/cmake/OpenTracing/*
+usr/lib/*/*.a
+usr/lib/*/*.so
diff --git a/debian/libopentracing-dev.lintian-overrides b/debian/libopentracing-dev.lintian-overrides
new file mode 100644
index 0000000..68a895f
--- /dev/null
+++ b/debian/libopentracing-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Upstream source file
+national-encoding [usr/include/opentracing/expected/expected.hpp]
diff --git a/debian/libopentracing1.install b/debian/libopentracing1.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libopentracing1.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/libopentracing1.lintian-overrides b/debian/libopentracing1.lintian-overrides
new file mode 100644
index 0000000..c2aad95
--- /dev/null
+++ b/debian/libopentracing1.lintian-overrides
@@ -0,0 +1,6 @@
+# Symbols are not very useful for C++. See:
+# http://wiki.debian.org/UsingSymbolsFiles#See_also
+no-symbols-control-file usr/lib/x86_64-linux-gnu/libopentracing.so.1.6.0
+# Symbols are not very useful for C++. See:
+# http://wiki.debian.org/UsingSymbolsFiles#See_also
+no-symbols-control-file usr/lib/x86_64-linux-gnu/libopentracing_mocktracer.so.1.6.0
diff --git a/debian/patches/catch_SIGSTKSZ.patch b/debian/patches/catch_SIGSTKSZ.patch
new file mode 100644
index 0000000..8f0765a
--- /dev/null
+++ b/debian/patches/catch_SIGSTKSZ.patch
@@ -0,0 +1,40 @@
+Index: opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp
+===================================================================
+--- opentracing-cpp-1.6.0.orig/3rd_party/include/opentracing/catch2/catch.hpp
++++ opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp
+@@ -6571,6 +6571,17 @@ namespace Catch {
+         int id;
+         const char* name;
+     };
++
++    // 32kb for the alternate stack seems to be sufficient. However, this value
++    // is experimentally determined, so that's not guaranteed.
++    #if defined(_SC_SIGSTKSZ_SOURCE) || defined(_GNU_SOURCE)
++        // on glibc > 2.33 this is no longer constant, see
++        // https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=85e84fe53699fe9e392edffa993612ce08b2954a;hb=HEAD
++        static constexpr std::size_t altStackSize = 32 * 1024;
++    #else
++        static constexpr std::size_t altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), 32 * 1024)
++    #endif
++
+     static SignalDefs signalDefs[] = {
+         { SIGINT,  "SIGINT - Terminal interrupt signal" },
+         { SIGILL,  "SIGILL - Illegal instruction signal" },
+@@ -6597,7 +6608,7 @@ namespace Catch {
+         isSet = true;
+         stack_t sigStack;
+         sigStack.ss_sp = altStackMem;
+-        sigStack.ss_size = SIGSTKSZ;
++        sigStack.ss_size = altStackSize;
+         sigStack.ss_flags = 0;
+         sigaltstack(&sigStack, &oldSigStack);
+         struct sigaction sa = { };
+@@ -6628,7 +6639,7 @@ namespace Catch {
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++    char FatalConditionHandler::altStackMem[altStackSize] = {};
+ 
+ } // namespace Catch
+ 
diff --git a/debian/patches/riscv64-link-libatomic.patch b/debian/patches/riscv64-link-libatomic.patch
new file mode 100644
index 0000000..42bf93f
--- /dev/null
+++ b/debian/patches/riscv64-link-libatomic.patch
@@ -0,0 +1,15 @@
+Description: Link libatomic on riscv64 and fix FTBFS
+Author: Eric Long <i@hack3r.moe>
+Last-Update: 2022-09-03
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,6 +155,9 @@
+   list(APPEND LIBRARIES ${CMAKE_DL_LIBS})
+ endif()
+ 
++if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
++  list(APPEND LIBRARIES atomic)
++endif()
+ 
+ if (BUILD_SHARED_LIBS)
+   add_library(opentracing SHARED ${SRCS})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12a004c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+catch_SIGSTKSZ.patch
+riscv64-link-libatomic.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..df82893
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..9277f30
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,7 @@
+Bug-Database: https://github.com/opentracing/opentracing-cpp/issues
+Bug-Submit: https://github.com/opentracing/opentracing-cpp/issues/new
+Changelog: https://github.com/opentracing/opentracing-cpp/blob/master/ChangeLog
+Documentation: https://opentracing.io/docs/
+FAQ: https://opentracing.io/docs/faq/
+Repository: https://github.com/opentracing/opentracing-cpp/
+Repository-Browse: https://github.com/opentracing/opentracing-cpp/
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1d9ea2c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=4
+
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%opentracing-cpp-$1.tar.gz%" \
+   https://github.com/opentracing/opentracing-cpp/tags \
+   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate