diff options
| -rw-r--r-- | debian/changelog | 36 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 46 | ||||
| -rw-r--r-- | debian/control.in | 35 | ||||
| -rw-r--r-- | debian/copyright | 60 | ||||
| -rwxr-xr-x | debian/copyright-check | 27 | ||||
| -rw-r--r-- | debian/copyright_hints | 178 | ||||
| -rw-r--r-- | debian/gbp.conf | 6 | ||||
| -rw-r--r-- | debian/patches/2001_cmake_ignore_git.patch | 40 | ||||
| -rw-r--r-- | debian/patches/2002_fix_default_locale.patch | 16 | ||||
| -rw-r--r-- | debian/patches/README | 3 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 42 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 5 | ||||
| -rw-r--r-- | debian/watch | 5 |
16 files changed, 503 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d71d888 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,36 @@ +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 ] + * Initial Release. + Closes: bug#841773. + + -- Jonas Smedegaard <dr@jones.dk> Sat, 07 Jan 2017 12:57:41 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..516fb08 --- /dev/null +++ b/debian/control @@ -0,0 +1,46 @@ +Source: biboumi +Section: net +Priority: optional +Build-Depends: cdbs, + debhelper, + dh-buildinfo, + cmake, + catch, + uuid-dev, + pandoc, + libexpat1-dev, + libidn11-dev, + libsystemd-dev, + libc-ares-dev, + libbotan1.10-dev +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 +Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Homepage: https://lab.louiz.org/louiz/biboumi/ + +Package: biboumi +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: XMPP gateway to connect to IRC servers + Biboumi is an XMPP gateway that connects to IRC servers and translates + between the two protocols. It can be used to access IRC channels using + any XMPP client as if these channels were XMPP MUCs. + . + It is written in modern C++14 and makes great efforts to have as little + dependencies and to be as simple as possible. + . + The goal is to provide a way to access most of IRC features using any + XMPP client. It doesn’t however try to provide a complete mapping of + the features of both worlds simply because this is not useful and most + probably impossible. For example all IRC modes are not all + translatable into an XMPP features. Some of them are (like +m (mute) + or +o (operator) modes), but some others are IRC-specific. If IRC is + the limiting factor (for example you cannot have a non-ASCII nickname + on IRC) then biboumi doesn’t try to work around this issue: it just + enforces the rules of the IRC server by telling the user that he/she + must choose an ASCII-only nickname. An important goal is to keep the + software (and its code) light and simple. diff --git a/debian/control.in b/debian/control.in new file mode 100644 index 0000000..9cbaed8 --- /dev/null +++ b/debian/control.in @@ -0,0 +1,35 @@ +Source: biboumi +Section: net +Priority: optional +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 +Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Homepage: https://lab.louiz.org/louiz/biboumi/ + +Package: biboumi +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: XMPP gateway to connect to IRC servers + Biboumi is an XMPP gateway that connects to IRC servers and translates + between the two protocols. It can be used to access IRC channels using + any XMPP client as if these channels were XMPP MUCs. + . + It is written in modern C++14 and makes great efforts to have as little + dependencies and to be as simple as possible. + . + The goal is to provide a way to access most of IRC features using any + XMPP client. It doesn’t however try to provide a complete mapping of + the features of both worlds simply because this is not useful and most + probably impossible. For example all IRC modes are not all + translatable into an XMPP features. Some of them are (like +m (mute) + or +o (operator) modes), but some others are IRC-specific. If IRC is + the limiting factor (for example you cannot have a non-ASCII nickname + on IRC) then biboumi doesn’t try to work around this issue: it just + enforces the rules of the IRC server by telling the user that he/she + must choose an ASCII-only nickname. An important goal is to keep the + software (and its code) light and simple. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..36c542a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,60 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: biboumi +Upstream-Contact: https://lab.louiz.org/louiz/biboumi/issues +Source: https://lab.louiz.org/louiz/biboumi + https://lab.louiz.org/louiz/biboumi.git + +Files: * +Copyright: 2015, Florent Le Coz (louiz’) <louiz@louiz.org> +License-Grant: + Biboumi is released under the zlib license. + Please read the COPYING file for details. +License: Zlib + +Files: cmake/Modules/CodeCoverage.cmake +Copyright: 2012-2015, Lars Bilke +License: BSD-3-clause + +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 +Copyright: NONE +License: public-domain + This file is in the public domain + +Files: debian/* +Copyright: 2016, Vasudev Kamath <vasudev@copyninja.info> + 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 + Free Software Foundation; either version 3, or (at your option) any + later version. +License: GPL-3+ + +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. + +License: GPL-3+ +License-Reference: /usr/share/common-licenses/GPL-3 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 new file mode 100644 index 0000000..cfbc48d --- /dev/null +++ b/debian/copyright_hints @@ -0,0 +1,178 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by CDBS + +Files: CHANGELOG.rst + CMakeLists.txt + CONTRIBUTING.rst + INSTALL.rst + README.rst + biboumi.h.cmake + conf/biboumi.cfg + database/database.xml + debian/compat + debian/control + debian/control.in + debian/gbp.conf + debian/patches/2001_cmake_ignore_git.patch + debian/patches/2002_fix_default_locale.patch + debian/patches/README + debian/patches/series + debian/source/format + debian/source/lintian-overrides + debian/watch + doc/biboumi.1.rst + doc/example.conf + docker/biboumi-test/debian/Dockerfile + 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 + packaging/biboumi.spec.cmake + src/bridge/bridge.cpp + src/bridge/bridge.hpp + src/bridge/colors.cpp + src/bridge/colors.hpp + src/bridge/list_element.hpp + src/bridge/result_set_management.hpp + src/database/database.cpp + src/database/database.hpp + src/irc/iid.cpp + src/irc/iid.hpp + src/irc/irc_channel.cpp + src/irc/irc_channel.hpp + src/irc/irc_client.cpp + src/irc/irc_client.hpp + src/irc/irc_message.cpp + src/irc/irc_message.hpp + src/irc/irc_user.cpp + src/irc/irc_user.hpp + src/main.cpp + src/utils/empty_if_fixed_server.hpp + src/utils/reload.cpp + src/utils/reload.hpp + src/xmpp/biboumi_adhoc_commands.cpp + src/xmpp/biboumi_adhoc_commands.hpp + src/xmpp/biboumi_component.cpp + src/xmpp/biboumi_component.hpp + tests/colors.cpp + tests/config.cpp + tests/database.cpp + tests/end_to_end/__main__.py + tests/end_to_end/biboumi.supp + tests/iid.cpp + tests/io_tester.cpp + tests/io_tester.hpp + tests/jid.cpp + tests/logger.cpp + tests/test.cpp + tests/timed_events.cpp + tests/utils.cpp + tests/uuid.cpp + tests/xmpp.cpp + unit/biboumi.service.cmake +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 +Copyright: NONE +License: public-domain + FIXME + +Files: cmake/Modules/CodeCoverage.cmake +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> +License: GPL-3+ + FIXME + +Files: tests/encoding.cpp +Copyright: +License: UNKNOWN + FIXME + +Files: tests/end_to_end/ircd.conf +Copyright: 2000-2002, Hybrid Development Team + 2002-2005, ircd-ratbox development team + 2005-2006, charybdis development team +License: UNKNOWN + FIXME + +Files: COPYING +Copyright: NONE +License: Zlib + FIXME + diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..2a594ca --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True +filter = */.git* diff --git a/debian/patches/2001_cmake_ignore_git.patch b/debian/patches/2001_cmake_ignore_git.patch new file mode 100644 index 0000000..4334d0f --- /dev/null +++ b/debian/patches/2001_cmake_ignore_git.patch @@ -0,0 +1,40 @@ +Description: Avoid cmake messing with git +Author: Jonas Smedegaard <dr@jones.dk> +Last-Update: 2016-12-21 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -198,23 +198,6 @@ + database) + endif() + +-include(ExternalProject) +-ExternalProject_Add(catch +- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" +- PREFIX "external" +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ) +-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) +-ExternalProject_Get_Property(catch SOURCE_DIR) +-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) +- target_include_directories(test_suite +- PUBLIC "${SOURCE_DIR}/include/" +- ) +- add_dependencies(test_suite catch) +-endif() + 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 @@ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + add_custom_target(dist +- DEPENDS ${ARCHIVE_NAME}.tar.xz +- DEPENDS catch) ++ DEPENDS ${ARCHIVE_NAME}.tar.xz) + + add_custom_target(rpm + DEPENDS dist diff --git a/debian/patches/2002_fix_default_locale.patch b/debian/patches/2002_fix_default_locale.patch new file mode 100644 index 0000000..aef32d9 --- /dev/null +++ b/debian/patches/2002_fix_default_locale.patch @@ -0,0 +1,16 @@ +Description: Fix use C.UTF-8 as hardcoded internal locale + Debian always provides C.UTF-8, only often en_US.UTF-8, and not en_US.utf-8. +Author: Jonas Smedegaard <dr@jones.dk> +Last-Update: 2016-12-21 + +--- a/louloulibs/utils/time.cpp ++++ b/louloulibs/utils/time.cpp +@@ -24,7 +24,7 @@ + std::tm t = {}; + #ifdef HAS_GET_TIME + std::istringstream ss(stamp); +- ss.imbue(std::locale("en_US.utf-8")); ++ ss.imbue(std::locale("C.UTF-8")); + + std::string timezone; + ss >> std::get_time(&t, format) >> timezone; diff --git a/debian/patches/README b/debian/patches/README new file mode 100644 index 0000000..80c1584 --- /dev/null +++ b/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3505552 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +2001_cmake_ignore_git.patch +2002_fix_default_locale.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..1ced4cf --- /dev/null +++ b/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +# Copyright 2016-2017 Jonas Smedegaard <dr@jones.dk> +# Copyright 2016 Vasudev Kamath <vasudev@copyninja.info> +# Description: Main Debian packaging script for biboumi +# +# 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/>. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk + +pkg = $(DEB_SOURCE_PACKAGE) + +dev-deps = expat1 idn11 systemd c-ares botan1.10 +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 +DEB_INSTALL_DOCS_$(pkg) += README.rst CONTRIBUTING.rst +DEB_INSTALL_EXAMPLES_$(pkg) = doc/example.conf + +binary-post-install/$(pkg):: + mkdir -p $(cdbs_curdestdir)/lib + mv $(cdbs_curdestdir)/usr/lib/systemd $(cdbs_curdestdir)/lib 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/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..f87ce0c --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,5 @@ +# License is in License-Reference field (see bug#786450) +missing-license-text-in-dep5-copyright + +# License is in License-Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..12cf86c --- /dev/null +++ b/debian/watch @@ -0,0 +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@ |