From: Alexandre Viau Date: Fri, 1 Jan 2021 19:02:19 +0000 (-0500) Subject: Import opendht_2.1.10-1.debian.tar.xz X-Git-Tag: archive/raspbian/3.0.1-1.1+rpi1~1^2^2^2^2~2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc0c55a14543f3892cd3a9490eaf428742344012;p=opendht.git Import opendht_2.1.10-1.debian.tar.xz [dgit import tarball opendht 2.1.10-1 opendht_2.1.10-1.debian.tar.xz] --- cc0c55a14543f3892cd3a9490eaf428742344012 diff --git a/changelog b/changelog new file mode 100644 index 0000000..ae4ef3d --- /dev/null +++ b/changelog @@ -0,0 +1,209 @@ +opendht (2.1.10-1) unstable; urgency=medium + + * New upstream version. (Closes: 978562) + + -- Alexandre Viau Fri, 01 Jan 2021 14:02:19 -0500 + +opendht (2.1.9.5-1) unstable; urgency=medium + + [ Alexandre Viau ] + * New upstream version. + + [ Amin Bandali ] + * Bump debhelper compat level up to 10. + + -- Alexandre Viau Tue, 08 Dec 2020 17:56:05 -0500 + +opendht (2.1.6-1) unstable; urgency=medium + + [ Amin Bandali ] + * New upstream version. + * Enable OpenDHT proxy features. + + [ Alexandre Viau ] + * Rules-Requires-Root: no. + + -- Alexandre Viau Sat, 10 Oct 2020 16:35:04 -0400 + +opendht (2.1.4-1) unstable; urgency=medium + + * New upstream version. + * dhtnode.conf: remove -v. (Closes: #959226) + + -- Alexandre Viau Sat, 15 Aug 2020 12:42:20 -0400 + +opendht (2.1.1-1) unstable; urgency=medium + + * New upstream version. + * Depend on librestinio-dev, libasio-dev. + * Refresh patches. + + -- Alexandre Viau Sat, 16 May 2020 13:08:04 -0400 + +opendht (1.8.1-1) unstable; urgency=medium + + * New upstream version. + + -- Alexandre Viau Sat, 05 Jan 2019 21:57:00 -0500 + +opendht (1.8.0-1) unstable; urgency=medium + + * New upstream version. + + -- Alexandre Viau Mon, 10 Dec 2018 20:15:28 -0500 + +opendht (1.7.4-1) unstable; urgency=medium + + * New upstream version. + + -- Alexandre Viau Sat, 18 Aug 2018 15:51:19 -0400 + +opendht (1.7.2-1) unstable; urgency=medium + + * New upstream version. + * Fix maintainer-script-should-not-use-recursive-chown-or-chmod. + + -- Alexandre Viau Tue, 26 Jun 2018 18:08:36 -0400 + +opendht (1.6.0-1) unstable; urgency=medium + + * d/watch: exclude release candidates. + * d/copyright: fix insecure-copyright-format-uri. + + -- Alexandre Viau Tue, 27 Feb 2018 06:11:11 +0000 + +opendht (1.5.0-3) unstable; urgency=medium + + * Build with msgpack-c v2 API. + + -- Alexandre Viau Thu, 01 Feb 2018 17:47:24 +0000 + +opendht (1.5.0-2) unstable; urgency=medium + + * Move to salsa.debian.org. + + -- Alexandre Viau Thu, 28 Dec 2017 17:09:51 -0500 + +opendht (1.5.0-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Alexandre Viau Thu, 23 Nov 2017 19:44:27 -0500 + +opendht (1.4.1-1) unstable; urgency=medium + + * New upstream snapshot. + * Use msgpack v1 API. + + -- Alexandre Viau Wed, 15 Nov 2017 20:54:42 -0500 + +opendht (1.3.6-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Alexandre Viau Fri, 25 Aug 2017 16:44:04 -0400 + +opendht (1.3.5-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Alexandre Viau Wed, 02 Aug 2017 15:41:36 -0400 + +opendht (1.3.4-3) unstable; urgency=medium + + * Remove unneeded multiarch.patch. + + -- Alexandre Viau Sun, 02 Jul 2017 14:35:50 -0400 + +opendht (1.3.4-2) unstable; urgency=medium + + * dhtnode.service: restart on-failure + + -- Alexandre Viau Sat, 01 Jul 2017 15:20:42 -0400 + +opendht (1.3.4-1) unstable; urgency=medium + + * New upstream snapshot. + * dhtnode: include systemd service. + + -- Alexandre Viau Sat, 01 Jul 2017 14:51:02 -0400 + +opendht (1.3.3-2) unstable; urgency=medium + + * Install CMakeFiles. (Closes: #866586) + + -- Alexandre Viau Fri, 30 Jun 2017 16:03:24 -0400 + +opendht (1.3.3-1) unstable; urgency=medium + + * New upstream snapshot. (Closes: #866078) + * Refresh patches. + * Remove use-debian-argon2.patch. + * Remove python bindings mention. + * Bump Standards-Version to 4.0.0. + * Build-Depend on pkg-config. + + -- Alexandre Viau Tue, 27 Jun 2017 18:42:38 -0400 + +opendht (1.2.1~dfsg1-8) unstable; urgency=medium + + * dev package: Add library dependencies (Closes: #849561). + + -- Alexandre Viau Wed, 28 Dec 2016 17:11:11 -0500 + +opendht (1.2.1~dfsg1-7) unstable; urgency=medium + + [ Alexandre Viau ] + * Import Gianfranco's work (Closes: #843788). + + [ Gianfranco Costamagna ] + * Multiarchify the package. + + -- Alexandre Viau Wed, 09 Nov 2016 11:28:54 -0500 + +opendht (1.2.1~dfsg1-6) unstable; urgency=medium + + * libopendht-dev now breaks+replaces libopendht1 (Closes: #843680) + + -- Alexandre Viau Tue, 08 Nov 2016 13:13:44 -0500 + +opendht (1.2.1~dfsg1-5) unstable; urgency=medium + + * Don't ship libopendht1. Debian policy allows for shipping + only static libraries since OpenDHT's API is not stable + enough. + + -- Alexandre Viau Mon, 07 Nov 2016 13:14:31 -0500 + +opendht (1.2.1~dfsg1-4) unstable; urgency=medium + + * Add libopendht.shlibs. + + -- Alexandre Viau Sat, 05 Nov 2016 01:00:46 -0400 + +opendht (1.2.1~dfsg1-3) unstable; urgency=medium + + * Remove pkg-kde-tools dependency. + + -- Alexandre Viau Fri, 04 Nov 2016 16:10:56 -0400 + +opendht (1.2.1~dfsg1-2) unstable; urgency=medium + + * Link against argon2. + + -- Alexandre Viau Fri, 04 Nov 2016 03:29:16 -0400 + +opendht (1.2.1~dfsg1-1) unstable; urgency=medium + + * Remove symbols file. + * Refresh use-debian-argon2.patch. + * Remove build_versioned_shared_library.patch. + * Use manpage from source. + + -- Alexandre Viau Wed, 29 Jun 2016 15:52:22 +0200 + +opendht (0.6.1~dfsg1-1) experimental; urgency=medium + + * Initial release. (Closes: #809362) + + -- Alexandre Viau Mon, 27 Jun 2016 13:09:11 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..b9b532a --- /dev/null +++ b/control @@ -0,0 +1,75 @@ +Source: opendht +Section: libs +Priority: optional +Maintainer: Alexandre Viau +Build-Depends: debhelper (>= 9.20160709), + cmake, + dh-exec, + pkg-config, + libgnutls28-dev, + libmsgpack-dev (>= 1.2), + libreadline6-dev, + libncurses5-dev, + libargon2-0-dev, + librestinio-dev, + libasio-dev, + libjsoncpp-dev, + libhttp-parser-dev, + libssl-dev, + libfmt-dev, + nettle-dev +Standards-Version: 4.0.0 +Homepage: https://github.com/savoirfairelinux/opendht +Vcs-Git: https://salsa.debian.org/debian/opendht.git +Vcs-Browser: https://salsa.debian.org/debian/opendht +Rules-Requires-Root: no + +Package: libopendht-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libgnutls28-dev, + libmsgpack-dev (>= 1.2), + libreadline6-dev, + libncurses5-dev, + libargon2-0-dev, + librestinio-dev, + libasio-dev, + libjsoncpp-dev, + libhttp-parser-dev, + libssl-dev, + libfmt-dev, + nettle-dev +Provides: libopendht-dev +Breaks: libopendht1 (<< 1.2.1~dfsg1-6) +Replaces: libopendht1 (<< 1.2.1~dfsg1-6) +Multi-Arch: same +Description: Development files for the libopendht library + OpenDHT is a C++11 distributed hash table implementation. + Feature list: + - Distributed shared key->value data-store + - Clean and powerful distributed map API with storage of + arbitrary binary values of up to 56 KB. + - Optional public key cryptography layer providing data + signature and encryption (using GnuTLS). + - IPv4 and IPv6 support. + . + This package contains the static library and headers. + +Package: dhtnode +Architecture: any +Section: net +Depends: ${misc:Depends}, + ${shlibs:Depends}, + adduser +Description: OpenDHT node binary + OpenDHT is a C++11 distributed hash table implementation. + Feature list: + - Distributed shared key->value data-store + - Clean and powerful distributed map API with storage of + arbitrary binary values of up to 56 KB. + - Optional public key cryptography layer providing data + signature and encryption (using GnuTLS). + - IPv4 and IPv6 support. + . + This package contains the OpenDHT node binary. diff --git a/copyright b/copyright new file mode 100644 index 0000000..b05bea0 --- /dev/null +++ b/copyright @@ -0,0 +1,99 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ring +Upstream-Contact: Alexandre Viau +Source: https://github.com/savoirfairelinux/opendht +Files-Excluded: src/argon2/* + +Files: * +Copyright: 2014-2020 Savoir-faire Linux Inc. +License: GPL-3+ +Comment: The 'or later' clause was recently added by upstream + in the README to clarify the status of the licensing. + - https://github.com/savoirfairelinux/opendht/commit/041a9e0e7f3aea399a17e014b6022eb01880a4a9 + It will be available in the README of the next release. Note that + the headers already mention "or later". + +Files: debian/* +Copyright: 2016 Alexandre Viau +License: Expat + +Files: include/opendht/securedht.h +Copyright: 2014-2016 Savoir-faire Linux Inc. +License: GPL-3-with-openssl-exception + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + 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 General Public License for more details. + . + You should have received a copy of the GNU 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. + . + Additional permission under GNU GPL version 3 section 7: + . + If you modify this program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a + modified version of that library), containing parts covered by the + terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc. + grants you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. + +Files: include/opendht/dht.h + src/dht.cpp +Copyright: 2009-2014 Juliusz Chroboczek + 2014-2016 Savoir-faire Linux Inc +License: Expat + +Files: m4/ax_cxx_compile_stdcxx.m4 +Copyright: 2008 Benjamin Kosnik + 2012 Zack Weinberg + 2013 Roy Stogner + 2014-2015 Google Inc. + 2015 Paul Norman + 2015 Moritz Klammler +License: GNUAllPermissive + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + ․ + 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 General Public License for more details. + ․ + The complete text of the GNU General Public License version 3 + can be found in `/usr/share/common-licenses/GPL-3`. + +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: GNUAllPermissive + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. diff --git a/dhtnode.conf b/dhtnode.conf new file mode 100644 index 0000000..f8ba7a5 --- /dev/null +++ b/dhtnode.conf @@ -0,0 +1 @@ +DHT_ARGS=-b bootstrap.ring.cx -p 4222 diff --git a/dhtnode.dirs b/dhtnode.dirs new file mode 100644 index 0000000..2e5ad4c --- /dev/null +++ b/dhtnode.dirs @@ -0,0 +1 @@ +var/lib/opendht diff --git a/dhtnode.install b/dhtnode.install new file mode 100755 index 0000000..036574c --- /dev/null +++ b/dhtnode.install @@ -0,0 +1,3 @@ +#! /usr/bin/dh-exec +usr/bin/dhtnode +debian/dhtnode.conf => etc/default/dhtnode diff --git a/dhtnode.manpages b/dhtnode.manpages new file mode 100644 index 0000000..f2e08c4 --- /dev/null +++ b/dhtnode.manpages @@ -0,0 +1 @@ +doc/dhtnode.1 diff --git a/dhtnode.postinst b/dhtnode.postinst new file mode 100644 index 0000000..bd722b2 --- /dev/null +++ b/dhtnode.postinst @@ -0,0 +1,52 @@ +#!/bin/sh +# postinst script for dhtnode +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + # create an opendht group and user + adduser --system \ + --home /var/lib/opendht \ + --disabled-password \ + --disabled-login \ + --no-create-home \ + --quiet \ + --group opendht + + if [ -d /var/lib/opendht ]; then + chown opendht:opendht /var/lib/opendht + fi + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/dhtnode.postrm b/dhtnode.postrm new file mode 100644 index 0000000..8e103b9 --- /dev/null +++ b/dhtnode.postrm @@ -0,0 +1,44 @@ +#!/bin/sh +# postrm script for dhtnode +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + # Stuff we always do + # ... + + # Only remove /var/lib/opendht on purge + if [ "${1}" = "purge" ] ; then + rm -rf /var/lib/opendht + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/dhtnode.service b/dhtnode.service new file mode 100644 index 0000000..a8e7644 --- /dev/null +++ b/dhtnode.service @@ -0,0 +1,14 @@ +[Unit] +Description=OpenDHT standalone node +After=network.target +Documentation=man:dhtnode(1) + +[Service] +User=opendht +Group=opendht +EnvironmentFile=/etc/default/dhtnode +ExecStart=/usr/bin/dhtnode -s $DHT_ARGS +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/libopendht-dev.install b/libopendht-dev.install new file mode 100644 index 0000000..a3eeb7b --- /dev/null +++ b/libopendht-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libopendht.a +usr/include/* +usr/lib/*/pkgconfig/* +usr/lib/*/cmake/opendht/* diff --git a/patches/pkgconfig-static.patch b/patches/pkgconfig-static.patch new file mode 100644 index 0000000..9955b84 --- /dev/null +++ b/patches/pkgconfig-static.patch @@ -0,0 +1,17 @@ +Description: Add missing Libs flags + Debian only ships libopendht.a. The pkg-config file is only + included in the dev package. This modifies it so that the + linking works with libopendht.a +Author: Alexandre Viau + +--- a/opendht.pc.in ++++ b/opendht.pc.in +@@ -5,7 +5,7 @@ + Name: OpenDHT + Description: C++14 Distributed Hash Table library + Version: @VERSION@ +-Libs: -L${libdir} -lopendht ++Libs: -L${libdir} -lopendht -lnettle -lgnutls -largon2 -lhttp_parser + Libs.private: @http_parser_lib@ -pthread + Requires.private: gnutls >= 3.3, nettle >= 2.4@argon2_lib@@jsoncpp_lib@@openssl_lib@ + Cflags: -I${includedir} diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..873ba74 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +pkgconfig-static.patch diff --git a/rules b/rules new file mode 100755 index 0000000..802b6f4 --- /dev/null +++ b/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Hardening +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +CONFIGURE_FLAGS += -DOPENDHT_STATIC=ON +CONFIGURE_FLAGS += -DOPENDHT_SHARED=OFF +CONFIGURE_FLAGS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON +CONFIGURE_FLAGS += -DOPENDHT_PROXY_SERVER=ON +CONFIGURE_FLAGS += -DOPENDHT_PROXY_CLIENT=ON +CONFIGURE_FLAGS += -DOPENDHT_PUSH_NOTIFICATIONS=ON + +%: + dh $@ --without autoreconf + +override_dh_auto_configure: + dh_auto_configure -- ${CONFIGURE_FLAGS} + +override_dh_installinit: + echo override_dh_installinit 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..b7fde60 --- /dev/null +++ b/watch @@ -0,0 +1,7 @@ +version=3 +opts=\ +filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/opendht-$1\.tar\.gz/,\ +repacksuffix=~dfsg1,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\ +dversionmangle=s/\~dfsg\d*$// \ + https://github.com/savoirfairelinux/opendht/tags .*/v?(\d\S*)\.tar\.gz