diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 57 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/control.in | 4 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rwxr-xr-x | debian/copyright-check | 27 | ||||
| -rw-r--r-- | debian/copyright_hints | 166 | ||||
| -rw-r--r-- | debian/patches/020161125~ad22be4.patch | 38 | ||||
| -rw-r--r-- | debian/patches/020161204~eb8f1cb.patch | 24 | ||||
| -rw-r--r-- | debian/patches/2001_cmake_ignore_git.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/watch | 1 |
12 files changed, 204 insertions, 150 deletions
diff --git a/debian/changelog b/debian/changelog index bc485af..608f2a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +biboumi (5.0-1) unstable; urgency=medium + + [ upstream ] + * New release. + + Add identd server. + + Add persistent option for channels, to behave like an IRC bouncer. + + Use udns library (not c-ares) for asynchronous DNS resolution. + + Update MAM implementation to version 6.0 (namespace mam:2). + + Limit MAM to 100 messages per channel by default. + + Properly handle multiline topics. + + Support overriding configuration options by environment values. + + Support customizing Botan TLS policies per IRC server. + + IRC channel config form now available via MUC config. + + Notices starting with "#channel" now treated as welcome messages. + + [ Jonas Smedegaard ] + * Declare compliance with Debian Policy 4.0.0. + * Modernize Vcs-Browser field: + + Use git (not cgit) in path. + * Update package relations: + + Build-depend on libudns-dev (not libc-ares-dev). + + Build-depend on libgcrypt20-dev. + + Stop build-depend on libbotan1.10-dev (unused: Too old). + * Drop patch 2002: Fixed upstream. + * Unfuzz patch 2001. + + -- Jonas Smedegaard <dr@jones.dk> Sat, 24 Jun 2017 10:15:23 +0200 + +biboumi (4.3-1) unstable; urgency=medium + + [ upstream ] + * New release(s). + + Works with botan 2.x (not only botan 1.11.x). + + Fix build without LiteSQL available. + + Fix segmentation fault connecting to IRC server on undefined port. + + [ Jonas Smedegaard ] + * Update watch file: + + Fix mangle upstream filename (lacked versioning, confusing uscan). + * Modernize cdbs: + + Do copyright-check in maintainer script (not during build). + + Stop build-depend on licensecheck. + * Drop patch cherry-picked upstream and now applied. + * Drop patch cherry-picked upstream but now mysteriously gone from + upstream master branch. + * Update copyright info: + + Extend copyright for my parts to cover current year. + + -- Jonas Smedegaard <dr@jones.dk> Sun, 21 May 2017 12:03:04 +0200 + +biboumi (4.0-2) unstable; urgency=medium + + * Fix set proper group (and explicitly set user too, while at it). + Closes: Bug#854252. Thanks to Jonas Wielicki and Florent Le Coz. + + -- Jonas Smedegaard <dr@jones.dk> Sat, 04 Mar 2017 20:37:49 +0100 + biboumi (4.0-1) unstable; urgency=medium [ Vasudev Kamath & Jonas Smedegaard ] diff --git a/debian/control b/debian/control index 8a61261..0404a78 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Build-Depends: cdbs, debhelper, dh-buildinfo, - licensecheck, cmake, catch, uuid-dev, @@ -17,9 +16,9 @@ Build-Depends: cdbs, Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> Uploaders: Jonas Smedegaard <dr@jones.dk>, Vasudev Kamath <vasudev@copyninja.info> -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ Package: biboumi diff --git a/debian/control.in b/debian/control.in index 9cbaed8..11feb97 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,9 +5,9 @@ Build-Depends: @cdbs@ Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> Uploaders: Jonas Smedegaard <dr@jones.dk>, Vasudev Kamath <vasudev@copyninja.info> -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ Package: biboumi diff --git a/debian/copyright b/debian/copyright index 7882205..36c542a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -28,7 +28,7 @@ License: public-domain Files: debian/* Copyright: 2016, Vasudev Kamath <vasudev@copyninja.info> - 2016, Jonas Smedegaard <dr@jones.dk> + 2016-2017, Jonas Smedegaard <dr@jones.dk> License-Grant: 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 diff --git a/debian/copyright-check b/debian/copyright-check new file mode 100755 index 0000000..1f715d9 --- /dev/null +++ b/debian/copyright-check @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright © 2016-2017 Jonas Smedegaard <dr@jones.dk> +# Description: helper script to update copyright_hints +# +# 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, 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, see <http://www.gnu.org/licenses/>. + +set -eu + +# extract metadata from binary media files +#export DEB_COPYRIGHT_EXTRACT_EXTS=png + +make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true +make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1 + +# unconditionally merge changes - safe to do with git-tracked package +[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints diff --git a/debian/copyright_hints b/debian/copyright_hints index 9e2ff85..ada5b91 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -11,14 +11,14 @@ Files: CHANGELOG.rst README.rst biboumi.h.cmake conf/biboumi.cfg + conf/irc.mozilla.org.policy.txt + conf/irc.ppirc.net.policy.txt + conf/policy.txt database/database.xml debian/compat debian/control debian/control.in - debian/files debian/gbp.conf - debian/patches/020161125~ad22be4.patch - debian/patches/020161204~eb8f1cb.patch debian/patches/2001_cmake_ignore_git.patch debian/patches/2002_fix_default_locale.patch debian/patches/README @@ -28,66 +28,17 @@ Files: CHANGELOG.rst debian/watch doc/biboumi.1.rst doc/example.conf + docker/biboumi-test/alpine/Dockerfile + docker/biboumi-test/alpine/Dockerfile.base + docker/biboumi-test/archlinux/Dockerfile docker/biboumi-test/debian/Dockerfile + docker/biboumi-test/debian/Dockerfile.base docker/biboumi-test/fedora/Dockerfile - louloulibs/CMakeLists.txt - louloulibs/config/config.cpp - louloulibs/config/config.hpp - louloulibs/logger/logger.cpp - louloulibs/logger/logger.hpp - louloulibs/louloulibs.h.cmake - louloulibs/network/credentials_manager.cpp - louloulibs/network/credentials_manager.hpp - louloulibs/network/dns_handler.cpp - louloulibs/network/dns_handler.hpp - louloulibs/network/dns_socket_handler.cpp - louloulibs/network/dns_socket_handler.hpp - louloulibs/network/poller.cpp - louloulibs/network/poller.hpp - louloulibs/network/resolver.cpp - louloulibs/network/resolver.hpp - louloulibs/network/socket_handler.hpp - louloulibs/network/tcp_socket_handler.cpp - louloulibs/network/tcp_socket_handler.hpp - louloulibs/utils/encoding.cpp - louloulibs/utils/encoding.hpp - louloulibs/utils/get_first_non_empty.cpp - louloulibs/utils/get_first_non_empty.hpp - louloulibs/utils/revstr.cpp - louloulibs/utils/revstr.hpp - louloulibs/utils/scopeguard.hpp - louloulibs/utils/sha1.cpp - louloulibs/utils/sha1.hpp - louloulibs/utils/split.cpp - louloulibs/utils/split.hpp - louloulibs/utils/string.cpp - louloulibs/utils/string.hpp - louloulibs/utils/time.cpp - louloulibs/utils/time.hpp - louloulibs/utils/timed_events.cpp - louloulibs/utils/timed_events.hpp - louloulibs/utils/timed_events_manager.cpp - louloulibs/utils/tolower.cpp - louloulibs/utils/tolower.hpp - louloulibs/utils/xdg.cpp - louloulibs/utils/xdg.hpp - louloulibs/xmpp/adhoc_command.cpp - louloulibs/xmpp/adhoc_command.hpp - louloulibs/xmpp/adhoc_commands_handler.cpp - louloulibs/xmpp/adhoc_commands_handler.hpp - louloulibs/xmpp/adhoc_session.cpp - louloulibs/xmpp/adhoc_session.hpp - louloulibs/xmpp/auth.cpp - louloulibs/xmpp/auth.hpp - louloulibs/xmpp/body.hpp - louloulibs/xmpp/jid.cpp - louloulibs/xmpp/jid.hpp - louloulibs/xmpp/xmpp_component.cpp - louloulibs/xmpp/xmpp_component.hpp - louloulibs/xmpp/xmpp_parser.cpp - louloulibs/xmpp/xmpp_parser.hpp - louloulibs/xmpp/xmpp_stanza.cpp - louloulibs/xmpp/xmpp_stanza.hpp + docker/biboumi-test/fedora/Dockerfile.base + docker/biboumi/Dockerfile + docker/biboumi/README.md + docker/biboumi/biboumi.cfg + docker/packaging/debian/Dockerfile packaging/biboumi.spec.cmake src/bridge/bridge.cpp src/bridge/bridge.hpp @@ -95,8 +46,13 @@ Files: CHANGELOG.rst src/bridge/colors.hpp src/bridge/list_element.hpp src/bridge/result_set_management.hpp + src/config/config.cpp + src/config/config.hpp src/database/database.cpp src/database/database.hpp + src/identd/identd_server.hpp + src/identd/identd_socket.cpp + src/identd/identd_socket.hpp src/irc/iid.cpp src/irc/iid.hpp src/irc/irc_channel.cpp @@ -107,14 +63,77 @@ Files: CHANGELOG.rst src/irc/irc_message.hpp src/irc/irc_user.cpp src/irc/irc_user.hpp + src/logger/logger.cpp + src/logger/logger.hpp src/main.cpp + src/network/credentials_manager.cpp + src/network/credentials_manager.hpp + src/network/dns_handler.cpp + src/network/dns_handler.hpp + src/network/dns_socket_handler.cpp + src/network/dns_socket_handler.hpp + src/network/poller.cpp + src/network/poller.hpp + src/network/resolver.cpp + src/network/resolver.hpp + src/network/socket_handler.hpp + src/network/tcp_client_socket_handler.cpp + src/network/tcp_client_socket_handler.hpp + src/network/tcp_server_socket.hpp + src/network/tcp_socket_handler.cpp + src/network/tcp_socket_handler.hpp + src/network/tls_policy.cpp + src/network/tls_policy.hpp + src/utils/dirname.cpp + src/utils/dirname.hpp src/utils/empty_if_fixed_server.hpp + src/utils/encoding.cpp + src/utils/encoding.hpp + src/utils/get_first_non_empty.cpp + src/utils/get_first_non_empty.hpp src/utils/reload.cpp src/utils/reload.hpp + src/utils/revstr.cpp + src/utils/revstr.hpp + src/utils/scopeguard.hpp + src/utils/sha1.cpp + src/utils/sha1.hpp + src/utils/split.cpp + src/utils/split.hpp + src/utils/string.cpp + src/utils/string.hpp + src/utils/system.cpp + src/utils/system.hpp + src/utils/time.cpp + src/utils/time.hpp + src/utils/timed_events.cpp + src/utils/timed_events.hpp + src/utils/timed_events_manager.cpp + src/utils/tolower.cpp + src/utils/tolower.hpp + src/utils/xdg.cpp + src/utils/xdg.hpp + src/xmpp/adhoc_command.cpp + src/xmpp/adhoc_command.hpp + src/xmpp/adhoc_commands_handler.cpp + src/xmpp/adhoc_commands_handler.hpp + src/xmpp/adhoc_session.cpp + src/xmpp/adhoc_session.hpp + src/xmpp/auth.cpp + src/xmpp/auth.hpp src/xmpp/biboumi_adhoc_commands.cpp src/xmpp/biboumi_adhoc_commands.hpp src/xmpp/biboumi_component.cpp src/xmpp/biboumi_component.hpp + src/xmpp/body.hpp + src/xmpp/jid.cpp + src/xmpp/jid.hpp + src/xmpp/xmpp_component.cpp + src/xmpp/xmpp_component.hpp + src/xmpp/xmpp_parser.cpp + src/xmpp/xmpp_parser.hpp + src/xmpp/xmpp_stanza.cpp + src/xmpp/xmpp_stanza.hpp tests/colors.cpp tests/config.cpp tests/database.cpp @@ -125,6 +144,7 @@ Files: CHANGELOG.rst tests/io_tester.hpp tests/jid.cpp tests/logger.cpp + tests/network.cpp tests/test.cpp tests/timed_events.cpp tests/utils.cpp @@ -135,13 +155,14 @@ Copyright: NONE License: UNKNOWN FIXME -Files: cmake/Modules/FindLITESQL.cmake - louloulibs/cmake/Modules/FindBOTAN.cmake - louloulibs/cmake/Modules/FindCARES.cmake - louloulibs/cmake/Modules/FindICONV.cmake - louloulibs/cmake/Modules/FindLIBIDN.cmake - louloulibs/cmake/Modules/FindLIBUUID.cmake - louloulibs/cmake/Modules/FindSYSTEMD.cmake +Files: cmake/Modules/FindBOTAN.cmake + cmake/Modules/FindGCRYPT.cmake + cmake/Modules/FindICONV.cmake + cmake/Modules/FindLIBIDN.cmake + cmake/Modules/FindLIBUUID.cmake + cmake/Modules/FindLITESQL.cmake + cmake/Modules/FindSYSTEMD.cmake + cmake/Modules/FindUDNS.cmake Copyright: NONE License: public-domain FIXME @@ -151,9 +172,14 @@ Copyright: 2012-2015, Lars Bilke License: BSD-3-clause FIXME +Files: debian/copyright-check +Copyright: 2016-2017, Jonas Smedegaard <dr@jones.dk> +License: GPL-3+ + FIXME + Files: debian/rules -Copyright: 2016, Jonas Smedegaard <dr@jones.dk> - 2016, Vasudev Kamath <vasudev@copyninja.info> +Copyright: 2016, Vasudev Kamath <vasudev@copyninja.info> + 2016-2017, Jonas Smedegaard <dr@jones.dk> License: GPL-3+ FIXME diff --git a/debian/patches/020161125~ad22be4.patch b/debian/patches/020161125~ad22be4.patch deleted file mode 100644 index 46013bc..0000000 --- a/debian/patches/020161125~ad22be4.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Do not fail to build if litesql is not there -Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/ad22be4 -Author: louiz’ <louiz@louiz.org> -Forwarded: yes -Last-Update: 2016-12-21 - ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -12,7 +12,9 @@ - - #include <atomic> - #include <signal.h> --#include <litesql.hpp> -+#ifdef USE_DATABASE -+# include <litesql.hpp> -+#endif - - // A flag set by the SIGINT signal handler. - static std::atomic<bool> stop(false); -@@ -83,11 +85,14 @@ - if (hostname.empty()) - return config_help("hostname"); - -+ -+#ifdef USE_DATABASE - try { -- open_database(); -- } catch (const litesql::DatabaseError&) { -- return 1; -- } -+ open_database(); -+ } catch (const litesql::DatabaseError&) { -+ return 1; -+ } -+#endif - - // Block the signals we want to manage. They will be unblocked only during - // the epoll_pwait or ppoll calls. This avoids some race conditions, diff --git a/debian/patches/020161204~eb8f1cb.patch b/debian/patches/020161204~eb8f1cb.patch deleted file mode 100644 index e303cbc..0000000 --- a/debian/patches/020161204~eb8f1cb.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Avoid a potential nullptr dereference -Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/eb8f1cb -Author: louiz’ <louiz@louiz.org> -Forwarded: yes -Last-Update: 2016-12-21 - ---- a/src/xmpp/biboumi_component.cpp -+++ b/src/xmpp/biboumi_component.cpp -@@ -570,13 +570,11 @@ - Jid to(stanza.get_tag("to")); - - const XmlNode* query = stanza.get_child("query", MAM_NS); -- std::string query_id; -- if (query) -- query_id = query->get_tag("queryid"); - - Iid iid(to.local, {'#', '&'}); -- if (iid.type == Iid::Type::Channel && to.resource.empty()) -+ if (query && iid.type == Iid::Type::Channel && to.resource.empty()) - { -+ const std::string query_id = query->get_tag("queryid"); - std::string start; - std::string end; - const XmlNode* x = query->get_child("x", DATAFORM_NS); diff --git a/debian/patches/2001_cmake_ignore_git.patch b/debian/patches/2001_cmake_ignore_git.patch index 4334d0f..eb2be01 100644 --- a/debian/patches/2001_cmake_ignore_git.patch +++ b/debian/patches/2001_cmake_ignore_git.patch @@ -4,10 +4,12 @@ Last-Update: 2016-12-21 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -198,23 +198,6 @@ - database) - endif() +@@ -282,27 +282,6 @@ + endforeach() + # +-## Add a rule to download the catch unit test framework +-# -include(ExternalProject) -ExternalProject_Add(catch - GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" @@ -25,10 +27,12 @@ Last-Update: 2016-12-21 - ) - add_dependencies(test_suite catch) -endif() +- +-# + ## Add some custom rules to launch the tests + # add_custom_target(check COMMAND "test_suite" - DEPENDS test_suite biboumi) - add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" -@@ -263,8 +246,7 @@ +@@ -362,8 +341,7 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) add_custom_target(dist diff --git a/debian/patches/series b/debian/patches/series index 66f0cf4..9da3ec6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -020161125~ad22be4.patch -020161204~eb8f1cb.patch 2001_cmake_ignore_git.patch diff --git a/debian/rules b/debian/rules index 8229cce..03709e6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright 2016 Jonas Smedegaard <dr@jones.dk> +# Copyright 2016-2017 Jonas Smedegaard <dr@jones.dk> # Copyright 2016 Vasudev Kamath <vasudev@copyninja.info> # Description: Main Debian packaging script for biboumi # @@ -18,16 +18,20 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/utils.mk - include /usr/share/cdbs/1/class/cmake.mk pkg = $(DEB_SOURCE_PACKAGE) -dev-deps = expat1 idn11 systemd udns0 gcrypt20 +# TODO: Build-dpend on libbotan1.11-dev or libbotan2.0 when available +dev-deps = expat1 idn11 systemd udns gcrypt20 CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) +DEB_CMAKE_EXTRA_FLAGS = \ + -DSERVICE_USER=nobody -DSERVICE_GROUP=nogroup \ + -DBOTAN_LIBRARIES="$(shell pkg-config botan-1.10 --libs-only-L)" \ + -DBOTAN_INCLUDE_DIRS="$(shell pkg-config botan-1.10 --cflags-only-I)" + DEB_MAKE_CHECK_TARGET = check DEB_INSTALL_CHANGELOGS_ALL += CHANGELOG.rst diff --git a/debian/watch b/debian/watch index 3fdb5ee..12cf86c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,5 @@ # run "uscan --report" to check or "gpb import-orig --uscan" to update version=4 +opts="filenamemangle=s%(?:.*?)?archive\.tar\.bz2\?ref=(\d[\d.]*)%@PACKAGE@-$1.tar.bz2%" \ https://lab.louiz.org/louiz/biboumi/tags \ .*/archive@ARCHIVE_EXT@\?ref=@ANY_VERSION@ |