diff -Nru xprobe-0.3/debian/changelog xprobe-0.3/debian/changelog --- xprobe-0.3/debian/changelog 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/changelog 2016-03-16 15:34:08.000000000 +0000 @@ -1,9 +1,17 @@ -xprobe (0.3-1.1ubuntu1) trusty; urgency=medium +xprobe (0.3-2) unstable; urgency=medium - * Use autotools-dev to update config.{sub,guess} instead of current method, - which doesn't appear to be working. + * Take over the package in the pkg-security team with the permission of + Richard Atterer. + * Use debhelper 9 (Closes: #817736) + * debian/control: remove non-working link to homepage project in Description + (Closes: #467256) + * Use dh-autoreconf (Closes: #536262, #769286, #756384) + * Use format 3.0 (quilt): update old patches + * Add a patch for the manpage + * Add a debian/watch + * debian/control: add misc depends - -- Logan Rosen Mon, 13 Jan 2014 21:50:08 -0500 + -- Sophie Brun Mon, 14 Mar 2016 16:09:08 +0100 xprobe (0.3-1.1) unstable; urgency=medium diff -Nru xprobe-0.3/debian/compat xprobe-0.3/debian/compat --- xprobe-0.3/debian/compat 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/compat 2016-03-16 15:34:08.000000000 +0000 @@ -1 +1 @@ -4 +9 diff -Nru xprobe-0.3/debian/control xprobe-0.3/debian/control --- xprobe-0.3/debian/control 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/control 2016-03-16 15:34:08.000000000 +0000 @@ -1,14 +1,18 @@ Source: xprobe Section: net Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Richard Atterer -Build-Depends: debhelper (>> 4), libpcap-dev (>= 0.7.1), autotools-dev -Standards-Version: 3.5.9 +Maintainer: Debian Security Tools Packaging Team +Uploaders: Sophie Brun +Build-Depends: debhelper (>= 9), + dh-autoreconf, + libpcap-dev (>= 0.7.1) +Standards-Version: 3.9.7 +Vcs-git: https://anonscm.debian.org/git/pkg-security/xprobe.git +Vcs-browser: https://anonscm.debian.org/cgit/pkg-security/xprobe.git Package: xprobe Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Provides: xprobe2 Description: Remote OS identification Xprobe2 allows you to determine what operating system is running on a @@ -23,5 +27,3 @@ - Can list the type of intermediate device (e.g. "Linux IP masquerading"). - Modular architecture allows new fingerprinting tests and new OS signatures to be added. - . - Project homepage: diff -Nru xprobe-0.3/debian/copyright xprobe-0.3/debian/copyright --- xprobe-0.3/debian/copyright 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/copyright 2016-03-16 15:34:08.000000000 +0000 @@ -1,30 +1,81 @@ -This package was debianized by Richard Atterer on -Wed, 15 Aug 2001 11:00:04 +0200. - -It was downloaded from - http://www.sys-security.com/html/projects/X.html - http://www.notlsd.net/xprobe/ - http://xprobe.sourceforge.net - -Upstream Authors: - Ofir Arkin , http://www.sys-security.com - Fyodor Yarochkin , http://www.notlsd.net - -Copyright: - - This package 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; version 2 dated June, 1991. - - This package 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 package; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xprobe +Source: http://www.sys-security.com/html/projects/X.html + http://www.notlsd.net/xprobe/ + http://xprobe.sourceforge.net +Comment: + This package was debianized by Richard Atterer on + Wed, 15 Aug 2001 11:00:04 +0200. + +Files: * +Copyright: 2001 Ofir Arkin , http://www.sys-security.com + 2001-2005 Fyodor Yarochkin , http://www.notlsd.net + 2001-2005 Meder Kydyraliev +License: GPL-2+ + +Files: cfg-scripts/install-sh +Copyright: 1991 the Massachusetts Institute of Technology +License: MIT + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + +Files: libs-external/USI++/* +Copyright: 1999-2001 Sebastian Krahmer +License: GPL-2+ + +Files: libs-external/USI++/usi++/if.h +Copyright: 1997, 1998 Free Software Foundation, Inc. +License: LGPL-2+ + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + The GNU C Library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + Floor, Boston, MA 02110-1301 USA. + . + On Debian GNU/Linux systems, the complete text of the GNU Library General + Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. + +Files: libs-external/USI++/fix/stl_alloc.h +Copyright: 1996-1997 Silicon Graphics Computer Systems, Inc. +License: other + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear + in supporting documentation. Silicon Graphics makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + +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. + . + 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. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru xprobe-0.3/debian/docs xprobe-0.3/debian/docs --- xprobe-0.3/debian/docs 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/docs 2016-03-16 15:34:08.000000000 +0000 @@ -1,4 +1,5 @@ AUTHORS +CREDITS README TODO docs/modules_howto.txt diff -Nru xprobe-0.3/debian/patches/fix-build-usi.patch xprobe-0.3/debian/patches/fix-build-usi.patch --- xprobe-0.3/debian/patches/fix-build-usi.patch 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/patches/fix-build-usi.patch 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix the build of libs-external/USI++/src +Author: Richard Atterer +Last-Update: 2016-03-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/libs-external/USI++/usi++/config.h ++++ b/libs-external/USI++/usi++/config.h +@@ -8,7 +8,7 @@ + #define HAVE_INTTYPES_H 1 + + /* Define to 1 if you have the `nsl' library (-lnsl). */ +-/* #undef HAVE_LIBNSL */ ++#define HAVE_LIBNSL 1 + + /* Define to 1 if you have the `pcap' library (-lpcap). */ + #define HAVE_LIBPCAP 1 +@@ -17,7 +17,7 @@ + /* #undef HAVE_LIBSOCKET */ + + /* Define to 1 if you have the header file. */ +-/* #undef HAVE_LINUX_FILTER_H */ ++#defne HAVE_LINUX_FILTER_H 1 + + /* Define to 1 if you have the header file. */ + #define HAVE_MEMORY_H 1 diff -Nru xprobe-0.3/debian/patches/fix-for-gcc4.3.patch xprobe-0.3/debian/patches/fix-for-gcc4.3.patch --- xprobe-0.3/debian/patches/fix-for-gcc4.3.patch 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/patches/fix-for-gcc4.3.patch 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Fix FTBFS with gcc 4.3 +Author: Luk Claes +Bug-Debian: https://bugs.debian.org/417779 +Last-Update: 2016-03-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/libs-external/USI++/src/ip.cc ++++ b/libs-external/USI++/src/ip.cc +@@ -13,6 +13,7 @@ + #include "usi++/ip.h" + + #include "config.h" ++#include + #include + #include + #include +--- a/libs-external/USI++/src/misc.cc ++++ b/libs-external/USI++/src/misc.cc +@@ -1,5 +1,6 @@ + #include "usi++/usi++" + #include "usi++/usi-structs.h" ++#include + #include + #include + #include +--- a/libs-external/USI++/usi++/tcp.h ++++ b/libs-external/USI++/usi++/tcp.h +@@ -15,6 +15,7 @@ + #include "usi-structs.h" + #include "datalink.h" + #include "ip.h" ++#include + + namespace usipp { + diff -Nru xprobe-0.3/debian/patches/fix-man-page.patch xprobe-0.3/debian/patches/fix-man-page.patch --- xprobe-0.3/debian/patches/fix-man-page.patch 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/patches/fix-man-page.patch 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,101 @@ +Description: Update the manpage + Fix the title to have the correct section + Drop the reference to undefined macro Sp + Change homepage URL +Author: Sophie Brun +Last-Update: 2016-03-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/docs/xprobe2.1 ++++ b/docs/xprobe2.1 +@@ -21,7 +21,7 @@ + + .\" Generate man page: groff -man -Tascii xprobe.1 + +-.TH XPROBE2 "$Id: xprobe2.1,v 1.18 2005/07/26 12:48:59 mederchik Exp $" ++.TH XPROBE2 1 + .SH NAME + xprobe2 \- A Remote active operating system fingerprinting tool. + .SH SYNOPSIS +@@ -124,7 +124,7 @@ causes \fIxprobe2\fP to be a bit more no + enable built-in portscanning module, which will attempt to scan TCP and/or UDP ports respectively, which were specified in \fIport spec\fP + .TP + .B -A +-enable experimental support for detection of transparent proxies and firewalls/NIDSs spoofing RST packets in portscanning module. Option should be used in conjunction with -T. All responses from target gathered during portscanning process are divided in two classes (SYN|ACK and RST) and saved for analysis. During analysis module will search for different packets, based on some of the fields of TCP and IP headers, withing the same class and if such packets are found, message will be displayed showing different packets withing the same class. ++enable experimental support for detection of transparent proxies and firewalls/NIDSs spoofing RST packets in portscanning module. Option should be used in conjunction with -T. All responses from target gathered during portscanning process are divided in two classes (SYN|ACK and RST) and saved for analysis. During analysis module will search for different packets, based on some of the fields of TCP and IP headers, within the same class and if such packets are found, message will be displayed showing different packets within the same class. + .SH EXAMPLES + .LP + .RS +@@ -132,7 +132,6 @@ enable experimental support for detectio + \fBxprobe2 -v -D 1 -D 2 192.168.1.10\fP + .fi + +-.Sp + Will launch an OS fingerprinting attempt targeting 192.168.1.10. Modules 1 and 2, which are reachability tests, will be disabled, so probes will be sent even if target is down. Output will be verbose. + + .RE +@@ -141,7 +140,6 @@ Will launch an OS fingerprinting attempt + \fBxprobe2 -v -p udp:53:closed 192.168.1.20\fP + .fi + +-.Sp + Will launch an OS fingerprint attempt targeting 192.168.1.20. The UDP destination port is set to 53, and the output will be verbose. + + .RE +@@ -150,8 +148,7 @@ Will launch an OS fingerprint attempt ta + \fBxprobe2 -M 11 -p tcp:80:open 192.168.1.1\fP + .fi + +-.Sp +-Will only enable TCP handshake module (number 11) to probe the target, very usefull when all ICMP traffic is filtered. ++Will only enable TCP handshake module (number 11) to probe the target, very useful when all ICMP traffic is filtered. + .RE + .RS + +@@ -159,7 +156,6 @@ Will only enable TCP handshake module (n + \fBxprobe2 -B 192.168.1.1\fP + .fi + +-.Sp + Will cause TCP handshake module to try blindly guess open port on the target by sequentially sending TCP packets to the most likely open ports (80, 443, 23, 21, 25, 22, 139, 445 and 6000). + .RE + +@@ -168,7 +164,6 @@ Will cause TCP handshake module to try b + \fBxprobe2 -T 1-1024 127.0.0.1\fP + .fi + +-.Sp + Will enable portscanning module, which will scan TCP ports starting from 1 to 1024 on 127.0.0.1 + .RE + +@@ -177,7 +172,6 @@ Will enable portscanning module, which w + \fBxprobe2 -p tcp:139:open 192.168.1.2\fP + .fi + +-.Sp + If remote target has TCP port 139 open, the command line above will enable application level SMB module (if remote target has TCP port 445 open, substitue 139 in the command line with 445). + .RE + +@@ -186,7 +180,6 @@ If remote target has TCP port 139 open, + \fBxprobe2 -p udp:161:open 192.168.1.10\fP + .fi + +-.Sp + Will enable SNMPv2c application level module, which will try to retrieve sysDescr.0 OID using community strings taken from xprobe2.conf file. + .RE + +@@ -206,13 +199,9 @@ Fyodor Yarochkin , Ofir A + .PP + (see also CREDITS in distro tarball). + .SH AVAILABILITY +-The current version and relevant documentation is available from following urls: ++The current version and relevant documentation is available from following url: + .br +-.I http://www.sys-security.com/html/projects/X.html +-.br +-.I http://xprobe.sourceforge.net +-.br +-.I http://www.notlsd.net/xprobe/ ++.I https://sourceforge.net/projects/xprobe/ + .SH BUGS + None known (please report). diff -Nru xprobe-0.3/debian/patches/series xprobe-0.3/debian/patches/series --- xprobe-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/patches/series 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,3 @@ +fix-build-usi.patch +fix-for-gcc4.3.patch +fix-man-page.patch diff -Nru xprobe-0.3/debian/rules xprobe-0.3/debian/rules --- xprobe-0.3/debian/rules 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/debian/rules 2016-03-16 15:34:08.000000000 +0000 @@ -1,57 +1,6 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -configure: configure-stamp -configure-stamp: - dh_testdir src/xprobe.cc - dh_autotools-dev_updateconfig - ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir src/xprobe.cc - $(MAKE) - touch build-stamp - -clean: - dh_testdir src/xprobe.cc - dh_testroot - rm -f build-stamp configure-stamp - -$(MAKE) distclean - dh_autotools-dev_restoreconfig - dh_clean - -install: build - dh_testdir src/xprobe.cc - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/xprobe - sed 's%CREDITS in distro tarball%/usr/share/doc/xprobe/CREDITS%; s%^\.TH XPROBE2 %.TH XPROBE2 "1"%' debian/xprobe/usr/share/man/man1/xprobe2.1 - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir src/xprobe.cc - dh_testroot - dh_installdocs CREDITS -# dh_installexamples - dh_installchangelogs CHANGELOG - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ --with autoreconf diff -Nru xprobe-0.3/debian/source/format xprobe-0.3/debian/source/format --- xprobe-0.3/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/source/format 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru xprobe-0.3/debian/watch xprobe-0.3/debian/watch --- xprobe-0.3/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/watch 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,2 @@ +version=4 +http://sf.net/xprobe/ xprobe2-(.+)\.tar\.gz debian uupdate diff -Nru xprobe-0.3/debian/xprobe.doc-base xprobe-0.3/debian/xprobe.doc-base --- xprobe-0.3/debian/xprobe.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ xprobe-0.3/debian/xprobe.doc-base 2016-03-16 15:34:08.000000000 +0000 @@ -0,0 +1,12 @@ +Document: xprobe2 +Title: xprobe2 User's Manual +Author: Ofir Arkin, Fyodor Yarochkin +Abstract: This manual describes how to use xprobe2, a 'fuzzy' approach + to remote active operating system fingerprinting. +Section: System/Security + +Format: Pdf +Files: /usr/share/doc/xprobe/xprobe2-defcon10.pdf.gz + +Format: Text +Files: /usr/share/doc/xprobe/*.txt.gz diff -Nru xprobe-0.3/libs-external/USI++/src/ip.cc xprobe-0.3/libs-external/USI++/src/ip.cc --- xprobe-0.3/libs-external/USI++/src/ip.cc 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/libs-external/USI++/src/ip.cc 2005-07-27 08:38:15.000000000 +0000 @@ -13,7 +13,6 @@ #include "usi++/ip.h" #include "config.h" -#include #include #include #include diff -Nru xprobe-0.3/libs-external/USI++/src/misc.cc xprobe-0.3/libs-external/USI++/src/misc.cc --- xprobe-0.3/libs-external/USI++/src/misc.cc 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/libs-external/USI++/src/misc.cc 2005-07-27 08:38:15.000000000 +0000 @@ -1,6 +1,5 @@ #include "usi++/usi++" #include "usi++/usi-structs.h" -#include #include #include #include diff -Nru xprobe-0.3/libs-external/USI++/usi++/config.h xprobe-0.3/libs-external/USI++/usi++/config.h --- xprobe-0.3/libs-external/USI++/usi++/config.h 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/libs-external/USI++/usi++/config.h 2005-07-27 08:38:14.000000000 +0000 @@ -8,7 +8,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `nsl' library (-lnsl). */ -#define HAVE_LIBNSL 1 +/* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pcap' library (-lpcap). */ #define HAVE_LIBPCAP 1 @@ -17,7 +17,7 @@ /* #undef HAVE_LIBSOCKET */ /* Define to 1 if you have the header file. */ -#define HAVE_LINUX_FILTER_H 1 +/* #undef HAVE_LINUX_FILTER_H */ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 diff -Nru xprobe-0.3/libs-external/USI++/usi++/tcp.h xprobe-0.3/libs-external/USI++/usi++/tcp.h --- xprobe-0.3/libs-external/USI++/usi++/tcp.h 2016-03-22 20:52:20.000000000 +0000 +++ xprobe-0.3/libs-external/USI++/usi++/tcp.h 2005-07-27 08:38:14.000000000 +0000 @@ -15,7 +15,6 @@ #include "usi-structs.h" #include "datalink.h" #include "ip.h" -#include namespace usipp {