Hello community,
here is the log from the commit of package nmap for openSUSE:Factory checked in
at 2018-05-11 09:19:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nmap (Old)
and /work/SRC/openSUSE:Factory/.nmap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nmap"
Fri May 11 09:19:01 2018 rev:58 rq:606288 version:7.70
Changes:
--------
--- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2018-03-24
16:16:39.368737647 +0100
+++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2018-05-11
09:19:02.756839535 +0200
@@ -1,0 +2,8 @@
+Thu May 10 12:31:02 UTC 2018 - kstreit...@suse.com
+
+- don't build zenmap and ndiff python2 subpackages because of the
+ python2 deprecation in Tumbleweed
+- run spec-cleaner
+- tweak Summaries and Descriptions
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nmap.spec ++++++
--- /var/tmp/diff_new_pack.pbRxbh/_old 2018-05-11 09:19:04.012794028 +0200
+++ /var/tmp/diff_new_pack.pbRxbh/_new 2018-05-11 09:19:04.012794028 +0200
@@ -19,11 +19,17 @@
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?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} >= 1330
+# don't build python2 subpackages (zenmap, ndiff) because of the python2
deprecation in Tumbleweed
+%if 0%{?suse_version} > 1500
+%define with_python2 0
+%else
+%define with_python2 1
+%endif
Name: nmap
Version: 7.70
Release: 0
-Summary: Portscanner
-License: GPL-2.0+
+Summary: Network exploration tool and security scanner
+License: GPL-2.0-or-later
Group: Productivity/Networking/Diagnostic
Url: https://nmap.org/
Source: https://nmap.org/dist/nmap-%{version}.tar.bz2
@@ -42,7 +48,6 @@
BuildRequires: pcre-devel
BuildRequires: python-devel
BuildRequires: update-desktop-files
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with_system_lua}
%if 0%{?suse_version} > 1320
BuildRequires: Lua(devel) = 5.3
@@ -52,77 +57,88 @@
%endif
%description
-Nmap is designed to allow system administrators and curious individuals
-to scan large networks to determine which hosts are up and what
-services they are offering. XNmap is a graphical front-end that shows
-nmap's output clearly.
-
-Find documentation in %{_docdir}/%{name}
+Nmap ("Network Mapper") is a free and open source utility
+for network exploration or security auditing. Many systems and network
+administrators also find it useful for tasks such as network
+inventory, managing service upgrade schedules, and monitoring host or
+service uptime. Nmap uses raw IP packets in novel ways to determine
+what hosts are available on the network, what services (application
+name and version) those hosts are offering, what operating systems
+(and OS versions) they are running, what type of packet
+filters/firewalls are in use, and dozens of other characteristics. It
+was designed to rapidly scan large networks, but works fine against
+single hosts. Nmap runs on all major computer operating systems, and
+both console and graphical versions are available.
+%if %{with_python2}
%package -n zenmap
-Summary: A Graphical Front-End for Nmap
+Summary: A graphical front-end for Nmap
Group: Productivity/Networking/Diagnostic
Requires: %{name} = %{version}
Requires: python-gtk
Obsoletes: %{name}-gtk < %{version}
Provides: %{name}-gtk = %{version}-%{release}
-%py_requires
%description -n zenmap
zenmap is a graphical front-end for the nmap network scanner
-%package -n ncat
-Summary: Network Tool to concatenate and redirect Sockets
-Group: Productivity/Networking/Diagnostic
-
-%description -n ncat
-Ncat is a feature-packed networking utility which will read and write data
-across a network from the command line. Ncat was written for the Nmap Project
-and is the culmination of the currently splintered family of Netcat
-incarnations. It uses both TCP and UDP for communication and is designed to be
-a reliable back-end tool to instantly provide network connectivity to other
-applications and users. Ncat will not only work with IPv4 and IPv6 but provides
-the user with a virtually limitless number of potential uses.
-
-Among Ncat´s vast number of features there is the ability to chain Ncats
-together, redirect both TCP and UDP ports to other sites, SSL support, and
-proxy connections via SOCKS4 or HTTP (CONNECT method) proxies (with optional
-proxy authentication as well). Some general principles apply to most
-applications and thus give you the capability of instantly adding networking
-support to software that would normally never support it.
-
%package -n ndiff
-Summary: Compare Results of Nmap Scans
+Summary: Compare results of Nmap scans
Group: Productivity/Networking/Diagnostic
-%py_requires
%description -n ndiff
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: hosts coming up and down,
ports becoming open or closed, etc.
+%endif
+
+%package -n ncat
+Summary: Network tool to concatenate and redirect sockets
+Group: Productivity/Networking/Diagnostic
+
+%description -n ncat
+Ncat is a feature packed networking utility which will read and
+write data across a network from the command line. It uses both
+TCP and UDP for communication and is designed to be a reliable
+back-end tool to instantly provide network connectivity to other
+applications and users. Ncat will not only work with IPv4 and IPv6
+but provides the user with a virtually limitless number of potential
+uses.
%package -n nping
-Summary: Compare Results of Nmap Scans
+Summary: Packet generator
Group: Productivity/Networking/Diagnostic
%description -n nping
-Network packet generation tool / ping utility
+Nping is an open source tool for network packet generation, response
+analysis and response time measurement. Nping allows to generate network
+packets of a wide range of protocols, letting users to tune virtually
+any field of the protocol headers. While Nping can be used as a simple
+ping utility to detect active hosts, it can also be used as a raw packet
+generator for network stack stress tests, ARP poisoning, Denial of
+Service attacks, route tracing, etc.
%prep
%setup -q
+%if %{with_python2}
%patch1 -p1
+%endif
%patch2
+%if %{with_python2}
%patch3
+%endif
%patch4 -p1
# use system provided libraries
rm -rf libpcap libpcre macosx mswin32
+%if %{with_python2}
#fix locale dir
mv zenmap/share/zenmap/locale zenmap/share
sed -i -e "s|^locale_dir =.*$|locale_dir = os.path.join('share','locale')|" \
-e 's|join(self.install_data, data_dir)|join(self.install_data, "share")|'
zenmap/setup.py
sed -i 's|^LOCALE_DIR = .*|LOCALE_DIR = join(prefix, "share", "locale")|'
zenmap/zenmapCore/Paths.py
+%endif
#fix pt_PT/pt zh/zh_CN locale
sed -i '/ALL_LINGUAS =/s/pt_PT/pt/' Makefile.in
@@ -142,20 +158,27 @@
--with-liblua=included \
%endif
--with-libpcre=%{_prefix} \
+%if %{with_python2} < 1
+ --without-zenmap \
+ --without-ndiff \
+%endif
STRIP=/bin/true
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} deskdir="%{_datadir}/gnome/apps/Utilities/" install
+install -d "%{buildroot}%{_datadir}/pixmaps/"
+
+%if %{with_python2}
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
%suse_update_desktop_file zenmap-root System Network
%find_lang zenmap
touch -r %{buildroot}/%{python_sitelib}/zenmapCore/Paths.py
%{buildroot}/%{python_sitelib}/zenmapCore/Paths.pyc
+%endif
dos2unix %{buildroot}%{_datadir}/%{name}/nselib/data/oracle-sids
%fdupes -s %{buildroot}
@@ -189,21 +212,21 @@
#
%files
-%defattr(-,root,root)
-%doc COPYING* CHANGELOG HACKING
+%license COPYING*
+%doc CHANGELOG HACKING
%doc docs/README
%doc docs/nmap.usage.txt
%dir %{_mandir}/??
%dir %{_mandir}/??/man1
%dir %{_mandir}/??_??
%dir %{_mandir}/??_??/man1
-%{_mandir}/man1/nmap.1.gz
+%{_mandir}/man1/nmap.1%{?ext_man}
%{_mandir}/*/man1/*
%{_bindir}/nmap
%{_datadir}/nmap
+%if %{with_python2}
%files -n zenmap -f zenmap.lang
-%defattr(-,root,root)
%{_bindir}/xnmap
%{_bindir}/zenmap
%{_bindir}/nmapfe
@@ -215,24 +238,22 @@
%{_datadir}/applications/zenmap.desktop
%{_datadir}/pixmaps/zenmap.png
%{_datadir}/zenmap
-%{_mandir}/man1/zenmap.1.gz
+%{_mandir}/man1/zenmap.1%{?ext_man}
+
+%files -n ndiff
+%{_bindir}/ndiff
+%{_mandir}/man1/ndiff.1%{?ext_man}
+%{python_sitelib}/ndiff.*
+%endif
%files -n ncat
-%defattr(-,root,root)
%{_bindir}/ncat
-%{_mandir}/man1/ncat.1.gz
+%{_mandir}/man1/ncat.1%{?ext_man}
%dir %{_datadir}/ncat
%config(noreplace) %{_datadir}/ncat/ca-bundle.crt
-%files -n ndiff
-%defattr(-,root,root)
-%{_bindir}/ndiff
-%{_mandir}/man1/ndiff.1.gz
-%{python_sitelib}/ndiff.*
-
%files -n nping
-%defattr(-,root,root)
%{_bindir}/nping
-%{_mandir}/man1/nping.1.gz
+%{_mandir}/man1/nping.1%{?ext_man}
%changelog
