commit 383525292a0037e8adadee4f7789d9b0d7e7ea03 Author: Adam Osuchowski <ad...@pld-linux.org> Date: Fri Jan 27 21:13:35 2017 +0100
- up to 7.40 - changed required lua version to 5.3 nmap-desktop.patch | 37 +++++++++++++++++++------------------ nmap.spec | 12 ++++++------ 2 files changed, 25 insertions(+), 24 deletions(-) --- diff --git a/nmap.spec b/nmap.spec index c103ff0..1148935 100644 --- a/nmap.spec +++ b/nmap.spec @@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8): Ferramenta de exploração da rede e segurança Summary(ru.UTF-8): Утилита сканирования сети и аудита безопасности Summary(uk.UTF-8): Утиліта сканування мережі та аудиту безпеки Name: nmap -Version: 7.01 -Release: 2 +Version: 7.40 +Release: 1 License: GPL v2 clarified, with OpenSSL exception Group: Networking/Utilities Source0: http://nmap.org/dist/%{name}-%{version}.tar.bz2 -# Source0-md5: 7fa4edc592184c7addc14f5acb3fe6f7 +# Source0-md5: 9c5a28bfb46228bade82b238408c065e Patch0: %{name}-am18.patch Patch1: %{name}-system-lua.patch Patch2: %{name}-system-dnet.patch @@ -32,7 +32,7 @@ BuildRequires: gettext-tools BuildRequires: libpcap-devel BuildRequires: libstdc++-devel BuildRequires: libtool -%{?with_lua:BuildRequires: lua52-devel >= 5.2} +%{?with_lua:BuildRequires: lua53-devel >= 5.3} BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: python-devel >= 1:2.4 @@ -165,9 +165,9 @@ done cp -f /usr/share/automake/config.sub . CXXFLAGS="%{rpmcxxflags} -fno-exceptions" -CPPFLAGS="-I/usr/include/lua5.2" +CPPFLAGS="-I/usr/include/lua5.3" %configure \ - %{?with_lua:LIBLUA_LIBS="-llua5.2"} \ + %{?with_lua:LIBLUA_LIBS="-llua5.3"} \ --with%{!?with_lua:out}-liblua \ --with%{!?with_svn:out}-subversion \ --with-libdnet%{!?with_system_dnet:=included} diff --git a/nmap-desktop.patch b/nmap-desktop.patch index e6ffc23..6eb1caa 100644 --- a/nmap-desktop.patch +++ b/nmap-desktop.patch @@ -1,13 +1,15 @@ ---- nmap-4.76/zenmap/install_scripts/unix/zenmap.desktop.orig 2008-07-25 22:23:23.000000000 +0200 -+++ nmap-4.76/zenmap/install_scripts/unix/zenmap.desktop 2008-10-06 19:39:46.070630631 +0200 -@@ -1,11 +1,16 @@ +diff -ruN nmap-7.40.orig/zenmap/install_scripts/unix/zenmap-root.desktop nmap-7.40/zenmap/install_scripts/unix/zenmap-root.desktop +--- nmap-7.40.orig/zenmap/install_scripts/unix/zenmap-root.desktop 2016-12-03 07:08:10.000000000 +0100 ++++ nmap-7.40/zenmap/install_scripts/unix/zenmap-root.desktop 2017-01-27 19:56:12.796011585 +0100 +@@ -1,11 +1,18 @@ [Desktop Entry] --Encoding=UTF-8 - Name=Zenmap +-Name=Zenmap (as root) ++Name=Zenmap as root ++Name[pl]=Zenmap jako root GenericName=GUI Port Scanner +GenericName[pl]=Skaner portów z GUI - TryExec=zenmap - Exec=zenmap %F + TryExec=su-to-zenmap.sh + Exec=su-to-zenmap.sh %F Terminal=false Icon=zenmap Type=Application @@ -19,27 +21,26 @@ +Comment[pt]=Ferramenta de exploração da rede e segurança +Comment[ru]=Утилита сканирования сети и аудита безопасности +Comment[uk]=Утиліта сканування мережі та аудиту безпеки ---- nmap-4.76/zenmap/install_scripts/unix/zenmap-root.desktop.orig 2008-07-25 22:23:23.000000000 +0200 -+++ nmap-4.76/zenmap/install_scripts/unix/zenmap-root.desktop 2008-10-06 19:39:09.906630631 +0200 + Keywords=network;scan;scanner;IP;security; +diff -ruN nmap-7.40.orig/zenmap/install_scripts/unix/zenmap.desktop nmap-7.40/zenmap/install_scripts/unix/zenmap.desktop +--- nmap-7.40.orig/zenmap/install_scripts/unix/zenmap.desktop 2016-12-03 07:08:10.000000000 +0100 ++++ nmap-7.40/zenmap/install_scripts/unix/zenmap.desktop 2017-01-27 19:53:47.649553629 +0100 @@ -1,11 +1,17 @@ [Desktop Entry] --Encoding=UTF-8 --Name=Zenmap (as root) -+Name=Zenmap as root -+Name[pl]=Zenmap jako root + Name=Zenmap GenericName=GUI Port Scanner +GenericName[pl]=Skaner portów z GUI - TryExec=su-to-zenmap.sh - Exec=su-to-zenmap.sh %F + TryExec=zenmap + Exec=zenmap %F Terminal=false Icon=zenmap Type=Application - Categories=Application;Network;Security; --Comment=A cross-platform GUI for the Nmap Security Scanner. +-Categories=Application;Network;Security; +Categories=GTK;Network;Security + Comment=A cross-platform GUI for the Nmap Security Scanner. +Comment[es]=Herramienta de exploración de la rede y seguridad +Comment[pl]=Graficzny interfejs do skanera bezpieczeństwa Nmap +Comment[pt]=Ferramenta de exploração da rede e segurança +Comment[ru]=Утилита сканирования сети и аудита безопасности +Comment[uk]=Утиліта сканування мережі та аудиту безпеки - + Keywords=network;scan;scanner;IP;security; ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nmap.git/commitdiff/383525292a0037e8adadee4f7789d9b0d7e7ea03 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit