Hello community,
here is the log from the commit of package nmap for openSUSE:Factory checked in at 2012-03-27 08:57:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nmap (Old)
and /work/SRC/openSUSE:Factory/.nmap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nmap", Maintainer is "VDziewiecki@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2011-10-25 16:29:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2012-03-27 08:57:13.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Mar 26 21:22:40 UTC 2012 - andreas.stieger@gmx.de
+
+- Update to nmap-5.61TEST5
+- refresh nmap-4.00-libpcap-filter.diff for moved source lines
+- refresh nmap-4.00-noreturn.diff for moved source lines
+- refresh nmap-4.75-nostrip.patch for moved source lines
+- update nmap-5.00-desktop_files.patch
+ to nmap-5.61-desktop_files.patch for change source
+- update su-to-zenmap.patch for moved source lines
+
+-------------------------------------------------------------------
+Mon Mar 26 19:16:15 UTC 2012 - dimstar@opensuse.org
+
+- Conditionally change lua-devel BuildRequires to lua51-devel on
+ openSUSE > 12.1. The code is not yet ready for lua 5.2.
+
+-------------------------------------------------------------------
Old:
----
nmap-5.00-desktop_files.patch
nmap-5.61TEST2.tar.bz2
New:
----
nmap-5.61-desktop_files.patch
nmap-5.61TEST5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nmap.spec ++++++
--- /var/tmp/diff_new_pack.ikokMH/_old 2012-03-27 08:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ikokMH/_new 2012-03-27 08:57:15.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nmap
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,36 +15,38 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%{!?python_sitelib: %global 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))")}
-%define nmap_extra_ver TEST2
+%define nmap_extra_ver TEST5
Name: nmap
BuildRequires: gcc-c++
BuildRequires: gtk2-devel
BuildRequires: libdnet-devel
BuildRequires: libpcap-devel
+%if 0%{?suse_version} > 1210
+BuildRequires: lua51-devel
+%else
BuildRequires: lua-devel
+%endif
+BuildRequires: dos2unix
+BuildRequires: fdupes
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: python-devel
BuildRequires: update-desktop-files
-BuildRequires: fdupes
-BuildRequires: dos2unix
Url: http://www.insecure.org/nmap/
-License: GPL-2.0+
-Group: Productivity/Networking/Diagnostic
-AutoReqProv: on
Version: 5.61
-Release: 3
+Release: 0
Summary: Portscanner
+License: GPL-2.0+
+Group: Productivity/Networking/Diagnostic
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://nmap.org/dist/nmap-%{version}%{nmap_extra_ver}.tar.bz2
Patch: nmap-4.00-libpcap-filter.diff
Patch1: nmap-4.00-noreturn.diff
-Patch2: nmap-5.00-desktop_files.patch
+Patch2: nmap-5.61-desktop_files.patch
Patch3: nmap-4.75-nostrip.patch
Patch5: su-to-zenmap.patch
@@ -64,7 +66,6 @@
Fyodor
%package -n zenmap
-License: GPL-2.0+
Summary: A Graphical Front-End for Nmap
Group: Productivity/Networking/Diagnostic
Requires: %name = %version
@@ -83,7 +84,6 @@
Fyodor
%package -n ncat
-License: GPL-2.0+
Summary: Network Tool to concatenate and redirect Sockets
Group: Productivity/Networking/Diagnostic
@@ -111,7 +111,6 @@
Fyodor
%package -n ndiff
-License: GPL-2.0+
Summary: Compare Results of Nmap Scans
Group: Productivity/Networking/Diagnostic
%py_requires
@@ -129,7 +128,6 @@
Fyodor
%package -n nping
-License: GPL-2.0+
Summary: Compare Results of Nmap Scans
Group: Productivity/Networking/Diagnostic
@@ -143,8 +141,8 @@
Fyodor
%prep
%setup -q -n %{name}-%{version}%{nmap_extra_ver}
-%patch
-%patch1 -p1
+%patch -p0
+%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch5 -p0
++++++ nmap-4.00-libpcap-filter.diff ++++++
--- /var/tmp/diff_new_pack.ikokMH/_old 2012-03-27 08:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ikokMH/_new 2012-03-27 08:57:15.000000000 +0200
@@ -1,8 +1,8 @@
Index: libpcap/pcap-bpf.c
===================================================================
---- libpcap/pcap-bpf.c.orig
-+++ libpcap/pcap-bpf.c
-@@ -449,7 +449,7 @@ bpf_open(pcap_t *p)
+--- libpcap/pcap-bpf.c.orig 2010-04-21 05:39:45.000000000 +0100
++++ libpcap/pcap-bpf.c 2012-03-26 22:12:12.000000000 +0100
+@@ -489,7 +489,7 @@ bpf_open(pcap_t *p)
fd = open(device, O_RDWR);
if (fd == -1 && errno == EACCES)
fd = open(device, O_RDONLY);
@@ -13,9 +13,9 @@
* XXX better message for all minors used
Index: libpcap/pcap-linux.c
===================================================================
---- libpcap/pcap-linux.c.orig
-+++ libpcap/pcap-linux.c
-@@ -1232,8 +1232,30 @@ pcap_setfilter_linux(pcap_t *handle, str
+--- libpcap/pcap-linux.c.orig 2010-09-22 10:41:06.000000000 +0100
++++ libpcap/pcap-linux.c 2012-03-26 22:12:12.000000000 +0100
+@@ -2233,8 +2233,30 @@ pcap_setfilter_linux_common(pcap_t *hand
if (can_filter_in_kernel) {
if ((err = set_kernel_filter(handle, &fcode)) == 0)
{
++++++ nmap-4.00-noreturn.diff ++++++
--- /var/tmp/diff_new_pack.ikokMH/_old 2012-03-27 08:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ikokMH/_new 2012-03-27 08:57:15.000000000 +0200
@@ -1,8 +1,8 @@
-Index: nmap-5.21/libpcap/gencode.c
+Index: libpcap/gencode.c
===================================================================
---- nmap-5.21.orig/libpcap/gencode.c
-+++ nmap-5.21/libpcap/gencode.c
-@@ -119,7 +119,7 @@ static int pcap_fddipad;
+--- libpcap/gencode.c.orig 2010-04-21 05:39:45.000000000 +0100
++++ libpcap/gencode.c 2012-03-26 22:12:26.000000000 +0100
+@@ -129,7 +129,7 @@ static int pcap_fddipad;
#endif
/* VARARGS */
++++++ nmap-4.75-nostrip.patch ++++++
--- /var/tmp/diff_new_pack.ikokMH/_old 2012-03-27 08:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ikokMH/_new 2012-03-27 08:57:15.000000000 +0200
@@ -1,8 +1,8 @@
Index: Makefile.in
===================================================================
---- Makefile.in.orig
-+++ Makefile.in
-@@ -209,9 +209,6 @@ my_distclean:
+--- Makefile.in.orig 2011-12-21 00:00:05.000000000 +0000
++++ Makefile.in 2012-03-26 22:20:22.000000000 +0100
+@@ -252,9 +252,6 @@ my_distclean:
install-nmap: $(TARGET)
$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
++++++ nmap-5.00-desktop_files.patch -> nmap-5.61-desktop_files.patch ++++++
--- /work/SRC/openSUSE:Factory/nmap/nmap-5.00-desktop_files.patch 2011-09-23 02:14:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nmap.new/nmap-5.61-desktop_files.patch 2012-03-27 08:57:12.000000000 +0200
@@ -1,5 +1,7 @@
---- zenmap/install_scripts/unix/zenmap-root.desktop.orig 2009-07-16 23:45:37.000000000 +0200
-+++ zenmap/install_scripts/unix/zenmap-root.desktop 2009-07-16 23:46:08.000000000 +0200
+Index: zenmap/install_scripts/unix/zenmap-root.desktop
+===================================================================
+--- zenmap/install_scripts/unix/zenmap-root.desktop.orig 2011-12-12 09:05:48.000000000 +0000
++++ zenmap/install_scripts/unix/zenmap-root.desktop 2012-03-26 22:19:14.000000000 +0100
@@ -1,11 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
@@ -12,11 +14,13 @@
Terminal=false
Icon=zenmap
Type=Application
--Categories=Application;Network;Security
+-Categories=Application;Network;Security;
-Comment=A cross-platform GUI for the Nmap Security Scanner.
+Categories=Application;Network;System;Security;GTK
---- zenmap/install_scripts/unix/zenmap.desktop.orig 2009-07-16 23:44:38.000000000 +0200
-+++ zenmap/install_scripts/unix/zenmap.desktop 2009-07-16 23:45:34.000000000 +0200
+Index: zenmap/install_scripts/unix/zenmap.desktop
+===================================================================
+--- zenmap/install_scripts/unix/zenmap.desktop.orig 2011-12-12 09:05:48.000000000 +0000
++++ zenmap/install_scripts/unix/zenmap.desktop 2012-03-26 22:20:02.000000000 +0100
@@ -1,11 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
@@ -29,6 +33,6 @@
Terminal=false
Icon=zenmap
Type=Application
--Categories=Application;Network;Security
+-Categories=Application;Network;Security;
-Comment=A cross-platform GUI for the Nmap Security Scanner.
+Categories=Application;Network;System;Security;GTK
++++++ nmap-5.61TEST2.tar.bz2 -> nmap-5.61TEST5.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/nmap/nmap-5.61TEST2.tar.bz2 /work/SRC/openSUSE:Factory/.nmap.new/nmap-5.61TEST5.tar.bz2 differ: char 11, line 1
++++++ su-to-zenmap.patch ++++++
--- /var/tmp/diff_new_pack.ikokMH/_old 2012-03-27 08:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ikokMH/_new 2012-03-27 08:57:15.000000000 +0200
@@ -1,6 +1,8 @@
---- zenmap/install_scripts/unix/su-to-zenmap.sh.orig 2009-05-03 08:33:50.000000000 +0400
-+++ zenmap/install_scripts/unix/su-to-zenmap.sh 2011-10-03 20:15:53.000000000 +0400
-@@ -13,8 +13,8 @@
+Index: zenmap/install_scripts/unix/su-to-zenmap.sh
+===================================================================
+--- zenmap/install_scripts/unix/su-to-zenmap.sh.orig 2009-05-03 05:33:50.000000000 +0100
++++ zenmap/install_scripts/unix/su-to-zenmap.sh 2012-03-26 22:20:29.000000000 +0100
+@@ -13,8 +13,8 @@ if test "$euid" = "$privid"; then
$COMMAND
else
if test -z "$SU_TO_ROOT_X"; then
@@ -11,7 +13,7 @@
if test "X$KDE_FULL_SESSION" = "Xtrue" ; then
if which kdesu >/dev/null 2>&1 ; then
SU_TO_ROOT_X=kdesu
-@@ -39,8 +39,8 @@
+@@ -39,8 +39,8 @@ else
fi
fi
case $SU_TO_ROOT_X in
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org