rpms/nmap/F-8 nmap-4.52-noms.patch, NONE, 1.1 nmap-4.52-nostrip.patch, NONE, 1.1 nmap-4.52-pixmaps.patch, NONE, 1.1 zenmap.desktop, NONE, 1.1 .cvsignore, 1.17, 1.18 nmap.spec, 1.38, 1.39 sources, 1.17, 1.18 inet_aton.patch, 1.1, NONE makefile.patch, 1.1, NONE nmap-3.78-gtk2.patch, 1.2, NONE nmap-3.81-noms.patch, 1.2, NONE nmap-4.20-nostrip.patch, 1.2, NONE nmapfe.desktop, 1.4, NONE

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Tue Jan 8 07:37:33 UTC 2008 

Author: tsmetana

Update of /cvs/pkgs/rpms/nmap/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5554

Modified Files:
	.cvsignore nmap.spec sources 
Added Files:
	nmap-4.52-noms.patch nmap-4.52-nostrip.patch 
	nmap-4.52-pixmaps.patch zenmap.desktop 
Removed Files:
	inet_aton.patch makefile.patch nmap-3.78-gtk2.patch 
	nmap-3.81-noms.patch nmap-4.20-nostrip.patch nmapfe.desktop 
Log Message:
* Tue Jan 08 2008 Tomas Smetana <tsmetana at redhat.com> - 2:4.52-1
- new upstream version


nmap-4.52-noms.patch:

--- NEW FILE nmap-4.52-noms.patch ---
diff -up nmap-4.52/docs/nmap.1.noms nmap-4.52/docs/nmap.1
--- nmap-4.52/docs/nmap.1.noms	2008-01-07 12:51:51.000000000 +0100
+++ nmap-4.52/docs/nmap.1	2008-01-07 12:52:11.000000000 +0100
@@ -106,7 +106,7 @@ Nmap 4\.52 ( http://insecure\.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\.
-  Ex: scanme\.nmap\.org, microsoft\.com/24, 192\.168\.0\.1; 10\.0\.0\-255\.1\-254
+  Ex: scanme\.nmap\.org, 192\.168\.0\.1; 10\.0\.0\-255\.1\-254
   \-iL <inputfilename>: Input from list of hosts/networks
   \-iR <num hosts>: Choose random targets
   \-\-exclude <host1[,host2][,host3],\.\.\.>: Exclude hosts/networks
diff -up nmap-4.52/docs/nmap.usage.txt.noms nmap-4.52/docs/nmap.usage.txt
--- nmap-4.52/docs/nmap.usage.txt.noms	2008-01-07 12:41:32.000000000 +0100
+++ nmap-4.52/docs/nmap.usage.txt	2008-01-07 12:42:15.000000000 +0100
@@ -2,7 +2,7 @@ Nmap 4.52 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
-  Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.0-255.1-254
+  Ex: scanme.nmap.org, 192.168.0.1; 10.0.0-255.1-254
   -iL <inputfilename>: Input from list of hosts/networks
   -iR <num hosts>: Choose random targets
   --exclude <host1[,host2][,host3],...>: Exclude hosts/networks

nmap-4.52-nostrip.patch:

--- NEW FILE nmap-4.52-nostrip.patch ---
diff -up nmap-4.52/Makefile.in.nostrip nmap-4.52/Makefile.in
--- nmap-4.52/Makefile.in.nostrip	2008-01-07 12:42:42.000000000 +0100
+++ nmap-4.52/Makefile.in	2008-01-07 12:46:53.000000000 +0100
@@ -175,9 +175,6 @@ my_distclean:
 install-nmap: $(TARGET)
 	$(SHTOOL) mkdir -f -p -m 755 $(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.
-	$(STRIP) -x $(DESTDIR)$(bindir)/nmap
 	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
 	$(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/

nmap-4.52-pixmaps.patch:

--- NEW FILE nmap-4.52-pixmaps.patch ---
diff -up nmap-4.52/zenmap/setup.py.pixmaps nmap-4.52/zenmap/setup.py
--- nmap-4.52/zenmap/setup.py.pixmaps	2008-01-07 12:53:24.000000000 +0100
+++ nmap-4.52/zenmap/setup.py	2008-01-07 12:53:35.000000000 +0100
@@ -37,7 +37,7 @@ from zenmapCore.Name import APP_NAME, AP
 # Directories for POSIX operating systems
 # These are created after a "install" or "py2exe" command
 # These directories are relative to the installation or dist directory
-pixmaps_dir = os.path.join('share', 'pixmaps')
+pixmaps_dir = os.path.join('share', 'pixmaps', APP_NAME)
 icons_dir = os.path.join('share', 'icons')
 locale_dir = os.path.join('share', APP_NAME, 'locale')
 config_dir = os.path.join('share', APP_NAME, 'config')


--- NEW FILE zenmap.desktop ---
[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
Icon=zenmap
Terminal=false
Type=Application
Categories=Application;System;Security;GTK


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-8/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Jan 2007 13:19:41 -0000	1.17
+++ .cvsignore	8 Jan 2008 07:36:55 -0000	1.18
@@ -1 +1,3 @@
-nmap-4.20.tar.bz2
+nmap-4.52.tar.bz2
+nmapfe-32.png
+nmapfe-48.png


Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-8/nmap.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nmap.spec	22 Aug 2007 10:52:59 -0000	1.38
+++ nmap.spec	8 Jan 2008 07:36:55 -0000	1.39
@@ -1,22 +1,26 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 4.20
-Release: 6%{?dist}
+Version: 4.52
+Release: 1%{?dist}
 License: BSD with advertising, BSD, GPLv2
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
-Source1: nmapfe.desktop
+Source1: zenmap.desktop
 Source2: nmapfe-32.png
 Source3: nmapfe-48.png
-Patch3: nmap-3.81-noms.patch
-Patch4: nmap-4.03-mktemp.patch
-Patch5: nmap-4.20-nostrip.patch
+Patch1: nmap-4.03-mktemp.patch
+Patch2: nmap-4.52-noms.patch
+Patch3: nmap-4.52-nostrip.patch
+Patch4: nmap-4.52-pixmaps.patch
 URL: http://www.insecure.org/nmap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Epoch: 2
-BuildRequires: openssl-devel, gtk2-devel, pcre-devel, libpcap-devel
+BuildRequires: openssl-devel, gtk2-devel
 BuildRequires: /usr/bin/desktop-file-install
 
+%define pixmap_srcdir zenmap/share/pixmaps
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %description
 Nmap is a utility for network exploration or security auditing.  It supports
 ping scanning (determine which hosts are up), many port scanning techniques
@@ -26,19 +30,25 @@
 predictability characteristics, reverse-identd scanning, and more.
 
 %package frontend
-Summary: Gtk+ frontend for nmap
+Summary: the GTK+ frontend for nmap
 Group: Applications/System
-Requires: nmap = %{epoch}:%{version}, gtk2
-BuildRequires: gtk2-devel libpng-devel
+Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2
+BuildRequires: python >= 2.5 pygtk2-devel libpng-devel 
 %description frontend
-This package includes nmapfe, a Gtk+ frontend for nmap. The nmap package must
+This package includes zenmap, a GTK+ frontend for nmap. The nmap package must
 be installed before installing nmap-frontend.
 
 %prep
 %setup -q
-%patch3 -p1 -b .noms
-%patch4 -p1
-%patch5 -p1
+%patch1 -p1 -b .mktemp
+%patch2 -p1 -b .noms
+%patch3 -p1 -b .nostrip
+%patch4 -p1 -b .pixmaps
+
+# 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
 
 %build
 %configure  --with-libpcap=/usr
@@ -48,8 +58,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-
-#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nmapfe.desktop 
+rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_zenmap
+cp docs/zenmap.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
+pushd $RPM_BUILD_ROOT%{_mandir}/man1
+ln -s zenmap.1.gz nmapfe.1.gz
+ln -s zenmap.1.gz xnmap.1.gz
+popd
 
 desktop-file-install --vendor nmap \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -59,9 +74,9 @@
 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/nmapfe.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/zenmap.png
 install -m 0644 %{SOURCE3} \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/nmapfe.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/zenmap.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,18 +90,30 @@
 %doc docs/nmap.usage.txt 
 %{_bindir}/nmap
 %{_datadir}/nmap
+%{_libexecdir}/nmap
 %{_mandir}/man1/nmap.1.gz
 
 %files frontend
 %defattr(-,root,root)
+%{_bindir}/zenmap
 %{_bindir}/nmapfe
 %{_bindir}/xnmap
-%{_datadir}/applications/nmapfe.desktop
-%{_datadir}/icons/hicolor/*/apps/nmapfe.png
+%{python_sitelib}/*
+%{_datadir}/applications/nmap-zenmap.desktop
+%{_datadir}/icons/*
+%{_datadir}/pixmaps/zenmap
+%{_datadir}/zenmap
+%{_mandir}/man1/zenmap.1.gz
 %{_mandir}/man1/nmapfe.1.gz
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Tue Jan 08 2008 Tomas Smetana <tsmetana at redhat.com> - 2:4.52-1
+- new upstream version
+
+* Wed Dec 05 2007 Tomas Smetana <tsmetana at redhat.com> - 2:4.20-6.1
+- rebuild
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 2:4.20-6
 - changed license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Jan 2007 13:19:41 -0000	1.17
+++ sources	8 Jan 2008 07:36:55 -0000	1.18
@@ -1 +1,3 @@
-ea50419f99472200c4184a304e3831ea  nmap-4.20.tar.bz2
+4f965a89e4e724d266dd9235c485633f  nmap-4.52.tar.bz2
+7dde3802a3694512644be21050337fd2  nmapfe-32.png
+42c2905307c7a5dc6ac4b75f4c3d65a3  nmapfe-48.png


--- inet_aton.patch DELETED ---


--- makefile.patch DELETED ---


--- nmap-3.78-gtk2.patch DELETED ---


--- nmap-3.81-noms.patch DELETED ---


--- nmap-4.20-nostrip.patch DELETED ---


--- nmapfe.desktop DELETED ---

More information about the fedora-extras-commits mailing list