From b8f648a41df809df4d0b70fb7be28e5288264629 Mon Sep 17 00:00:00 2001 From: zhuchunyi Date: Wed, 6 Nov 2019 19:44:09 +0800 Subject: [PATCH] update code --- nmap.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/nmap.spec b/nmap.spec index 5030214..58c68f7 100644 --- a/nmap.spec +++ b/nmap.spec @@ -3,7 +3,7 @@ Name: nmap Epoch: 2 Version: 7.70 -Release: 6 +Release: 8 License: Nmap Summary: A tool for network discovery and security auditing. Requires: %{name}-ncat = %{epoch}:%{version}-%{release} @@ -20,7 +20,7 @@ BuildRequires: gcc-c++ openssl-devel gtk2-devel lua-devel libpcap-devel pc BuildRequires: dos2unix libtool automake autoconf gettext-devel libssh2-devel Obsoletes: nmap-frontend nmap-ndiff nmap-ncat nc < 1.109.20120711-2 -Obsoletes: nc6 < 1.00-22 +Obsoletes: nc6 < 1.00-22 Provides: nmap-frontend nmap-ndiff nmap-ncat nc nc6 %define pixmap_srcdir zenmap/share/pixmaps @@ -62,7 +62,8 @@ ln -s ncat %{buildroot}%{_bindir}/nc %files -f nmap.lang %defattr(-,root,root) %exclude %{_datadir}/ncat -%doc COPYING* ncat/docs/AUTHORS ncat/docs/README +%doc ncat/docs/AUTHORS ncat/docs/README +%license COPYING docs/3rd-party-licenses.txt docs/Nmap-Third-Party-Open-Source.pdf docs/Nmap-Third-Party-Open-Source.fodt docs/licenses %{_bindir}/n* %{_datadir}/nmap @@ -72,6 +73,18 @@ ln -s ncat %{buildroot}%{_bindir}/nc %{_mandir}/man1/*.1.gz %changelog +* Mon Oct 21 2019 openEuler Buildteam - 2:7.70-8 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:add 3rd-party licenses + +* Mon Oct 21 2019 openEuler Buildteam - 2:7.70-7 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:modify the location of COPYING + * Wed Sep 25 2019 Li Wang - 2:7.70-6 - Type:cves - ID:CVE-2017-18594 @@ -79,4 +92,4 @@ ln -s ncat %{buildroot}%{_bindir}/nc - DESC:fix CVE-2017-18594 * Wed Sep 18 2019 openEuler Buildteam - 2:7.70-5 -- Package init +- Package init