new upstream version 4.76 use consolehelper for root auth

.cvsignore

@@ -1 +1 @@
-nmap-4.68.tar.bz2
+nmap-4.76.tar.bz2

nmap-4.68-nostrip.patch

@@ -1,9 +1,9 @@
-diff -up nmap-4.68/Makefile.in.nostrip nmap-4.68/Makefile.in
+diff -up nmap-4.76/Makefile.in.nostrip nmap-4.76/Makefile.in
---- nmap-4.68/Makefile.in.nostrip	2008-07-24 10:17:22.000000000 +0200
+--- nmap-4.76/Makefile.in.nostrip	2008-09-05 07:32:06.000000000 +0200
-+++ nmap-4.68/Makefile.in	2008-07-24 10:17:41.000000000 +0200
++++ nmap-4.76/Makefile.in	2008-11-27 16:04:42.914205200 +0100
-@@ -176,9 +176,6 @@ my_distclean:
+@@ -166,9 +166,6 @@ my_distclean:
  install-nmap: $(TARGET)
- 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
  	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
 -# Use strip -x to avoid stripping dynamically loaded NSE functions. See
 -# http://seclists.org/nmap-dev/2007/q4/0272.html.

nmap.spec

@@ -1,22 +1,29 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 4.68
+Version: 4.76
-Release: 4%{?dist}
+Release: 1%{?dist}
 # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
 License: GPLv2
 Group: Applications/System
-Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
+Source0: http://nmap.org/dist/%{name}-%{version}.tar.bz2
 Source1: zenmap.desktop
-Source2: nmapfe-32.png
+Source2: zenmap-root.pamd
-Source3: nmapfe-48.png
+Source3: zenmap-root.consoleapps
+
+#prevent possible race condition for shtool, rhbz#158996
 Patch1: nmap-4.03-mktemp.patch
+
+#don't suggest to scan microsoft
 Patch2: nmap-4.52-noms.patch
+
+#don't strip debuginfo
 Patch3: nmap-4.68-nostrip.patch
-URL: http://www.insecure.org/nmap/
+
+URL: http://nmap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Epoch: 2
 BuildRequires: openssl-devel, gtk2-devel, lua-devel, libpcap-devel, pcre-devel
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
 
 %define pixmap_srcdir zenmap/share/pixmaps
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -32,7 +39,7 @@ predictability characteristics, reverse-identd scanning, and more.
 %package frontend
 Summary: the GTK+ frontend for nmap
 Group: Applications/System
-Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2
+Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode
 BuildRequires: python >= 2.5 pygtk2-devel libpng-devel
 %description frontend
 This package includes zenmap, a GTK+ frontend for nmap. The nmap package must
@@ -44,18 +51,12 @@ be installed before installing nmap-frontend.
 %patch2 -p1 -b .noms
 %patch3 -p1 -b .nostrip
 
-# we want pixmaps in /usr/share/pixmaps/zenmap/
-#mkdir %{pixmap_srcdir}/zenmap
-#mv %{pixmap_srcdir}/*.svg %{pixmap_srcdir}/zenmap
-#mv %{pixmap_srcdir}/*.png %{pixmap_srcdir}/zenmap
-
 rm -rf liblua libpcap libpcre
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 %configure  --with-libpcap=/usr
-#make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
@@ -63,6 +64,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_zenmap
+
+#use consolehelper
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/zenmap*.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/zenmap/su-to-zenmap.sh
+ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \
+	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/zenmap-root
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/zenmap-root
+
 cp docs/zenmap.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
 pushd $RPM_BUILD_ROOT%{_mandir}/man1
@@ -75,12 +86,9 @@ desktop-file-install --vendor nmap \
 	--add-category X-Red-Hat-Base \
 	%{SOURCE1};
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps \
+#for .desktop and app icon
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 0644 %{SOURCE2} \
+ln -s %{_datadir}/zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/zenmap.png
-install -m 0644 %{SOURCE3} \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/zenmap.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,16 +97,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING*
 %doc docs/README
-#%doc docs/nmap-fingerprinting-article.txt
-#%doc docs/nmap.deprecated.txt
 %doc docs/nmap.usage.txt
 %{_bindir}/nmap
 %{_datadir}/nmap
-%{_libexecdir}/nmap
 %{_mandir}/man1/nmap.1.gz
 
 %files frontend
 %defattr(-,root,root)
+%config %{_sysconfdir}/pam.d/zenmap-root
+%config %{_sysconfdir}/security/console.apps/zenmap-root
+%{_bindir}/zenmap-root
 %{_bindir}/zenmap
 %{_bindir}/nmapfe
 %{_bindir}/xnmap
@@ -111,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Mon Dec 15 2008 Michal Hlavinka <mhlavink@redhat.com> - 2:4.76-1
+- new upstream version 4.76
+- use consolehelper for root auth
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2:4.68-4
 - Rebuild for Python 2.6
 

sources

@@ -1 +1 @@
-c363d32a00c697d15996fced22072b6c  nmap-4.68.tar.bz2
+278dd2e849cc3dbb947df961a1aaffd0  nmap-4.76.tar.bz2

zenmap.desktop

@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Zenmap
 GenericName=Nmap Security Scanner
 Comment=GUI frontend for Nmap security/port scanner
 Version=1.0
-TryExec=zenmap
+TryExec=zenmap-root
-Exec=zenmap
+Exec=zenmap-root
 Icon=zenmap
 Terminal=false
 Type=Application
-Categories=Application;System;Security;GTK
+Categories=System;Security;GTK;