packages: nmap/nmap-desktop.patch, nmap/nmap.spec - up to 5.00 (use interna...

[arekm]

Author: arekm                        Date: Fri Jul 17 07:21:13 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.00 (use internal libdnet; it's modified version to support SCTP which doesn't exist in system 0.11)

---- Files affected:
packages/nmap:
   nmap-desktop.patch (1.8 -> 1.9) , nmap.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/nmap/nmap-desktop.patch
diff -u packages/nmap/nmap-desktop.patch:1.8 packages/nmap/nmap-desktop.patch:1.9
--- packages/nmap/nmap-desktop.patch:1.8	Mon Oct  6 19:56:07 2008
+++ packages/nmap/nmap-desktop.patch	Fri Jul 17 09:21:08 2009
@@ -11,8 +11,8 @@
  Terminal=false
  Icon=zenmap
  Type=Application
--Categories=Application;Network;
-+Categories=GTK;Network;
+-Categories=Application;Network;Security
++Categories=GTK;Network;Security
  Comment=A cross-platform GUI for the Nmap Security Scanner.
 +Comment[es]=Herramienta de exploración de la rede y seguridad
 +Comment[pl]=Graficzny interfejs do skanera bezpieczeństwa Nmap
@@ -34,8 +34,8 @@
  Terminal=false
  Icon=zenmap
  Type=Application
--Categories=Application;Network;
-+Categories=GTK;Network;
+-Categories=Application;Network;Security
++Categories=GTK;Network;Security
  Comment=A cross-platform GUI for the Nmap Security Scanner.
 +Comment[es]=Herramienta de exploración de la rede y seguridad
 +Comment[pl]=Graficzny interfejs do skanera bezpieczeństwa Nmap

================================================================
Index: packages/nmap/nmap.spec
diff -u packages/nmap/nmap.spec:1.150 packages/nmap/nmap.spec:1.151
--- packages/nmap/nmap.spec:1.150	Fri Jan 23 01:17:56 2009
+++ packages/nmap/nmap.spec	Fri Jul 17 09:21:08 2009
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 #
+%bcond_with	system_dnet
+#
 Summary:	Network exploration tool and security scanner
 Summary(es.UTF-8):	Herramienta de exploración de la rede y seguridad
 Summary(pl.UTF-8):	Program do badania i audytu sieci
@@ -7,12 +9,12 @@
 Summary(ru.UTF-8):	Утилита сканирования сети и аудита безопасности
 Summary(uk.UTF-8):	Утиліта сканування мережі та аудиту безпеки
 Name:		nmap
-Version:	4.76
-Release:	2
+Version:	5.00
+Release:	1
 License:	GPL v2 clarified, with OpenSSL exception
 Group:		Networking
 Source0:	http://nmap.org/dist/%{name}-%{version}.tar.bz2
-# Source0-md5:	278dd2e849cc3dbb947df961a1aaffd0
+# Source0-md5:	32d27de32166c02d670bb4a086185886
 Patch0:		%{name}-am18.patch
 Patch1:		%{name}-system-lua.patch
 Patch2:		%{name}-system-dnet.patch
@@ -20,7 +22,7 @@
 URL:		http://nmap.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libdnet-devel
+%{?with_system_dnet:BuildRequires:	libdnet-devel}
 BuildRequires:	libpcap-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
@@ -31,6 +33,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.167
 BuildRequires:	sed >= 4.0
+Requires:	ca-certificates
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -128,7 +131,7 @@
 CPPFLAGS="-I/usr/include/lua51"
 %configure \
 	LIBLUA_LIBS="-llua51" \
-	--with-libdnet \
+	--with-libdnet%{!?with_system_dnet:=included} \
 	--with-liblua
 
 %{__make}
@@ -146,6 +149,8 @@
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_postclean
 
+ln -sf /etc/certs/ca-certificates.crt $RPM_BUILD_ROOT/%{_datadir}/ncat/ca-bundle.crt
+
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_zenmap
 
@@ -156,8 +161,13 @@
 %defattr(644,root,root,755)
 # note: COPYING contains important notes and clarifications
 %doc docs/README docs/*.txt CHANGELOG COPYING
+%attr(755,root,root) %{_bindir}/ncat
+%attr(755,root,root) %{_bindir}/ndiff
 %attr(755,root,root) %{_bindir}/nmap
 %{_datadir}/nmap
+%{_datadir}/ncat
+%{_mandir}/man1/ncat.1*
+%{_mandir}/man1/ndiff.1*
 %{_mandir}/man1/nmap.1*
 
 %files zenmap
@@ -185,11 +195,14 @@
 %{py_sitescriptdir}/zenmap-*.egg-info
 %endif
 %dir %{_datadir}/zenmap
-%dir %{_datadir}/zenmap/locale
-%lang(pt_BR) %{_datadir}/zenmap/locale/pt_BR
 %{_datadir}/zenmap/config
 %{_datadir}/zenmap/docs
 %{_datadir}/zenmap/misc
+%dir %{_datadir}/zenmap/locale
+%lang(de) %{_datadir}/zenmap/locale/de
+%lang(fr) %{_datadir}/zenmap/locale/fr
+%lang(hr) %{_datadir}/zenmap/locale/hr
+%lang(pt_BR) %{_datadir}/zenmap/locale/pt_BR
 %{_datadir}/zenmap/pixmaps
 %{_datadir}/zenmap/su-to-zenmap.sh
 %{_desktopdir}/zenmap-root.desktop
@@ -202,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2009/07/17 07:21:08  arekm
+- up to 5.00 (use internal libdnet; it's modified version to support SCTP which doesn't exist in system 0.11)
+
 Revision 1.150  2009/01/23 00:17:56  wrobell
 - fixed typo, thanks glen
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nmap/nmap-desktop.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nmap/nmap.spec?r1=1.150&r2=1.151&f=u