Commit fb53d946 authored by Sophie Brun's avatar Sophie Brun
Browse files

Merge branch 'debian'

parents 171eb374 07f71036
nmap (7.70+dfsg1-3) unstable; urgency=medium
* Make ncat Architecture: any
* Fix ncat description
-- Hilko Bengen <bengen@debian.org> Mon, 09 Apr 2018 11:49:11 +0200
nmap (7.70+dfsg1-2) unstable; urgency=medium
[ Samuel Henrique ]
* Bump DH to 11
* d/copyright: update debian/* entry
[ Hilko Bengen ]
* Ship ncat as separate package, provide nc alternative
(Closes: #881639, #560377)
-- Hilko Bengen <bengen@debian.org> Sun, 08 Apr 2018 22:17:31 +0200
nmap (7.70+dfsg1-1) unstable; urgency=medium
* Team upload.
[ Lukas Schwaighofer ]
* Leave embedded copy of libssh2 in the source package to ease packaging for
Ubuntu (which requires the embedded copy).
- Update debian/copyright with the libssh2 copyright details.
* Update debian/rules to use the included libssh2 copy when builing for
Ubuntu and its derivates.
[ Samuel Henrique ]
* d/[control|watch]: update upstream homepage to https
[ Raphaël Hertzog ]
* Update team maintainer address to Debian Security Tools
<team+pkg-security@tracker.debian.org>
* Update Vcs-Git and Vcs-Browser for the move to salsa.debian.org
[ Hilko Bengen ]
* New upstream version 7.70+dfsg1
* Bump Standards-Version
* nmap: Suggest ndiff, instead of recommending it (Closes: #885871)
* Update patches
-- Hilko Bengen <bengen@debian.org> Tue, 27 Mar 2018 21:48:37 +0200
nmap (7.70+dfsg1-0kali2) kali-dev; urgency=medium
* Rebuild with Debian orig.tag.xz
......
Source: nmap
Section: net
Priority: optional
Maintainer: Debian Security Tools Packaging Team <pkg-security-team@lists.alioth.debian.org>
Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
Uploaders: Hilko Bengen <bengen@debian.org>,
Samuel Henrique <samueloph@gmail.com>
Build-Depends: bison,
debhelper (>=10),
debhelper (>=11),
dh-python,
flex,
libgtk2.0-dev,
......@@ -19,8 +19,8 @@ Build-Depends: bison,
python
Build-Depends-Indep: default-jdk-headless,
gcc-mingw-w64-i686
Standards-Version: 4.1.0
Homepage: http://nmap.org/
Standards-Version: 4.1.3
Homepage: https://nmap.org/
Vcs-Git: git://git.kali.org/packages/nmap.git
Vcs-Browser: http://git.kali.org/gitweb/?p=packages/nmap.git;a=summary
......@@ -30,8 +30,7 @@ Depends: nmap-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Recommends: ndiff
Suggests: zenmap
Suggests: ncat, ndiff, zenmap
Description: The Network Mapper
Nmap is a utility for network exploration or security auditing. It
supports ping scanning (determine which hosts are up), many port
......@@ -93,3 +92,14 @@ Depends: python-lxml,
Description: The Network Mapper - result compare utility
Ndiff is a tool to aid in the comparison of Nmap scans. It takes two
Nmap XML output files and prints the differences between them.
Package: ncat
Architecture: any
Breaks: nmap (<< 7.70+dfsg1-2~)
Replaces: nmap (<< 7.70+dfsg1-2~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: NMAP netcat reimplementation
ncat is a reimplementation of Netcat by the NMAP project, providing
most of the features present in the original implementations, along
with some new features such as IPv6 and SSL support. Port scanning
support has been removed.
......@@ -11,7 +11,6 @@ Files-Excluded: mswin32
liblua
libpcap
libpcre
libssh2
libz
nselib/data/jdwp-class/*.class
......@@ -22,9 +21,10 @@ License: nmap-GPL-2
Files: debian/*
Copyright: 1997-1999, Bdale Garbee <bdale@gag.com>
1999-2010, LaMont Jones <lamont@debian.org>
2012-2017, Hilko Bengen <bengen@debian.org>
2016-2017, Samuel Henrique <samueloph@gmail.com>
2012-2018, Hilko Bengen <bengen@debian.org>
2016-2018, Samuel Henrique <samueloph@gmail.com>
2017, Lukas Schwaighofer <lukas@schwaighofer.name>
2018, Raphaël Hertzog <hertzog@debian.org>
License: nmap-GPL-2
Files: aclocal.m4 configure depcomp ltmain.sh nbase/configure ncat/Makefile.in
......@@ -121,6 +121,44 @@ Files: shtool
Copyright: 1994-2008, Ralf S. Engelschall <rse@engelschall.com>
License: GPL-2+
Files: libssh2/*
Copyright: 2004-2007 Sara Golemon <sarag@libssh2.org>
2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
2006-2007 The Written Word, Inc.
2007 Eli Fant <elifantu@mail.ru>
2009-2014 Daniel Stenberg
2008, 2009 Simon Josefsson
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/Makefile.in libssh2/aclocal.m4 libssh2/configure libssh2/m4/*
libssh2/src/Makefile.in
Copyright: 1991-2015, Free Software Foundation, Inc.
Comment: May be distributed under the same license as the rest of the program.
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/m4/autobuild.m4
Copyright: 2004, 2006, Simon Josefsson
Comment: May be distributed under the same license as the rest of the program.
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/nw/*
Copyright: Guenter Knauf, Ulrich Neumann
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/os400/* libssh2/src/os400qc3.c libssh2/src/os400qc3.h
Copyright: 2015, Patrick Monnerat, D+H <patrick.monnerat@dh.com>
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/src/libssh2_config_cmake.h.in
Copyright: 2014, Alexander Lamaison <alexander.lamaison@gmail.com>
1999-2011, Douglas Gilbert
License: BSD-3-clause-copyright-holders-contributors
Files: libssh2/src/wincng.c
libssh2/src/wincng.h
Copyright: 2013-2015, Marc Hoersken <info@marc-hoersken.de>
License: BSD-3-clause-copyright-holders-contributors
License: nmap-GPL-2
This program is free software; you may redistribute and/or modify it
under the terms of the GNU General Public License as published by the
......@@ -341,6 +379,40 @@ License: BSD-3-clause-institute
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
License: BSD-3-clause-copyright-holders-contributors
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
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.
.
Neither the name of the copyright holder nor the names
of any other contributors may be used to endorse or
promote products derived from this software without
specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
License: BSD-4-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......
usr/bin/ncat
usr/share/ncat
usr/share/man/man1/ncat.1
#!/bin/sh
set -e
if [ "$1" = "configure" ]; then
update-alternatives \
--install /bin/nc nc /usr/bin/ncat 40 \
--slave /bin/netcat netcat /usr/bin/ncat \
--slave /usr/share/man/man1/nc.1.gz nc.1.gz \
/usr/share/man/man1/ncat.1.gz \
--slave /usr/share/man/man1/netcat.1.gz netcat.1.gz \
/usr/share/man/man1/ncat.1.gz
fi
#DEBHELPER#
#!/bin/sh
set -e
if [ "$1" = "remove" ]; then
update-alternatives --remove nc /usr/bin/ncat
fi
#DEBHELPER#
usr/share/ncat
usr/share/nmap
docs/3rd-party-licenses.txt usr/share/doc/nmap/
docs/committers.txt usr/share/doc/nmap/
......
usr/bin/ncat
usr/bin/nmap
usr/bin/nping
usr/share/man/*/man1/nmap.1
usr/share/man/man1/ncat.1
usr/share/man/man1/nmap.1
usr/share/man/man1/nping.1
......@@ -6,10 +6,10 @@ Subject: use su-to-root
zenmap/install_scripts/unix/zenmap-root.desktop | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: nmap/zenmap/install_scripts/unix/zenmap-root.desktop
===================================================================
--- nmap.orig/zenmap/install_scripts/unix/zenmap-root.desktop
+++ nmap/zenmap/install_scripts/unix/zenmap-root.desktop
diff --git a/zenmap/install_scripts/unix/zenmap-root.desktop b/zenmap/install_scripts/unix/zenmap-root.desktop
index c5f4c10..f50029d 100644
--- a/zenmap/install_scripts/unix/zenmap-root.desktop
+++ b/zenmap/install_scripts/unix/zenmap-root.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Name=Zenmap (as root)
......
......@@ -7,7 +7,7 @@ Subject: Use Debian's ca-certificates
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ncat/ncat_posix.c b/ncat/ncat_posix.c
index 37da366..9c42792 100644
index 3b01936..f7510d8 100644
--- a/ncat/ncat_posix.c
+++ b/ncat/ncat_posix.c
@@ -415,7 +415,7 @@ void set_lf_mode(void)
......
......@@ -7,7 +7,7 @@ Subject: Link against lua-lpeg
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3d00e16..38deb12 100644
index 9bea4c8..401ddee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,7 +826,7 @@ else
......
Description: Report correct versions for libssh2 and zlib
Do not report the versions from the libssh2/libssh2v.h and libz/libzv.h files,
because they are not correct when nmap is linked against the system version of
these (instead of the version bundled with nmap). Instead use the version
facility provided by the libraries themselves.
Origin: upstream
Bug: https://github.com/nmap/nmap/pull/957
---
nmap.cc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/nmap.cc b/nmap.cc
index ec46267..6fc3e8f 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -182,11 +182,19 @@
#endif
#if HAVE_LIBSSH2
-#include <libssh2.h>
+#ifdef LIBSSH2_INCLUDED
+#include "libssh2/libssh2v.h"
+#else
+#include "libssh2.h"
+#endif
#endif
#if HAVE_LIBZ
-#include <zlib.h>
+#ifdef ZLIB_INCLUDED
+#include "libz/libzv.h"
+#else
+#include "zlib.h"
+#endif
#endif
/* To get the version number only. */
0001-use-su-to-root.patch
0002-Use-Debian-s-ca-certificates.patch
0003-Link-against-lua-lpeg.patch
0004-library-versions.patch
......@@ -3,6 +3,10 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
VENDOR_CONFIGURE_OPTIONS = --with-libssh2=included
endif
%:
dh $@ --with=python2
......@@ -12,7 +16,7 @@ override_dh_auto_clean:
override_dh_auto_configure:
cp -r debian/libpcap .
dh_auto_configure -- --with-liblua --with-liblinear --with-libpcap=included --enable-ipv6 STRIP=/bin/true
dh_auto_configure -- --with-liblua --with-liblinear --with-libpcap=included --enable-ipv6 STRIP=/bin/true $(VENDOR_CONFIGURE_OPTIONS)
override_dh_auto_build-indep:
dh_auto_build
......
version=4
opts="uversionmangle=s/(beta|test)/~\\1/i,pgpsigurlmangle=s%/dist/(.*)$%/dist/sigs/\\1.asc%,dversionmangle=s/\+dfsg\d*$//,repacksuffix=+dfsg1,repack,compression=xz" \
http://nmap.org/dist/nmap-(\d+\..*)\.tar.*
https://nmap.org/dist/nmap-(\d+\..*)\.tar.*
# Copyright (c) 2014, 2015 Alexander Lamaison <alexander.lamaison@gmail.com>
#
# 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
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials
# provided with the distribution.
#
# Neither the name of the copyright holder nor the names
# of any other contributors may be used to endorse or
# promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
project(libssh2 C)
set(PROJECT_URL "https://www.libssh2.org/")
set(PROJECT_DESCRIPTION "The SSH library")
if (CMAKE_VERSION VERSION_LESS "3.1")
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
set (CMAKE_C_FLAGS "--std=gnu90 ${CMAKE_C_FLAGS}")
endif()
else()
set (CMAKE_C_STANDARD 90)
endif()
option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
# Parse version
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/libssh2.h _HEADER_CONTENTS)
string(
REGEX REPLACE ".*#define LIBSSH2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
LIBSSH2_VERSION "${_HEADER_CONTENTS}")
string(
REGEX REPLACE ".*#define LIBSSH2_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1"
LIBSSH2_VERSION_MAJOR "${_HEADER_CONTENTS}")
string(
REGEX REPLACE ".*#define LIBSSH2_VERSION_MINOR[ \t]+([0-9]+).*" "\\1"
LIBSSH2_VERSION_MINOR "${_HEADER_CONTENTS}")
string(
REGEX REPLACE ".*#define LIBSSH2_VERSION_PATCH[ \t]+([0-9]+).*" "\\1"
LIBSSH2_VERSION_PATCH "${_HEADER_CONTENTS}")
if(NOT LIBSSH2_VERSION OR
NOT LIBSSH2_VERSION_MAJOR MATCHES "^[0-9]+$" OR
NOT LIBSSH2_VERSION_MINOR MATCHES "^[0-9]+$" OR
NOT LIBSSH2_VERSION_PATCH MATCHES "^[0-9]+$")
message(
FATAL_ERROR
"Unable to parse version from"
"${CMAKE_CURRENT_SOURCE_DIR}/include/libssh2.h")
endif()
include(GNUInstallDirs)
install(
FILES docs/AUTHORS COPYING docs/HACKING README RELEASE-NOTES NEWS
DESTINATION ${CMAKE_INSTALL_DOCDIR})
include(max_warnings)
include(FeatureSummary)
add_subdirectory(src)
option(BUILD_EXAMPLES "Build libssh2 examples" ON)
if(BUILD_EXAMPLES)
add_subdirectory(example)
endif()
option(BUILD_TESTING "Build libssh2 test suite" ON)
if(BUILD_TESTING)
enable_testing()
add_subdirectory(tests)
endif()
add_subdirectory(docs)
feature_summary(WHAT ALL)
set(CPACK_PACKAGE_VERSION_MAJOR ${LIBSSH2_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${LIBSSH2_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${LIBSSH2_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION ${LIBSSH2_VERSION})
include(CPack)
/* Copyright (c) 2004-2007 Sara Golemon <sarag@libssh2.org>
* Copyright (c) 2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
* Copyright (c) 2006-2007 The Written Word, Inc.
* Copyright (c) 2007 Eli Fant <elifantu@mail.ru>
* Copyright (c) 2009-2014 Daniel Stenberg
* Copyright (C) 2008, 2009 Simon Josefsson
* All rights reserved.
*
* 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
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the copyright holder nor the names
* of any other contributors may be used to endorse or
* promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
*/
CRYPTO_CSOURCES = openssl.c
CRYPTO_HHEADERS = openssl.h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment