Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2015-11-26 17:03:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nmap" Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2015-10-08 08:24:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2015-11-26 17:03:38.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Nov 22 17:31:09 UTC 2015 - [email protected] + +- Nmap 7.00: + * see /usr/share/doc/packages/nmap/CHANGELOG +- removed patches: + * nmap-4.00-noreturn.diff + * nmap-6.00-libpcap-filter.diff + not needed since we do not build against the bundled libpcap +- updated patch: + * nmap-ncat-skip-network-tests.patch + +------------------------------------------------------------------- Old: ---- nmap-4.00-noreturn.diff nmap-6.00-libpcap-filter.diff nmap-6.47.tar.bz2 nmap-6.47.tar.bz2.asc New: ---- nmap-7.00.tar.bz2 nmap-7.00.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.PKEFyv/_old 2015-11-26 17:03:40.000000000 +0100 +++ /var/tmp/diff_new_pack.PKEFyv/_new 2015-11-26 17:03:40.000000000 +0100 @@ -20,21 +20,19 @@ %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define with_system_lua 0%{?suse_version} >= 1220 Name: nmap -Version: 6.47 +Version: 7.00 Release: 0 Summary: Portscanner License: GPL-2.0+ Group: Productivity/Networking/Diagnostic -Url: http://nmap.org/ -Source: http://nmap.org/dist/nmap-%{version}.tar.bz2 +Url: https://nmap.org/ +Source: https://nmap.org/dist/nmap-%{version}.tar.bz2 Source1: https://svn.nmap.org/nmap/docs/nmap_gpgkeys.txt#/%{name}.keyring Source2: http://nmap.org/dist/sigs/%{name}-%{version}.tar.bz2.asc -Patch0: nmap-6.00-libpcap-filter.diff -Patch1: nmap-4.00-noreturn.diff -Patch2: nmap-5.61-desktop_files.patch -Patch3: nmap-4.75-nostrip.patch -Patch5: su-to-zenmap.patch -Patch7: nmap-ncat-skip-network-tests.patch +Patch1: nmap-5.61-desktop_files.patch +Patch2: nmap-4.75-nostrip.patch +Patch3: su-to-zenmap.patch +Patch4: nmap-ncat-skip-network-tests.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ @@ -112,12 +110,13 @@ %prep %setup -q -%patch0 %patch1 %patch2 %patch3 -%patch5 -%patch7 -p1 +%patch4 -p1 + +# use system provided libraries +rm -rf libpcap libpcre macosx mswin32 #fix locale dir mv zenmap/share/zenmap/locale zenmap/share @@ -148,6 +147,7 @@ %install make DESTDIR=%{buildroot} deskdir="%{_datadir}/gnome/apps/Utilities/" install rm "%{buildroot}%{_bindir}/uninstall_zenmap" +rm "%{buildroot}%{_bindir}/uninstall_ndiff" install -d "%{buildroot}%{_datadir}/pixmaps/" ln -s ../zenmap/pixmaps/zenmap.png "%{buildroot}%{_datadir}/pixmaps/zenmap.png" %suse_update_desktop_file zenmap System Network ++++++ nmap-6.47.tar.bz2 -> nmap-7.00.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/nmap/nmap-6.47.tar.bz2 /work/SRC/openSUSE:Factory/.nmap.new/nmap-7.00.tar.bz2 differ: char 11, line 1 ++++++ nmap-ncat-skip-network-tests.patch ++++++ --- /var/tmp/diff_new_pack.PKEFyv/_old 2015-11-26 17:03:40.000000000 +0100 +++ /var/tmp/diff_new_pack.PKEFyv/_new 2015-11-26 17:03:40.000000000 +0100 @@ -1,43 +1,44 @@ -From: Andreas Stieger <[email protected]> -Date: 2012-12-08 13:31:24 +0000 -Subject: [PATCH] ncat - skip tests requiring name resolution -References: http://seclists.org/nmap-dev/2012/q4/373 -Upstream: never +From 7aa8e9fd460f274931641b17be20f6c6c2242a1b Mon Sep 17 00:00:00 2001 +From: Martin Hauke <[email protected]> +Date: Sun, 22 Nov 2015 18:20:31 +0100 +Subject: [PATCH] ncat - skip tests requiring name resolution References: + http://seclists.org/nmap-dev/2012/q4/373 Upstream: never Some tests in the ncat test script require name resolution which is not available in OBS. Remove tests. - --- - ncat/test/test-addrset.sh | 20 -------------------- - 1 file changed, 20 deletions(-) + ncat/test/test-addrset.sh | 19 ------------------- + 1 file changed, 19 deletions(-) -Index: nmap-6.25/ncat/test/test-addrset.sh -=================================================================== ---- nmap-6.25.orig/ncat/test/test-addrset.sh 2012-12-08 13:30:07.000000000 +0000 -+++ nmap-6.25/ncat/test/test-addrset.sh 2012-12-08 13:30:37.000000000 +0000 -@@ -227,26 +227,6 @@ test_addrset "1:2::0003/0" "1:2::3 1:2:: +diff --git a/ncat/test/test-addrset.sh b/ncat/test/test-addrset.sh +index 7f54023..1a7944e 100755 +--- a/ncat/test/test-addrset.sh ++++ b/ncat/test/test-addrset.sh +@@ -227,25 +227,6 @@ test_addrset "1:2::0003/0" "1:2::3 1:2::0 1:2::ff 1:2::1ff 1:3::3 ff::00" <<EOF ff::00 EOF -# Name lookup. --test_addrset "google.com" "google.com" <<EOF +-test_addrset "scanme.nmap.org" "scanme.nmap.org" <<EOF -1:2::3:4 -1.2.3.4 --google.com +-scanme.nmap.org -EOF - -# Name lookup combined with CIDR netmask. --test_addrset "google.com/30" "google.com" <<EOF +-test_addrset "scanme.nmap.org/30" "scanme.nmap.org" <<EOF -1:2::3:4 -1.2.3.4 --google.com +-scanme.nmap.org -EOF - -# Name lookup combined with /0 CIDR netmask. --test_addrset "google.com/0" "1.2.3.4 google.com" <<EOF +-test_addrset "scanme.nmap.org/0" "1.2.3.4 scanme.nmap.org" <<EOF -1.2.3.4 --google.com +-scanme.nmap.org -EOF -- + expect_fail "." expect_fail "-" - expect_fail "," +-- +1.8.4.5 + ++++++ nmap.keyring ++++++ --- /var/tmp/diff_new_pack.PKEFyv/_old 2015-11-26 17:03:40.000000000 +0100 +++ /var/tmp/diff_new_pack.PKEFyv/_new 2015-11-26 17:03:40.000000000 +0100 @@ -1,11 +1,11 @@ GPG detached signatures and MD5/SHA-1 hashes for each Nmap release are -available from http://nmap.org/dist/sigs/?C=M;O=D . The +available from https://nmap.org/dist/sigs/?C=M;O=D . The releases are signed by the Nmap project GPG key (KeyId 6B9355D0). Some messages to Nmap mailing lists may be signed by Nmap author and maintainer Fyodor. Fyodor's KeyID is 33599B5F. Those two keys and their fingerprints are reproduced below. The latest version of this file is always available at -http://nmap.org/data/nmap_gpgkeys.txt . +https://nmap.org/data/nmap_gpgkeys.txt . To verify a file with GPG, obtain and import the keys with a command such as "gpg --import nmap_gpgkeys.txt" and then verify the obtained
