Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nmap for openSUSE:Factory:NonFree checked in at 2024-07-28 17:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/nmap (Old) and /work/SRC/openSUSE:Factory:NonFree/.nmap.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nmap" Sun Jul 28 17:18:17 2024 rev:4 rq:1189746 version:7.95 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/nmap/nmap.changes 2024-03-18 16:42:36.226630063 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.nmap.new.1882/nmap.changes 2024-07-28 17:18:18.493070345 +0200 @@ -1,0 +2,44 @@ +Wed Jul 17 16:26:10 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com> + +- Update to 7.95: + * Integrated over 4,000 of your IPv4 OS fingerprints. Added 336 signatures, + bringing the new total to 6,036. Additions include iOS 15 & 16, macOS + Ventura & Monterey, Linux 6.1, OpenBSD 7.1, and lwIP 2.2 + * Integrated over 2,500 service/version detection fingerprints. The signature + count went up 1.4% to 12,089, including 9 new softmatches. We now detect + 1,246 protocols, including new additions of grpc, mysqlx, essnet, + remotemouse, and tuya. + * Added four new scripts from the DINA community for querying industrial + control systems + * Improvements to OS detection fingerprint matching, including a syntax + change for nmap-os-db that allows ranges within the TCP Options + string. This leads to more concise and maintainable fingerprints. [Daniel + Miller] + * Improved the OS detection engine by using a new source port for each retry. + Scans from systems such as Windows that do not send RST for unsolicited + SYN|ACK responses were previously unable to get a response in subsequent + tries. [Daniel Miller] + * Several profile-guided optimizations of the port scan engine. [Daniel Miller] + * Upgraded included libraries: Lua 5.4.6, libpcre2 10.43, zlib 1.3.1, libssh2 + 1.11.0, liblinear 2.47 + * Zenmap and Ndiff now use setuptools, not distutils + for packaging. + * Fixed Ncat UDP server mode to not quit after EOF on + stdin. + * ssh-auth-methods will now print the pre-authentication banner text + when available. Requires libssh2 1.11.0 or later. [Daniel Miller] + * Fix a crash in Zenmap when changing a host comment. + * Fix TLS 1.2 signature algorithms for EdDSA. [Daniel Roethlisberger] + * Fix an out-of-bounds read which led to out-of-memory errors when + duplicate addresses were used with --exclude + * Fixed a memory leak in Nsock: compiled pcap filters were not freed. + * Fixed a crash when using service name wildcards with -p, as in -p "http*" + * Fixed DNS TXT record parsing bug which caused asn-query to fail in + Nmap 7.80 and later. [David Fifield, Mike Pattrick] + * Fixed packet size testing in KNX scripts [f0rw4rd] +- Remove nmap-7.94-handle-unknown-service-name-in-p.patch +- Add zenmap-fix-locale-install.patch + * Fix locale files installation for zenmap +- Use %pyproject macros for building and installing zenmap + +------------------------------------------------------------------- Old: ---- nmap-7.94-handle-unknown-service-name-in-p.patch nmap-7.94.tar.bz2 nmap-7.94.tar.bz2.asc New: ---- nmap-7.95.tar.bz2 nmap-7.95.tar.bz2.asc zenmap-fix-locale-install.patch BETA DEBUG BEGIN: Old: * Fixed packet size testing in KNX scripts [f0rw4rd] - Remove nmap-7.94-handle-unknown-service-name-in-p.patch - Add zenmap-fix-locale-install.patch BETA DEBUG END: BETA DEBUG BEGIN: New:- Remove nmap-7.94-handle-unknown-service-name-in-p.patch - Add zenmap-fix-locale-install.patch * Fix locale files installation for zenmap BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.9vV56w/_old 2024-07-28 17:18:19.721119431 +0200 +++ /var/tmp/diff_new_pack.9vV56w/_new 2024-07-28 17:18:19.725119591 +0200 @@ -26,8 +26,9 @@ %else %define with_system_lua 1 %endif +%define pythons python3 Name: nmap -Version: 7.94 +Version: 7.95 Release: 0 Summary: Network exploration tool and security scanner # nmap 7.94 is licensed under Nmap Public Source License Version 0.95 @@ -43,7 +44,7 @@ Patch2: nmap-4.75-nostrip.patch Patch3: su-to-zenmap.patch Patch4: nmap-ncat-skip-network-tests.patch -Patch5: nmap-7.94-handle-unknown-service-name-in-p.patch +Patch5: zenmap-fix-locale-install.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ @@ -58,6 +59,10 @@ %if %{with_system_lua} BuildRequires: pkgconfig(lua) >= 5.4.4 %endif +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module build} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module wheel} %description Nmap ("Network Mapper") is a utility for network exploration or @@ -75,6 +80,7 @@ Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} Requires: python-gtk +Requires: python-gobject Obsoletes: %{name}-gtk < %{version} Provides: %{name}-gtk = %{version}-%{release} @@ -119,12 +125,6 @@ # use system provided libraries rm -rf 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 - #fix pt_PT/pt zh/zh_CN locale sed -i '/ALL_LINGUAS =/s/pt_PT/pt/' Makefile.in sed -i '/ALL_LINGUAS =/s/zh/zh_CN/' Makefile.in @@ -143,17 +143,34 @@ --with-liblua=included \ %endif --with-libpcre=%{_prefix} \ + --without-zenmap \ STRIP=/bin/true + %make_build +pushd zenmap +%pyproject_wheel +popd %install make DESTDIR=%{buildroot} deskdir="%{_datadir}/gnome/apps/Utilities/" install install -d "%{buildroot}%{_datadir}/pixmaps/" +install -d "%{buildroot}%{_datadir}/applications/" -rm "%{buildroot}%{_bindir}/uninstall_zenmap" rm "%{buildroot}%{_bindir}/uninstall_ndiff" -ln -s ../zenmap/pixmaps/zenmap.png "%{buildroot}%{_datadir}/pixmaps/zenmap.png" + +pushd zenmap +%pyproject_install +install -m 644 ../docs/zenmap.1 %{buildroot}%{_mandir}/man1/ +install -m 644 install_scripts/unix/*.desktop %{buildroot}%{_datadir}/applications/ +install -m 755 install_scripts/unix/su-to-zenmap.sh %{buildroot}%{_bindir}/su-to-zenmap.sh +ln -s %{python_sitelib}/zenmapCore/data/pixmaps/zenmap.png %{buildroot}%{_datadir}/pixmaps/zenmap.png +ln -sf zenmap %{buildroot}%{_bindir}/nmapfe +ln -sf zenmap %{buildroot}%{_bindir}/xnmap +popd + +%find_lang zenmap + %suse_update_desktop_file zenmap System Network %suse_update_desktop_file zenmap-root System Network touch -r %{buildroot}/%{python_sitelib}/zenmapCore/Paths.py %{buildroot}/%{python_sitelib}/zenmapCore/Paths.pyc @@ -175,7 +192,7 @@ compiled_with=$("%{buildroot}%{_bindir}/nmap" -V | grep "Compiled with:" ) # for the following tests, the leading space is relevant # check features built with system libraries -[[ $compiled_with == *\ libpcre-* ]] +[[ $compiled_with == *\ libpcre2-* ]] [[ $compiled_with == *\ libpcap-* ]] [[ $compiled_with == *\ openssl-* ]] # check features built with included sources @@ -203,18 +220,27 @@ %{_bindir}/nmap %{_datadir}/nmap -%files -n zenmap +%files -n zenmap -f zenmap.lang %{_bindir}/xnmap %{_bindir}/zenmap %{_bindir}/nmapfe -%{python_sitelib}/zenmap-%{version}-py*.egg-info -%{python_sitelib}/zenmapCore +%{_bindir}/su-to-zenmap.sh +%dir %{python_sitelib}/zenmapCore +%{python_sitelib}/zenmapCore/*.py{c,} +%{python_sitelib}/zenmapCore/__pycache__ +%dir %{python_sitelib}/zenmapCore/data +%{python_sitelib}/zenmapCore/data/{config,docs,misc,pixmaps} +%dir %{python_sitelib}/zenmapCore/data/locale +%dir %{python_sitelib}/zenmapCore/data/locale/* +%dir %{python_sitelib}/zenmapCore/data/locale/*/LC_MESSAGES +%{python_sitelib}/zenmapCore/data/locale/xgettext-profile_editor.py +%{python_sitelib}/zenmapCore/data/locale/__pycache__/* %{python_sitelib}/zenmapGUI %{python_sitelib}/radialnet %{_datadir}/applications/zenmap-root.desktop %{_datadir}/applications/zenmap.desktop +%{python_sitelib}/zenmap-%{version}.dist-info %{_datadir}/pixmaps/zenmap.png -%{_datadir}/zenmap %{_mandir}/man1/zenmap.1%{?ext_man} %files -n ndiff ++++++ nmap-7.94.tar.bz2 -> nmap-7.95.tar.bz2 ++++++ /work/SRC/openSUSE:Factory:NonFree/nmap/nmap-7.94.tar.bz2 /work/SRC/openSUSE:Factory:NonFree/.nmap.new.1882/nmap-7.95.tar.bz2 differ: char 11, line 1 ++++++ zenmap-fix-locale-install.patch ++++++ From d217ab017e667d536b7d43b8920b8d5700753465 Mon Sep 17 00:00:00 2001 From: Paul Howarth <paul@city-fan.org> Date: Tue, 23 Apr 2024 14:31:18 +0100 Subject: [PATCH] Fix failure to find zenmap translations Installation of translations hasn't worked since the conversion to Python 3 (#2088), and was broken in a different way in the migration from setup.py to pyproject.toml since package data files are not found deep down in directory hierarachies. This should address that (fixes #2718). --- zenmap/MANIFEST.in | 1 + zenmap/pyproject.toml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 zenmap/MANIFEST.in diff --git a/zenmap/MANIFEST.in b/zenmap/MANIFEST.in new file mode 100644 index 0000000000..3fc6b0d2ef --- /dev/null +++ b/zenmap/MANIFEST.in @@ -0,0 +1 @@ +include zenmapCore/data/locale/*/LC_MESSAGES/*.mo diff --git a/zenmap/pyproject.toml b/zenmap/pyproject.toml index 0a2e3f5d78..842f314a5a 100644 --- a/zenmap/pyproject.toml +++ b/zenmap/pyproject.toml @@ -23,12 +23,13 @@ Changelog = "https://nmap.org/changelog" [project.gui-scripts] zenmap = "zenmapGUI.App:run" -[tool.setuptools] -packages = [ +[tool.setuptools.packages.find] +include = [ "zenmapCore", "zenmapCore.data.config", "zenmapCore.data.docs", "zenmapCore.data.locale", +"zenmapCore.data.locale.*.LC_MESSAGES", "zenmapCore.data.misc", "zenmapCore.data.pixmaps", "zenmapCore.data.pixmaps.radialnet", @@ -47,7 +48,6 @@ version = {attr = "zenmapCore.Version.VERSION"} [tool.setuptools.package-data] "zenmapCore.data.pixmaps" = ["*.gif", "*.png"] "zenmapCore.data.pixmaps.radialnet" = ["*.png"] -"zenmapCore.data.locale" = ["*.mo"] "zenmapCore.data.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"] "zenmapCore.data.docs" = ["*.html"] "zenmapCore.data.misc" = ["*.xml"]