rpms/nmap/F-10 zenmap-root.consoleapps, NONE, 1.1 zenmap-root.pamd, NONE, 1.1 nmap.spec, 1.48, 1.49 zenmap.desktop, 1.2, 1.3

Tue May 26 12:17:14 UTC 2009

Author: mhlavink

Update of /cvs/extras/rpms/nmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1681

Modified Files:
	nmap.spec zenmap.desktop 
Added Files:
	zenmap-root.consoleapps zenmap-root.pamd 
Log Message:
update to 4.76
use consolehelper for root privilegis

--- NEW FILE zenmap-root.consoleapps ---
USER=root
PROGRAM=/usr/bin/zenmap
SESSION=true
FALLBACK=true


--- NEW FILE zenmap-root.pamd ---
#%PAM-1.0
auth        include     config-util
account     include     config-util
session     include     config-util


Index: nmap.spec
===================================================================
RCS file: /cvs/extras/rpms/nmap/F-10/nmap.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- nmap.spec	11 Aug 2008 19:52:55 -0000	1.48
+++ nmap.spec	26 May 2009 12:16:43 -0000	1.49
@@ -1,22 +1,29 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 4.68
-Release: 3%{?dist}
+Version: 4.76
+Release: 4%{?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
-Source3: nmapfe-48.png
+Source2: zenmap-root.pamd
+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/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+URL: http://nmap.org/
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 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-
 %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-fron
 %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 \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 0644 %{SOURCE2} \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/zenmap.png
-install -m 0644 %{SOURCE3} \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/zenmap.png
+#for .desktop and app icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s %{_datadir}/zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 %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
+* Tue May 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:4.76-1
+- new upstream version 4.76
+- use consolehelper for root auth
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:4.68-3
 - add missing BuildRequires to use system libs rather than local copies
 - really fix license tag


Index: zenmap.desktop
===================================================================
RCS file: /cvs/extras/rpms/nmap/F-10/zenmap.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zenmap.desktop	7 Jan 2008 14:40:47 -0000	1.2
+++ zenmap.desktop	26 May 2009 12:16:44 -0000	1.3
@@ -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
-Exec=zenmap
+TryExec=zenmap-root
+Exec=zenmap-root
 Icon=zenmap
 Terminal=false
 Type=Application
-Categories=Application;System;Security;GTK
+Categories=System;Security;GTK;


