diff --git a/.gitignore b/.gitignore index 15e8916..aaf2dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nmap-5.21.tar.bz2 +/nmap-5.50.tar.bz2 diff --git a/nmap.spec b/nmap.spec index 2c84c44..0d38de8 100644 --- a/nmap.spec +++ b/nmap.spec @@ -1,8 +1,8 @@ #TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h) Summary: Network exploration tool and security scanner Name: nmap -Version: 5.21 -Release: 10%{?dist} +Version: 5.50 +Release: 1%{?dist} # nmap is GPLv2 # zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet) # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32) @@ -169,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xnmap.1.gz %changelog +* Mon Feb 07 2011 Michal Hlavinka - 2:5.50-1 +- updated to 5.50 + * Tue Oct 05 2010 Michal Hlavinka - 2:5.21-10 - add workaround for zenmap crash (#637403) diff --git a/sources b/sources index b7660b6..d665edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f77fa51d89ab27d35e5cd87bb086b858 nmap-5.21.tar.bz2 +a4df96e52cb52a1bbe76caace5f21388 nmap-5.50.tar.bz2 diff --git a/zenmap-621887-workaround.patch b/zenmap-621887-workaround.patch index aba22b7..74a9578 100644 --- a/zenmap-621887-workaround.patch +++ b/zenmap-621887-workaround.patch @@ -1,16 +1,7 @@ -diff -uNrp nmap-5.21.orig/zenmap/zenmapGUI/App.py nmap-5.21.new/zenmap/zenmapGUI/App.py ---- nmap-5.21.orig/zenmap/zenmapGUI/App.py 2009-11-04 04:36:50.000000000 +0100 -+++ nmap-5.21.new/zenmap/zenmapGUI/App.py 2010-09-25 15:45:20.000000000 +0200 -@@ -96,7 +96,7 @@ import ConfigParser - # produces a warning, but the lack of a display eventually causes a - # segmentation fault. See http://live.gnome.org/PyGTK/WhatsNew210. - import warnings --warnings.filterwarnings("error", module = "gtk") -+warnings.filterwarnings("error", module = "gtk", append=True) - try: - import gtk - except Exception: -@@ -176,7 +176,7 @@ def install_excepthook(): +diff -up nmap-5.50/zenmap/zenmapGUI/App.py.bz637403 nmap-5.50/zenmap/zenmapGUI/App.py +--- nmap-5.50/zenmap/zenmapGUI/App.py.bz637403 2011-01-21 01:04:51.000000000 +0100 ++++ nmap-5.50/zenmap/zenmapGUI/App.py 2011-02-07 13:01:36.275314680 +0100 +@@ -179,7 +179,7 @@ def install_excepthook(): # produces a warning, but the lack of a display eventually causes a # segmentation fault. See http://live.gnome.org/PyGTK/WhatsNew210. import warnings