--- ncap-1.9.2.orig/Makefile.am +++ ncap-1.9.2/Makefile.am @@ -18,7 +18,7 @@ @libbind_ldflags@ @libbind_libs@ \ @libpcap_ldflags@ @libpcap_libs@ -bin_PROGRAMS = ncaptool wrapsrv +bin_PROGRAMS = ncaptool ncaptool_CFLAGS = $(AM_CFLAGS) @libbind_cflags@ ncaptool_SOURCES = ncaptool.c ncaptool_mod.c dump_dns.c \ ncap.h ncaptool.h ncaptool_mod.h ncap_port.h dump_dns.h --- ncap-1.9.2.orig/check_libbind.m4 +++ ncap-1.9.2/check_libbind.m4 @@ -1,71 +1,9 @@ -### -### libbind -### -AC_ARG_WITH([libbind], AC_HELP_STRING([--with-libbind=DIR], - [libbind installation path]), [], [ withval="yes" ]) -AC_MSG_CHECKING([for libbind headers]) -if test x_$withval = x_yes; then - withval="/usr /usr/local" -fi - libbind_cflags="" libbind_ldflags="" -libbind_libs="-lbind" - -libbind_dir="" -for dir in $withval; do - if test -f "$dir/include/bind/arpa/nameser.h"; then - found_libbind_dir="yes" - libbind_dir="$dir" - libbind_cflags="-I$dir/include/bind" - break - fi -done - -if test x_$found_libbind_dir = x_yes; then - AC_MSG_RESULT([$dir]) -else - AC_MSG_ERROR([not found]) -fi - -AC_MSG_CHECKING([for libbind library]) - -if test x_$libbind_dir != x_/usr; then - libbind_ldflags="-L$libbind_dir/lib" -fi - -save_cflags="$CFLAGS" -save_ldflags="$LDFLAGS" -save_libs="$LIBS" - -CFLAGS="$CFLAGS $libbind_cflags" -LDFLAGS="$LDFLAGS $libbind_ldflags" -LIBS="$LIBS $libbind_libs" - -AC_LINK_IFELSE( - AC_LANG_PROGRAM([[ -#include -#include -#include -]], -[[ -ns_initparse(0,0,0); -ns_name_uncompress(0,0,0,0,0); -]]), - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_LIBBIND], [1], [Define to 1 if libbind works.]) - AC_DEFINE([HAVE_ARPA_NAMESER_H], [1], [Define to 1 if you have the header file.]) - , - AC_MSG_ERROR([not found]) - libbind_cflags="" - libbind_ldflags="" - libbind_libs="" -) - -CFLAGS="$save_cflags" -LDFLAGS="$save_ldflags" -LIBS="$save_libs" +libbind_libs="-lresolv" AC_SUBST([libbind_cflags]) AC_SUBST([libbind_ldflags]) AC_SUBST([libbind_libs]) + +AC_DEFINE([HAVE_LIBBIND], [1], [Define to 1 if libbind works.]) --- ncap-1.9.2.orig/configure.ac +++ ncap-1.9.2/configure.ac @@ -38,7 +38,7 @@ AC_HEADER_STDBOOL AC_HEADER_TIME -AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in_systm.h netinet/in.h dnl +AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h fcntl.h netinet/in_systm.h netinet/in.h dnl stddef.h sys/ioctl.h sys/param.h sys/types.h sys/socket.h sys/time.h]) AC_CHECK_HEADERS([net/if.h], [], [], --- ncap-1.9.2.orig/debian/changelog +++ ncap-1.9.2/debian/changelog @@ -0,0 +1,43 @@ +ncap (1.9.2-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 6. (Closes: #811930) + + -- Graham Inggs Mon, 26 Sep 2016 14:55:39 +0200 + +ncap (1.9.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Switch python-support to dh-python (Closes: #786095). + * Remove unnecessary XS-Python-Version: all. + + -- Graham Inggs Wed, 19 Aug 2015 23:02:57 +0200 + +ncap (1.9.2-2) unstable; urgency=medium + + * Run dh-autoreconf during the build; closes: #744638. + * Use glibc's libresolv instead of libbind. + + -- Robert S. Edmonds Sat, 23 Aug 2014 20:56:43 -0700 + +ncap (1.9.2-1) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - bump python-all-dev versioned depends + * debian/rules + - pass '--install-layout=deb' to 'setup.py install' + + [ Robert S. Edmonds ] + * New upstream release. + - rename 'pyncap' module to 'ncap'. + * Use python-support. + * Closes: #556785. + + -- Robert S. Edmonds Sat, 05 Dec 2009 12:21:03 -0800 + +ncap (1.9.1-1) unstable; urgency=low + + * Initial release; closes: #545791. + + -- Robert S. Edmonds Fri, 11 Sep 2009 19:55:40 -0400 --- ncap-1.9.2.orig/debian/compat +++ ncap-1.9.2/debian/compat @@ -0,0 +1 @@ +7 --- ncap-1.9.2.orig/debian/control +++ ncap-1.9.2/debian/control @@ -0,0 +1,62 @@ +Source: ncap +Section: net +Priority: optional +Maintainer: Robert S. Edmonds +Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.5.4-1~), + dh-python, autotools-dev, autoconf, automake, libtool, + libpcap0.8-dev, python-pyrex, dh-autoreconf +Standards-Version: 3.8.3 + +Package: libncap44 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: network capture library + ncap is a network capture library like libpcap (on which it is based) + and tcpdump. It produces binary data in its own ncap format, which can + be stored in a dump file or transmitted over a UDP socket. Unlike + libpcap, it discards data link headers and only supports IPv4 and IPv6 + packets, but it can perform reassembly of IP datagrams. + . + This package contains the shared library. + +Package: libncap-dev +Section: libdevel +Architecture: any +Depends: libncap44 (= ${binary:Version}), ${misc:Depends} +Description: static library and header files for libncap + ncap is a network capture library like libpcap (on which it is based) + and tcpdump. It produces binary data in its own ncap format, which can + be stored in a dump file or transmitted over a UDP socket. Unlike + libpcap, it discards data link headers and only supports IPv4 and IPv6 + packets, but it can perform reassembly of IP datagrams. + . + This package contains the static library, development headers, and + documentation. + +Package: ncaptool +Section: net +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: network capture tool + ncap is a network capture library like libpcap (on which it is based) + and tcpdump. It produces binary data in its own ncap format, which can + be stored in a dump file or transmitted over a UDP socket. Unlike + libpcap, it discards data link headers and only supports IPv4 and IPv6 + packets, but it can perform reassembly of IP datagrams. + . + This package contains the ncaptool command line program. + +Package: python-ncap +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings for libncap + ncap is a network capture library like libpcap (on which it is based) + and tcpdump. It produces binary data in its own ncap format, which can + be stored in a dump file or transmitted over a UDP socket. Unlike + libpcap, it discards data link headers and only supports IPv4 and IPv6 + packets, but it can perform reassembly of IP datagrams. + . + This package contains the Python bindings. --- ncap-1.9.2.orig/debian/copyright +++ ncap-1.9.2/debian/copyright @@ -0,0 +1,102 @@ +This package was debianized by Robert S. Edmonds on +Tue, 16 Jun 2009 23:54:44 -0400. + +It was downloaded from: + + ftp://ftp.isc.org/isc/ncap/ + +Copyright Holders: + + Copyright (C) 2007-2009 by Internet Systems Consortium, Inc. ("ISC") + +License: + + Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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. + +The Debian packaging is: + + Copyright (C) 2009 Robert S. Edmonds + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. + +Individual files: + +ipreasm.c: +ipreasm.h: + + Copyright (C) 2007 Jan Andres + + 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. + +pyncap/ncap.pyx: +pyncap/wrap.c: +pyncap/wrap.h: + +Copyright (c) 2008 Niels Provos. + + 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. + +acx_pthread.m4: + + Copyright (c) 2008 Steven G. Johnson + + 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, see . + + 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 Macro 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. + --- ncap-1.9.2.orig/debian/libncap-dev.install +++ ncap-1.9.2/debian/libncap-dev.install @@ -0,0 +1,3 @@ +usr/include +usr/lib/libncap.a +usr/lib/libncap*.so --- ncap-1.9.2.orig/debian/libncap44.install +++ ncap-1.9.2/debian/libncap44.install @@ -0,0 +1,2 @@ +usr/lib/libncap*.so.* +ncap.3 usr/share/man/man3 --- ncap-1.9.2.orig/debian/ncaptool.install +++ ncap-1.9.2/debian/ncaptool.install @@ -0,0 +1,2 @@ +usr/bin/ncaptool +usr/lib/ncaptool/*.so --- ncap-1.9.2.orig/debian/rules +++ ncap-1.9.2/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -Dlint +%: + dh $@ --with autoreconf --with python2 + +build: build-stamp +build-stamp: + dh build --before configure + autoreconf -fvi + dh build --remaining + cd pyncap && for python in $(shell pyversions -r); do $$python setup.py build; done + +override_dh_auto_install: + dh_auto_install + cd pyncap && for python in $(shell pyversions -r); do $$python setup.py install --root=../debian/python-ncap --install-layout=deb; done