From 6c44cd62c1afc797a674600ff512920d70e4679a Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 9 Jan 2021 13:39:15 +0000 Subject: [PATCH] Import restinio_0.6.13-1+rpi1.debian.tar.xz [dgit import tarball restinio 0.6.13-1+rpi1 restinio_0.6.13-1+rpi1.debian.tar.xz] --- changelog | 47 ++++++ control | 32 ++++ copyright | 217 +++++++++++++++++++++++++++ gbp.conf | 7 + patches/0001-INTERFACE-fmt-fmt.patch | 21 +++ patches/0002-Include-clara.patch | 21 +++ patches/series | 2 + rules | 41 +++++ salsa-ci.yml | 4 + source/format | 1 + watch | 2 + 11 files changed, 395 insertions(+) create mode 100644 changelog create mode 100644 control create mode 100644 copyright create mode 100644 gbp.conf create mode 100644 patches/0001-INTERFACE-fmt-fmt.patch create mode 100644 patches/0002-Include-clara.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 salsa-ci.yml create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..e5ffe10 --- /dev/null +++ b/changelog @@ -0,0 +1,47 @@ +restinio (0.6.13-1+rpi1) bullseye-staging; urgency=medium + + * Link with libatomic on armhf too for Raspbian. + + -- Peter Michael Green Sat, 09 Jan 2021 13:39:15 +0000 + +restinio (0.6.13-1) unstable; urgency=medium + + * Team upload. + * New upstream version. + + -- Alexandre Viau Mon, 04 Jan 2021 11:26:26 -0500 + +restinio (0.6.6-3) unstable; urgency=medium + + * Link atomic on a few architectures (Closes: #960824) + Thanks to Adrian Bunk. + * Disable tests (avoid internet access). + + -- Felix Salfelder Mon, 19 Oct 2020 08:51:24 +0100 + +restinio (0.6.6-2) unstable; urgency=medium + + [ Felix Salfelder ] + * add dependencies on http-parser and fmt (Closes: #968454) + + -- Sebastien Delafond Mon, 31 Aug 2020 09:02:31 +0200 + +restinio (0.6.6-1) unstable; urgency=medium + + [ Sébastien Delafond ] + * Build-depend on cmake + * Add debian/watch + * Clean up d/rules + * Enable tests and samples, with extra build-depends + * New upstream version 0.6.6 + * Add basic d/salsa-ci.yml + + -- Sebastien Delafond Thu, 07 May 2020 15:51:22 +0200 + +restinio (0.6.4-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #946832) + * TODO: why does it have build depends, + possible cmake ma{gic,dness}? + + -- Felix Salfelder Sun, 16 Feb 2020 19:07:44 +0000 diff --git a/control b/control new file mode 100644 index 0000000..b3df740 --- /dev/null +++ b/control @@ -0,0 +1,32 @@ +Source: restinio +Priority: optional +Maintainer: Felix Salfelder +Build-Depends: catch2, + cmake, + debhelper-compat (= 12), + libasio-dev, + libboost-dev, + libboost-regex-dev, + libfmt-dev, + libhttp-parser-dev, + libpcre++-dev, + libpcre2-dev, + libssl-dev, + zlib1g-dev +Standards-Version: 4.5.0 +Section: libs +Homepage: https://github.com/Stiffstream/restinio +Vcs-Browser: https://salsa.debian.org/debian/restinio +Vcs-Git: https://salsa.debian.org/debian/restinio.git +Rules-Requires-Root: no + +Package: librestinio-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libfmt-dev, libhttp-parser-dev, ${misc:Depends} +Description: restinio implements an embedded HTTP/Websocket server + It is based on standalone version of ASIO and targeted primarily for + asynchronous processing of HTTP-requests. + Since v.0.4.1 Boost::ASIO (1.66 or higher) is also supported + This package contains a header-only C++14 library. diff --git a/copyright b/copyright new file mode 100644 index 0000000..936b38a --- /dev/null +++ b/copyright @@ -0,0 +1,217 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: restinio +Upstream-Contact: info@stiffstream.com +Source: https://github.com/Stiffstream/restinio + +Files: * +Copyright: (c) 2017-2020 Stiffstream . All rights reserved. +License: BSD-3-Clause + +Files: dev/restinio/third_party/zlib/* +Copyright: 1995-2017 Jean-loup Gailly and Mark Adler +License: Zlib + +Files: dev/restinio/third_party/zlib/contrib/masmx64/inffas8664.c +Copyright: 1995-2003 Mark Adler, 2003 Chris Anderson +License: Zlib + +Files: dev/restinio/third_party/zlib/contrib/masmx64/gvmat64.asm +Copyright: 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant +License: Zlib + +Files: dev/restinio/third_party/zlib/contrib/asm686/match.S +Copyright: 998, 2007 Brian Raiter +License: Zlib + +Files: dev/restinio/third_party/variant-lite/variant.hpp dev/restinio/third_party/optional-lite/optional.hpp dev/so_5/3rd_party/optional-lite/nonstd/optional.hpp dev/restinio/third_party/string-view-lite/string_view.hpp +Copyright: 2014-2018 Martin Moene +License: BSL-1.0 + +Files: dev/restinio/third_party/expected-lite/expected.hpp +Copyright: 2016-2018 Martin Moene +License: BSL-1.0 + +Files: dev/asio/* +Copyright: 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com) +License: BSL-1.0 + +Files: dev/asio/include/asio/serial_port_base.hpp dev/asio/include/asio/detail/win_iocp_serial_port_service.hpp dev/asio/include/asio/detail/win_iocp_handle_service.hpp dev/asio/include/asio/detail/reactive_serial_port_service.hpp dev/asio/include/asio/detail/win_iocp_handle_read_op.hpp dev/asio/include/asio/detail/impl/win_iocp_serial_port_service.ipp dev/asio/include/asio/detail/impl/reactive_serial_port_service.ipp dev/asio/include/asio/detail/impl/win_iocp_handle_service.ipp dev/asio/include/asio/detail/win_iocp_handle_write_op.hpp dev/asio/include/asio/serial_port.hpp dev/asio/include/asio/basic_serial_port.hpp dev/asio/include/asio/impl/serial_port_base.hpp dev/asio/include/asio/impl/serial_port_base.ipp +Copyright: 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) +License: BSL-1.0 + +Files: dev/asio/include/asio/detail/eventfd_select_interrupter.hpp dev/asio/include/asio/detail/impl/eventfd_select_interrupter.ipp +Copyright: 2008 Roelof Naude (roelof.naude at gmail dot com) +License: BSL-1.0 + +Files: dev/asio/include/asio/detail/kqueue_reactor.hpp dev/asio/include/asio/detail/impl/kqueue_reactor.ipp dev/asio/include/asio/detail/impl/kqueue_reactor.hpp +Copyright: 2005 Stefan Arentz (stefan at soze dot com) +License: BSL-1.0 + +Files: dev/asio/include/asio/detail/impl/win_object_handle_service.ipp dev/asio/include/asio/detail/win_object_handle_service.hpp dev/asio/include/asio/windows/basic_object_handle.hpp dev/asio/include/asio/windows/object_handle.hpp +Copyright: 2011 Boris Schaeling (boris@highscore.de) +License: BSL-1.0 + +Files: dev/asio/include/asio/ssl/detail/impl/openssl_init.ipp dev/asio/include/asio/ssl/impl/context.hpp dev/asio/include/asio/ssl/impl/context.ipp +Copyright: 2005 Voipster / Indrek dot Juhani at voipster dot com +License: BSL-1.0 + +Files: dev/asio/include/asio/ip/network_v4.hpp dev/asio/include/asio/ip/impl/network_v4.ipp dev/asio/include/asio/ip/impl/network_v4.hpp dev/asio/include/asio/ip/impl/network_v6.ipp dev/asio/include/asio/ip/network_v6.hpp +Copyright: 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) +License: BSL-1.0 + +Files: dev/fmt/* +Copyright: 2012 - present, Victor Zverovich and fmt contributors +License: MIT + +Files: dev/fmt/support/docopt.py +Copyright: 2013 Vladimir Keleshev, vladimir@keleshev.com +License: MIT + +Files: dev/fmt/include/fmt/chrono.h +Copyright: Paul Dreik 2019 +License: MIT + +Files: dev/fmt/include/fmt/ranges.h +Copyright: 2018 - present, Remotion (Igor Schulz) +License: MIT + +Files: dev/cmake/modules/FindPCRE.cmake +Copyright: 2007-2009 LuaDist +License: MIT + +Files: dev/nodejs/* +Copyright: Joyent, Inc. and other Node contributors. All rights reserved. +License: MIT + +Files: dev/rapidjson/* +Copyright: 2015 THL A29 Limited, a Tencent company, and Milo Yip +License: MIT + +Files: dev/rapidjson/include/rapidjson/msinttypes/inttypes.h dev/rapidjson/include/rapidjson/msinttypes/stdint.h +Copyright: 2006-2013 Alexander Chemeris +License: BSL-1.0 + +Files: dev/catch2/* dev/clara/clara.hpp dev/catch2/catch.hpp +Copyright: 2014-2019 Two Blue Cubes Ltd +License: BSL-1.0 + +Files: dev/catch2/catch_reporter_sonarqube.hpp +Copyright: Social Point SL +License: BSL-1.0 + +Files: dev/catch2/catch_reporter_tap.hpp +Copyright: 2015 Martin Moene +License: BSL-1.0 + +Files: dev/catch2/catch_reporter_automake.hpp +Copyright: 2017 Justin R. Wilson +License: BSL-1.0 + +Files: debian/* +Copyright: 2020 Felix Salfelder , 2020 Sebastien Delafond +License: GPL-3 + See `/usr/share/common-licenses/GPL-3' + +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: MIT + 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: + . + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + 2. 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. + . + 3. Neither the name of the copyright holder 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. + +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 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. + . + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + . + If you use the zlib library in a product, we would appreciate *not* receiving + lengthy legal documents to sign. The sources are provided for free but without + warranty of any kind. The library has been entirely written by Jean-loup + Gailly and Mark Adler; it does not include third-party code. + . + If you redistribute modified sources, we would appreciate that you include in + the file ChangeLog history information documenting your changes. Please read + the FAQ for more information on the distribution of modified source versions. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cae5268 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-branch = upstream + +[buildpackage] +compression = bz2 + diff --git a/patches/0001-INTERFACE-fmt-fmt.patch b/patches/0001-INTERFACE-fmt-fmt.patch new file mode 100644 index 0000000..8aa0fc4 --- /dev/null +++ b/patches/0001-INTERFACE-fmt-fmt.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?S=C3=A9bastien_Delafond?= +Date: Fri, 24 Apr 2020 14:18:45 +0200 +Subject: INTERFACE fmt::fmt + +--- + dev/restinio/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dev/restinio/CMakeLists.txt b/dev/restinio/CMakeLists.txt +index 24dca50..d394bc1 100644 +--- a/dev/restinio/CMakeLists.txt ++++ b/dev/restinio/CMakeLists.txt +@@ -53,7 +53,7 @@ IF (RESTINIO_FIND_DEPS) + IF (RESTINIO_FMT_HEADER_ONLY) + TARGET_LINK_LIBRARIES(${RESTINIO} INTERFACE fmt::fmt-header-only) + ELSE () +- TARGET_LINK_LIBRARIES(${RESTINIO} PUBLIC fmt::fmt) ++ TARGET_LINK_LIBRARIES(${RESTINIO} INTERFACE fmt::fmt) + ENDIF () + + IF (RESTINIO_USE_EXTERNAL_HTTP_PARSER) diff --git a/patches/0002-Include-clara.patch b/patches/0002-Include-clara.patch new file mode 100644 index 0000000..6c352c3 --- /dev/null +++ b/patches/0002-Include-clara.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?S=C3=A9bastien_Delafond?= +Date: Fri, 24 Apr 2020 14:51:18 +0200 +Subject: Include clara + +--- + dev/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dev/CMakeLists.txt b/dev/CMakeLists.txt +index 6769bcc..65fce0e 100644 +--- a/dev/CMakeLists.txt ++++ b/dev/CMakeLists.txt +@@ -74,6 +74,8 @@ IF (RESTINIO_MASTER_PROJECT) + find_package(Catch2 CONFIG REQUIRED) + ENDIF () + ++ include_directories("${CMAKE_SOURCE_DIR}/clara") ++ + # HTTP parser + IF (RESTINIO_USE_EXTERNAL_HTTP_PARSER) + find_package(http-parser REQUIRED) diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..fa04388 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-INTERFACE-fmt-fmt.patch +0002-Include-clara.patch diff --git a/rules b/rules new file mode 100755 index 0000000..fb834e4 --- /dev/null +++ b/rules @@ -0,0 +1,41 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +# export DH_VERBOSE = 1 + + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mipsel powerpc sh4)) + export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed +endif + +CMAKE_OPTIONS := -DRESTINIO_FIND_DEPS=1 \ + -DRESTINIO_USE_EXTERNAL_HTTP_PARSER=1 \ + -DRESTINIO_FMT_HEADER_ONLY=0 \ + -DRESTINIO_ALLOW_SOBJECTIZER=1 \ + -DRESTINIO_TEST=1 \ + -DRESTINIO_SAMPLE=1 \ + -DRESTINIO_BENCH=1 \ + -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" + +%: + dh $@ --sourcedirectory=dev + +override_dh_auto_configure: + dh_auto_configure --sourcedirectory=dev -- $(CMAKE_OPTIONS) + +override_dh_auto_test: + : # export DEB_BUILD_OPTIONS="parallel=1" ; dh_auto_test + +override_dh_auto_install: + dh_auto_install + rm -fr debian/librestinio-dev/usr/bin diff --git a/salsa-ci.yml b/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..5f75ef4 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=4 +https://github.com/Stiffstream/restinio/releases (?:.*?/)restinio-(\d[\d.]*)-full\.tar\.bz2 debian uupdate -- 2.30.2