From 40116b4076035998642ef29e4b3f28f8ac2d6903 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 12 May 2013 13:19:15 +0200 Subject: [PATCH] debian: synchronize packaging with Debian --- debian/control | 2 +- debian/copyright | 179 ++++++++++++++++++++++++++++++++- debian/lldpd.lintian-overrides | 4 + debian/lldpd.postinst | 2 +- debian/lldpd.symbols | 31 ++++++ 5 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 debian/lldpd.lintian-overrides create mode 100644 debian/lldpd.symbols diff --git a/debian/control b/debian/control index 6c25a46e..d1c9fdf0 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5), cdbs, autotools-dev, dh-autoreconf, libsnmp-dev, libperl-dev, libsensors-dev | libsensors4-dev, libxml2-dev, libevent-dev, libreadline-dev, pkg-config -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://vincentbernat.github.com/lldpd/ Package: lldpd diff --git a/debian/copyright b/debian/copyright index 33e63ea1..2eec55cd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,10 @@ Files: * -Copyright: © 2008 Vincent Bernat +Copyright: © 2008-2013 Vincent Bernat © 2003, 2004 Henning Brauer © 2006 Pierre-Yves Ritschard © 2003 Can Erkin Acar © 2003 Anil Madhavapeddy + © 2010 Andreas Hofmeister License: ISC Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -17,14 +18,62 @@ License: ISC ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Files: libevent/* +Copyright: Copyright 2000-2007 Niels Provos + Copyright 2007-2012 Niels Provos and Nick Mathewson +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. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +Comment: + The content of this directory is shipped with lldpd but not used for + compilation. The system libevent is used in place of this embedded + copy. + +Files: libevent/arc4random.c +Copyright: Copyright (c) 2010 Chris Davis, Niels Provos, and Nick Mathewson + Copyright (c) 2010-2012 Niels Provos and Nick Mathewson + Copyright (c) 1996, David Mazieres + Copyright (c) 2008, Damien Miller +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + Files: src/privsep_fdpass.c Copyright: © 2001 Niels Provos © 2002 Matthieu Herrb -License: BSD +License: BSD-2-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 @@ -32,6 +81,130 @@ License: BSD disclaimer in the documentation and/or other materials provided with the distribution. +Files: m4/ax_cflags_gcc_option.m4 +Copyright: Copyright (c) 2008 Guido U. Draheim +License: GPL-2+ with Autoconf 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 2 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, see . + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + . + As a special exception, the respective Autoconf Macro's copyright owner + gives unlimited permission to copy, distribute and modify the configure + scripts that are the output of Autoconf when processing the Macro. You + need not follow the terms of the GNU General Public License when using + or distributing such scripts, even though portions of the text of the + Macro appear in them. The GNU General Public License (GPL) does govern + all other use of the material that constitutes the Autoconf Macro. + . + This special exception to the GPL applies to versions of the Autoconf + Macro released by the Autoconf Archive. When you make and distribute a + modified version of the Autoconf Macro, you may extend this special + exception to the GPL to apply to your modified version as well. + +Files: m4/ax_ld_check_flag.m4 +Copyright: Copyright (c) 2008 Francesco Salvestrini +License: GPL-2+ with Autoconf exception + +Files: m4/ax_lib_readline.m4 +Copyright: Copyright (c) 2008 Ville Laurikari +License: permissive + 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. + +Files: m4/ax_prog_doxygen.m4 +Copyright: Copyright (c) 2009 Oren Ben-Kiki +License: permissive + 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. + +Files: include/linux/* +Copyright: Copyright (C) 1991-2012 Linus Torvalds + and many others +License: GPL-2+ + 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 + 2 of the License, or (at your option) any later version. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. +Comment: + It is believed that header files are an interface for user space and + therefore cannot be covered by copyright. + +Files: include/netinet/if_ether.h include/sys/queue.h +Copyright: Copyright (c) 1982, 1986, 1993 The Regents of the University of California +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 University 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 REGENTS 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 REGENTS 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. + +Files: include/osx/* +Copyright: Copyright (c) 2003-2010 Apple Computer, Inc +License: APSL-2 + This file contains Original Code and/or Modifications of Original Code + as defined in and that are subject to the Apple Public Source License + Version 2.0 (the 'License'). You may not use this file except in + compliance with the License. The rights granted to you under the License + may not be used to create, or enable the creation or redistribution of, + unlawful or unlicensed copies of an Apple operating system, or to + circumvent, violate, or enable the circumvention or violation of, any + terms of an Apple operating system software license agreement. + + Please obtain a copy of the License at + http://www.opensource.apple.com/apsl/ and read it before using this file. + + The Original Code and all software distributed under the License are + distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER + EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, + INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + Please see the License for the specific language governing rights and + limitations under the License. +Comment: + APSL incompatibility with GPL is not a problem here: + 1. It is believed that header files are an interface for user space and + therefore cannot be covered by copyright. + 2. Those headers are used only on OS X. + Files: debian/* Copyright: © 2008 Vincent Bernat License: ISC diff --git a/debian/lldpd.lintian-overrides b/debian/lldpd.lintian-overrides new file mode 100644 index 00000000..aef85277 --- /dev/null +++ b/debian/lldpd.lintian-overrides @@ -0,0 +1,4 @@ +# liblldpctl0 is tightly coupled with lldpd because of the use of a +# binary RPC mechanism between the library and lldpd. The library can +# only work with the exact version of lldpd it was compiled with. +lldpd binary: package-name-doesnt-match-sonames liblldpctl0 diff --git a/debian/lldpd.postinst b/debian/lldpd.postinst index a6130748..c4a1cc8f 100644 --- a/debian/lldpd.postinst +++ b/debian/lldpd.postinst @@ -7,7 +7,7 @@ fi adduser --system --disabled-password --disabled-login --home /var/run/lldpd \ --no-create-home --quiet --force-badname --group _lldpd -for i in /usr/sbin/lldpctl; do +for i in /usr/sbin/lldpcli; do if ! dpkg-statoverride --list $i > /dev/null 2>&1; then dpkg-statoverride --update --add _lldpd adm 4750 $i fi diff --git a/debian/lldpd.symbols b/debian/lldpd.symbols new file mode 100644 index 00000000..f9ebc65d --- /dev/null +++ b/debian/lldpd.symbols @@ -0,0 +1,31 @@ +liblldpctl.so.0 lldpd #MINVER# + lldpctl_atom_create@Base 0.7.3 + lldpctl_atom_dec_ref@Base 0.7.3 + lldpctl_atom_get@Base 0.7.3 + lldpctl_atom_get_buffer@Base 0.7.3 + lldpctl_atom_get_connection@Base 0.7.3 + lldpctl_atom_get_int@Base 0.7.3 + lldpctl_atom_get_str@Base 0.7.3 + lldpctl_atom_inc_ref@Base 0.7.3 + lldpctl_atom_iter@Base 0.7.3 + lldpctl_atom_iter_next@Base 0.7.3 + lldpctl_atom_iter_value@Base 0.7.3 + lldpctl_atom_set@Base 0.7.3 + lldpctl_atom_set_buffer@Base 0.7.3 + lldpctl_atom_set_int@Base 0.7.3 + lldpctl_atom_set_str@Base 0.7.3 + lldpctl_get_configuration@Base 0.7.3 + lldpctl_get_default_transport@Base 0.7.3 + lldpctl_get_interfaces@Base 0.7.3 + lldpctl_get_port@Base 0.7.3 + lldpctl_key_get_map@Base 0.7.3 + lldpctl_last_error@Base 0.7.3 + lldpctl_log_callback@Base 0.7.3 + lldpctl_new@Base 0.7.3 + lldpctl_new_name@Base 0.7.3 + lldpctl_recv@Base 0.7.3 + lldpctl_release@Base 0.7.3 + lldpctl_send@Base 0.7.3 + lldpctl_strerror@Base 0.7.3 + lldpctl_watch@Base 0.7.3 + lldpctl_watch_callback@Base 0.7.3 -- 2.39.5