rpms/nmap/F-11 .cvsignore, 1.25, 1.26 nmap-4.68-nostrip.patch, 1.2, 1.3 nmap.spec, 1.56, 1.57 sources, 1.25, 1.26

Michal Hlavinka mhlavink at fedoraproject.org
Mon Feb 1 10:57:35 UTC 2010


Author: mhlavink

Update of /cvs/pkgs/rpms/nmap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26282

Modified Files:
	.cvsignore nmap-4.68-nostrip.patch nmap.spec sources 
Log Message:
* Mon Feb 01 2010 Michal Hlavinka <mhlavink at redhat.com> - 2:5.21-1
- updated to 5.21
- use sqlite3 (instead of sqlite2)
- spec cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	17 Jul 2009 05:26:56 -0000	1.25
+++ .cvsignore	1 Feb 2010 10:57:34 -0000	1.26
@@ -1 +1 @@
-nmap-5.00.tar.bz2
+nmap-5.21.tar.bz2

nmap-4.68-nostrip.patch:
 Makefile.in |    3 ---
 1 file changed, 3 deletions(-)

Index: nmap-4.68-nostrip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-11/nmap-4.68-nostrip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nmap-4.68-nostrip.patch	15 Dec 2008 10:39:25 -0000	1.2
+++ nmap-4.68-nostrip.patch	1 Feb 2010 10:57:35 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up nmap-4.76/Makefile.in.nostrip nmap-4.76/Makefile.in
---- nmap-4.76/Makefile.in.nostrip	2008-09-05 07:32:06.000000000 +0200
-+++ nmap-4.76/Makefile.in	2008-11-27 16:04:42.914205200 +0100
-@@ -166,9 +166,6 @@ my_distclean:
+diff -up nmap-5.21/Makefile.in.nostrip nmap-5.21/Makefile.in
+--- nmap-5.21/Makefile.in.nostrip	2009-12-12 21:26:15.000000000 +0100
++++ nmap-5.21/Makefile.in	2010-02-01 11:42:40.937772912 +0100
+@@ -209,9 +209,6 @@ my_distclean:
  install-nmap: $(TARGET)
  	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
  	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
@@ -9,5 +9,5 @@ diff -up nmap-4.76/Makefile.in.nostrip n
 -# 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)/
+ 	if [ "$(USE_NLS)" = "yes" ]; then \
+ 	  for ll in $(filter $(ALL_LINGUAS),$(LINGUAS)); do \


Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-11/nmap.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- nmap.spec	20 Jul 2009 05:53:30 -0000	1.56
+++ nmap.spec	1 Feb 2010 10:57:35 -0000	1.57
@@ -1,9 +1,16 @@
+#TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h)
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 5.00
+Version: 5.21
 Release: 1%{?dist}
-# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
-License: GPLv2
+# 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)
+# openssl is OpenSSL
+# openssl and libdnet-striped is removed in %%prep section
+License: GPLv2 and LGPLv2+ and GPLv2+ and BSD
 Group: Applications/System
 Source0: http://nmap.org/dist/%{name}-%{version}.tar.bz2
 Source1: zenmap.desktop
@@ -23,10 +30,9 @@ 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: desktop-file-utils
+BuildRequires: desktop-file-utils, dos2unix
 
 %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
@@ -37,13 +43,13 @@ and port specification, decoy scanning, 
 predictability characteristics, reverse-identd scanning, and more.
 
 %package frontend
-Summary: the GTK+ frontend for nmap
+Summary: The GTK+ front end for nmap
 Group: Applications/System
-Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode
-BuildRequires: python >= 2.5 pygtk2-devel libpng-devel
+Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 usermode
+BuildRequires: python >= 2.5 python-devel pygtk2-devel libpng-devel
 %description frontend
-This package includes zenmap, a GTK+ frontend for nmap. The nmap package must
-be installed before installing nmap-frontend.
+This package includes zenmap, a GTK+ front end for nmap. The nmap package must
+be installed before installing nmap front end.
 
 %prep
 %setup -q
@@ -51,7 +57,15 @@ be installed before installing nmap-fron
 %patch2 -p1 -b .noms
 %patch3 -p1 -b .nostrip
 
-rm -rf liblua libpcap libpcre
+#be sure we're not using tarballed copies of some libraries
+rm -rf liblua libpcap libpcre macosx mswin32
+
+#fix locale dir
+mv zenmap/share/zenmap/locale zenmap/share
+sed -i -e "s|^locale_dir =.*$|locale_dir = os.path.join('share','locale')|" \
+ -e 's|join(self.install_data, data_dir)|join(self.install_data, "share")|' zenmap/setup.py
+sed -i 's|^LOCALE_DIR = .*|LOCALE_DIR = join(prefix, "share", "locale")|' zenmap/zenmapCore/Paths.py
+
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -68,7 +82,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/uninstal
 #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
+ln -s 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
@@ -88,7 +102,19 @@ desktop-file-install --vendor nmap \
 
 #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
+ln -s ../../../../zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
+# fix end-of-line
+pushd $RPM_BUILD_ROOT
+for fe in ./%{python_sitelib}/zenmapCore/Paths.py
+do
+  dos2unix <$fe >$fe.new
+  touch -r $fe $fe.new
+  mv -f $fe.new $fe
+done
+popd
+
+%find_lang zenmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,14 +129,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ndiff
 %{_mandir}/man1/ndiff.1.gz
 %{_mandir}/man1/nmap.1.gz
+%{_mandir}/*/man1/nmap.1.gz
 %{_mandir}/man1/ncat.1.gz
 %{_datadir}/nmap
 %{_datadir}/ncat
 
-%files frontend
+%files frontend -f zenmap.lang
 %defattr(-,root,root)
-%config %{_sysconfdir}/pam.d/zenmap-root
-%config %{_sysconfdir}/security/console.apps/zenmap-root
+%config(noreplace) %{_sysconfdir}/pam.d/zenmap-root
+%config(noreplace) %{_sysconfdir}/security/console.apps/zenmap-root
 %{_bindir}/zenmap-root
 %{_bindir}/zenmap
 %{_bindir}/nmapfe
@@ -124,6 +151,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Mon Feb 01 2010 Michal Hlavinka <mhlavink at redhat.com> - 2:5.21-1
+- updated to 5.21
+- use sqlite3 (instead of sqlite2)
+- spec cleanup
+
 * Fri Jul 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-1
 - updated to 5.00
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	17 Jul 2009 05:26:56 -0000	1.25
+++ sources	1 Feb 2010 10:57:35 -0000	1.26
@@ -1 +1 @@
-32d27de32166c02d670bb4a086185886  nmap-5.00.tar.bz2
+f77fa51d89ab27d35e5cd87bb086b858  nmap-5.21.tar.bz2



More information about the scm-commits mailing list