Mailinglist Archive: opensuse-commit (1195 mails)
| < Previous | Next > |
commit nmap
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 02 Mar 2008 15:04:29 +0100
- Message-id: <20080302140429.CE8C46781B8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package nmap
checked in at Sun Mar 2 15:04:29 CET 2008.
--------
--- nmap/nmap.changes 2007-07-26 16:55:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/nmap/nmap.changes 2008-03-02
12:07:59.989741000 +0100
@@ -1,0 +2,16 @@
+Sun Mar 2 12:08:30 CET 2008 - coolo@xxxxxxx
+
+- fix packaging issues
+
+-------------------------------------------------------------------
+Mon Jan 21 15:20:49 CET 2008 - mskibbe@xxxxxxx
+
+- update to version 4.53 which
+ o Added UPnP-info NSE script. It gathers information from the
+ UPnP service (UDP port 1900) which listens on many network
+ devices such as routers, printers, and networked media players.
+ o Fix a lot of Bugs
+ o The Nmap Scripting Engine (NSE) now supports run-time interaction
+ and the Nmap --host-timeout option.
+
+-------------------------------------------------------------------
Old:
----
nmap-4.20-strcmp.diff
nmap-4.20.tar.bz2
New:
----
nmap-4.53-strcmp.diff
nmap-4.53.tar.bz2
nmapfe.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nmap.spec ++++++
--- /var/tmp/diff_new_pack.n22719/_old 2008-03-02 15:04:08.000000000 +0100
+++ /var/tmp/diff_new_pack.n22719/_new 2008-03-02 15:04:08.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package nmap (Version 4.20)
+# spec file for package nmap (Version 4.53)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,22 +10,24 @@
# norootforbuild
+
Name: nmap
-BuildRequires: gcc-c++ gtk2-devel libdnet-devel libpcap-devel openssl-devel
pcre-devel update-desktop-files
-URL: http://www.insecure.org/nmap/
+BuildRequires: gcc-c++ gtk2-devel libdnet-devel libpcap-devel openssl-devel
pcre-devel python-devel update-desktop-files
+Url: http://www.insecure.org/nmap/
License: GPL v2 or later
Group: Productivity/Networking/Diagnostic
-Autoreqprov: on
-Version: 4.20
-Release: 36
+AutoReqProv: on
+Version: 4.53
+Release: 1
Summary: Portscanner
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
Source1: nmapfe.png
+Source2: nmapfe.desktop
Patch: %name-4.00-libpcap-filter.diff
Patch1: %name-4.00-noreturn.diff
Patch2: %name-4.00-nostrip.diff
-Patch3: %name-4.20-strcmp.diff
+Patch3: %name-4.53-strcmp.diff
%description
Nmap is designed to allow system administrators and curious individuals
@@ -67,26 +69,12 @@
#autoconf
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=%_mandir \
- --infodir=%_infodir \
- --datadir=%_datadir \
- --with-libpcap=%_prefix \
- --with-libdnet=%_prefix \
- --build %_target_cpu-suse-linux
+%configure --with-libpcap=%_prefix --with-libdnet=%_prefix
make
%install
make DESTDIR=$RPM_BUILD_ROOT deskdir=/usr/share/gnome/apps/Utilities/ install
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
$RPM_BUILD_ROOT/usr/share/pixmaps
-mv $RPM_BUILD_ROOT/usr/share/gnome/apps/*/*.desktop
$RPM_BUILD_ROOT/usr/share/applications
-rmdir $RPM_BUILD_ROOT/usr/share/gnome/apps/*
$RPM_BUILD_ROOT/usr/share/gnome/apps $RPM_BUILD_ROOT/usr/share/gnome
-# There is no icon-network. Use the only icon available in package.
-sed -i s:icon-network:nmapfe:
$RPM_BUILD_ROOT/usr/share/applications/nmapfe.desktop
-#convert mswin32/icon1.ico nmapfe.png ; mv nmapfe.png.1 nmapfe.png
-cp %{S:1} $RPM_BUILD_ROOT/usr/share/pixmaps
-%suse_update_desktop_file nmapfe Network Monitor
+rm $RPM_BUILD_ROOT%{_bindir}/uninstall_zenmap
%clean
rm -rf $RPM_BUILD_ROOT
@@ -96,35 +84,50 @@
%doc COPYING* CHANGELOG HACKING
%doc docs/README
%doc docs/nmap.usage.txt
-/usr/bin/nmap
-/usr/share/nmap
%_mandir/man1/nmap.1.gz
+%{_bindir}/nmap
+%dir %_libexecdir/nmap
+%dir %_libexecdir/nmap/nselib-bin
+%_libexecdir/nmap/nselib-bin/bit.so
%files gtk
%defattr(-,root,root)
-/usr/bin/nmapfe
-/usr/bin/xnmap
-/usr/share/applications/*.desktop
-/usr/share/pixmaps/*.png
-%_mandir/man1/nmapfe.1.gz
-%_mandir/man1/xnmap.1.gz
+%{_bindir}/xnmap
+%{_bindir}/zenmap
+%{_bindir}/nmapfe
+%{_libdir}/python*/site-packages/*
+%{_libdir}/python*/site-packages/zenmap*info
+%{_datadir}/nmap
+%{_datadir}/zenmap
+%{_datadir}/pixmaps/*
+%{_datadir}/icons/*
%changelog
-* Thu Jul 26 2007 - prusnak@xxxxxxx
+* Sun Mar 02 2008 coolo@xxxxxxx
+- fix packaging issues
+* Mon Jan 21 2008 mskibbe@xxxxxxx
+- update to version 4.53 which
+ o Added UPnP-info NSE script. It gathers information from the
+ UPnP service (UDP port 1900) which listens on many network
+ devices such as routers, printers, and networked media players.
+ o Fix a lot of Bugs
+ o The Nmap Scripting Engine (NSE) now supports run-time interaction
+ and the Nmap --host-timeout option.
+* Thu Jul 26 2007 prusnak@xxxxxxx
- changed libpcap to libpcap-devel in BuildRequires
-* Mon Apr 30 2007 - ro@xxxxxxx
+* Mon Apr 30 2007 ro@xxxxxxx
- change last patch to build
-* Thu Apr 19 2007 - mskibbe@xxxxxxx
+* Thu Apr 19 2007 mskibbe@xxxxxxx
- fix build bug
-* Thu Feb 22 2007 - mskibbe@xxxxxxx
+* Thu Feb 22 2007 mskibbe@xxxxxxx
- update to version 4.20 which
o Integrated the latest OS fingerprint submissions
o Fix Bugs
-* Mon Jan 08 2007 - ro@xxxxxxx
+* Mon Jan 08 2007 ro@xxxxxxx
- GNOME moved to /usr
-* Thu Oct 26 2006 - dmueller@xxxxxxx
+* Thu Oct 26 2006 dmueller@xxxxxxx
- build against system provided libdnet
-* Thu Jul 13 2006 - mskibbe@xxxxxxx
+* Thu Jul 13 2006 mskibbe@xxxxxxx
- update to version 4.11 which
o Added a dozens of more detailed SSH version detection
signatures
@@ -134,11 +137,11 @@
o Applied a patch which helps with HP-UX compilation by linking
in the nm library (-lnm
o Added version detection probes for detecting the Nessus daemon.
-* Sat Feb 25 2006 - aj@xxxxxxx
+* Sat Feb 25 2006 aj@xxxxxxx
- Reduce BuildRequires.
-* Thu Feb 02 2006 - hvogel@xxxxxxx
+* Thu Feb 02 2006 hvogel@xxxxxxx
- update to 4.0 final. Only some metadata updates
-* Fri Jan 27 2006 - hvogel@xxxxxxx
+* Fri Jan 27 2006 hvogel@xxxxxxx
- added pcre-devel to buildrequires
- updated to 3.999 which includes:
o Upgraded the included LibPCRE from version 6.3 to 6.4.
@@ -152,102 +155,102 @@
o Many of the Nmap low-level timing options take a value in
milliseconds.
o Made some changes to allow source port zero scans (-g0).
-* Wed Jan 25 2006 - mls@xxxxxxx
+* Wed Jan 25 2006 mls@xxxxxxx
- converted neededforbuild to BuildRequires
-* Fri Dec 09 2005 - hvogel@xxxxxxx
+* Fri Dec 09 2005 hvogel@xxxxxxx
- 3.95 update
-* Thu Nov 03 2005 - dmueller@xxxxxxx
+* Thu Nov 03 2005 dmueller@xxxxxxx
- 3.93 update (fixes #129227)
-* Fri Oct 14 2005 - sf@xxxxxxx
+* Fri Oct 14 2005 sf@xxxxxxx
- fix specfile
-* Fri Oct 14 2005 - sf@xxxxxxx
+* Fri Oct 14 2005 sf@xxxxxxx
- fix C++ Problem with gcc 4.1
- fix Makefile.in to use RPM_OPT_FLAGS
-* Fri Sep 09 2005 - mmj@xxxxxxx
+* Fri Sep 09 2005 mmj@xxxxxxx
- Update to nmap-3.90
-* Wed Aug 24 2005 - hvogel@xxxxxxx
+* Wed Aug 24 2005 hvogel@xxxxxxx
- use internal pcre to avoid problems with SYN scan
[#104337]
-* Tue Aug 16 2005 - mmj@xxxxxxx
+* Tue Aug 16 2005 mmj@xxxxxxx
- Don't strip binaries
-* Tue Aug 09 2005 - hvogel@xxxxxxx
+* Tue Aug 09 2005 hvogel@xxxxxxx
- Build against system libpcap/libpcre to avoid libpcap bugs
[Bug #98249]
-* Wed Mar 23 2005 - sbrabec@xxxxxxx
+* Wed Mar 23 2005 sbrabec@xxxxxxx
- Moved desktop file, added icon (#73653).
-* Tue Feb 08 2005 - meissner@xxxxxxx
+* Tue Feb 08 2005 meissner@xxxxxxx
- fix return values of gencode.c.
-* Tue Feb 08 2005 - mmj@xxxxxxx
+* Tue Feb 08 2005 mmj@xxxxxxx
- Update to nmap-3.81
-* Mon Feb 07 2005 - mmj@xxxxxxx
+* Mon Feb 07 2005 mmj@xxxxxxx
- Update to nmap-3.80
-* Fri Dec 03 2004 - mmj@xxxxxxx
+* Fri Dec 03 2004 mmj@xxxxxxx
- Update to nmap-3.77
-* Wed Oct 20 2004 - mmj@xxxxxxx
+* Wed Oct 20 2004 mmj@xxxxxxx
- Update to nmap-3.75
-* Wed Sep 01 2004 - mmj@xxxxxxx
+* Wed Sep 01 2004 mmj@xxxxxxx
- Update to nmap-3.70
-* Thu Jul 08 2004 - mmj@xxxxxxx
+* Thu Jul 08 2004 mmj@xxxxxxx
- Update to nmap-3.55
-* Tue Feb 10 2004 - mmj@xxxxxxx
+* Tue Feb 10 2004 mmj@xxxxxxx
- Fix accidental deletion of specfile tag
-* Tue Feb 10 2004 - mmj@xxxxxxx
+* Tue Feb 10 2004 mmj@xxxxxxx
- Add openssl to #nfb in order to enable SSL-scan-through support
-* Thu Jan 22 2004 - mmj@xxxxxxx
+* Thu Jan 22 2004 mmj@xxxxxxx
- Update to nmap-3.50
-* Wed Nov 19 2003 - hvogel@xxxxxxx
+* Wed Nov 19 2003 hvogel@xxxxxxx
- move nmapfe/xnmap to a subpackage nmap-gtk
- make use of openssl
- fix DESTDIR patch
- dont build as root
-* Wed Oct 08 2003 - mmj@xxxxxxx
+* Wed Oct 08 2003 mmj@xxxxxxx
- Update to version 3.48
-* Sat Aug 16 2003 - adrian@xxxxxxx
+* Sat Aug 16 2003 adrian@xxxxxxx
- add Categories
-* Sat Jul 19 2003 - mmj@xxxxxxx
+* Sat Jul 19 2003 mmj@xxxxxxx
- Update to version 3.30
-* Sun Jun 22 2003 - mmj@xxxxxxx
+* Mon Jun 23 2003 mmj@xxxxxxx
- Update to version 3.28
-* Mon May 26 2003 - mmj@xxxxxxx
+* Mon May 26 2003 mmj@xxxxxxx
- Update to nmap-3.27
-* Tue May 13 2003 - mmj@xxxxxxx
+* Tue May 13 2003 mmj@xxxxxxx
- Use %%defattr
-* Tue Apr 01 2003 - mmj@xxxxxxx
+* Tue Apr 01 2003 mmj@xxxxxxx
- Update to nmap-3.20
-* Tue Sep 17 2002 - ro@xxxxxxx
+* Tue Sep 17 2002 ro@xxxxxxx
- removed bogus self-provides
-* Sun Aug 18 2002 - adrian@xxxxxxx
+* Sun Aug 18 2002 adrian@xxxxxxx
- fix neededforbuild
- use BuildRoot
- add missing files to file list
-* Mon Aug 05 2002 - draht@xxxxxxx
+* Tue Aug 06 2002 draht@xxxxxxx
- long awaited version 3.00. News:
* 700 operation systems + network devices in fingerprint database
* uptime scan
* XML output
* all references to God in error messages are capitalized
added filter.dif security fix for homegrown libpcap.
-* Wed Jan 09 2002 - draht@xxxxxxx
+* Wed Jan 09 2002 draht@xxxxxxx
- new version 2.54BETA30.
-* Thu Aug 09 2001 - ro@xxxxxxx
+* Thu Aug 09 2001 ro@xxxxxxx
- fixed specfile to build (suse_update_config before autoconf)
-* Tue May 08 2001 - draht@xxxxxxx
+* Tue May 08 2001 draht@xxxxxxx
- update to 2.54BETA22
-* Sun Jan 28 2001 - schwab@xxxxxxx
+* Sun Jan 28 2001 schwab@xxxxxxx
- Add %%suse_update_config.
-* Mon Nov 13 2000 - ro@xxxxxxx
+* Mon Nov 13 2000 ro@xxxxxxx
- fixed inet_aton detection
-* Sat Nov 04 2000 - kukuk@xxxxxxx
+* Sat Nov 04 2000 kukuk@xxxxxxx
- fix neededforbuild
-* Tue Jul 11 2000 - mge@xxxxxxx
+* Tue Jul 11 2000 mge@xxxxxxx
- update to 2.53, move /usr/lib/nmap to /usr/share/nmap
-* Tue Feb 22 2000 - garloff@xxxxxxx
+* Tue Feb 22 2000 garloff@xxxxxxx
- Version 2.3BETA14. Move manpage to /usr/share/man
-* Mon Oct 25 1999 - freitag@xxxxxxx
+* Mon Oct 25 1999 freitag@xxxxxxx
- update to version 2.3BETA6
-* Wed Oct 20 1999 - freitag@xxxxxxx
+* Wed Oct 20 1999 freitag@xxxxxxx
- new version 2.12
-* Mon Sep 13 1999 - bs@xxxxxxx
+* Mon Sep 13 1999 bs@xxxxxxx
- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Thu Mar 18 1999 - uli@xxxxxxx
+* Thu Mar 18 1999 uli@xxxxxxx
- new package, version 2.02
++++++ nmap-4.00-nostrip.diff ++++++
--- /var/tmp/diff_new_pack.n22719/_old 2008-03-02 15:04:08.000000000 +0100
+++ /var/tmp/diff_new_pack.n22719/_new 2008-03-02 15:04:08.000000000 +0100
@@ -1,20 +1,11 @@
---- nmap-3.90/Makefile.in
-+++ nmap-3.90/Makefile.in
-@@ -142,7 +142,7 @@
-
- install-nmap: $(TARGET)
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
-- $(INSTALL) -c -m 755 -s nmap $(DESTDIR)$(bindir)/nmap
-+ $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
- $(INSTALL) -c -m 644 docs/$(TARGET).1
$(DESTDIR)$(mandir)/man1/$(TARGET).1
+--- nmap-4.53/Makefile.in
++++ nmap-4.53/Makefile.in
+@@ -177,7 +177,7 @@
+ $(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
++# $(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)/
-@@ -156,7 +156,7 @@
- install-nmapfe: $(TARGETNMAPFE)
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(DESTDIR)$(deskdir)
- @echo "If the next command fails -- you cannot use the X front end"
-- -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe
$(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln
-f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m
644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644
docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644
docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1
-+ -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe
$(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln
-f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m
644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644
docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644
docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1
-
- install: install-nmap $(INSTALLNMAPFE)
-
++++++ nmap-4.20-strcmp.diff -> nmap-4.53-strcmp.diff ++++++
--- nmap/nmap-4.20-strcmp.diff 2007-04-30 16:56:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/nmap/nmap-4.53-strcmp.diff 2008-03-02
11:47:23.722878000 +0100
@@ -1,11 +1,42 @@
--- osscan2.cc
+++ osscan2.cc
-@@ -1570,7 +1570,7 @@
+@@ -1572,7 +1572,7 @@
else if(hss->FPtests[i]) {
/* Replace TTL with initial TTL. */
for(pAV = hss->FPtests[i]->results; pAV; pAV = pAV->next) {
- if(pAV->attribute == "T") {
+ if(!strcmp(pAV->attribute,"T")) {
- ttl = atoi(pAV->value);
- /* found TTL item */
+ /* Found TTL item. The value for this attribute is the
+ received TTL encoded in decimal. We replace it with the
+ initial TTL encoded in hex. */
+--- nse_nsock.cc 2007-12-12 18:23:19.000000000 +0000
++++ nse_nsock.cc 2008-03-02 10:44:30.000000000 +0000
+@@ -246,7 +246,7 @@
+ * is there a better way? */
+ int arguments = 3;
+ const char *how = luaL_optstring(l, 4, "");
+- if(how != ""){
++ if( strlen(how) ){
+ arguments = 4;
+ int port = luaL_optinteger(l, 5, -1);
+ if(port!=-1)
+--- traceroute.cc 2008-01-07 14:39:40.000000000 +0000
++++ traceroute.cc 2008-03-02 10:45:52.000000000 +0000
+@@ -1125,7 +1125,7 @@
+ addr.s_addr = commonPath[ttl_count];
+ log_write(LOG_XML, "<hop ttl=\"%d\" rtt=\"--\" ", ttl_count);
+ log_write(LOG_XML, "ipaddr=\"%s\"", inet_ntoa(addr));
+- if((hostname_tmp = lookup_cached_host(commonPath[ttl_count])) != "")
++ if(strlen(hostname_tmp = lookup_cached_host(commonPath[ttl_count])))
+ log_write(LOG_XML, " host=\"%s\"", hostname_tmp);
+ log_write(LOG_XML, "/>\n");
+ }
+@@ -1492,7 +1492,7 @@
+ memset (nameipbuf, '\0', MAXHOSTNAMELEN + INET6_ADDRSTRLEN);
+ addr.s_addr = ip;
+- if((hname = lookup_cached_host(ip)) == "")
++ if(!strlen(hname = lookup_cached_host(ip)))
+ Snprintf(nameipbuf, MAXHOSTNAMELEN+INET6_ADDRSTRLEN, "%s",
inet_ntoa(addr));
+ else
+ Snprintf (nameipbuf, MAXHOSTNAMELEN + INET6_ADDRSTRLEN, "%s (%s)",
hname, inet_ntoa (addr));
++++++ nmap-4.20.tar.bz2 -> nmap-4.53.tar.bz2 ++++++
++++ 335655 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |