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-03-18 16:42:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/nmap (Old) and /work/SRC/openSUSE:Factory:NonFree/.nmap.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nmap" Mon Mar 18 16:42:34 2024 rev:3 rq:1158073 version:7.94 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/nmap/nmap.changes 2024-01-25 18:38:46.597439767 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.nmap.new.1905/nmap.changes 2024-03-18 16:42:36.226630063 +0100 @@ -1,0 +2,6 @@ +Thu Mar 14 18:39:17 UTC 2024 - Andreas Stieger <[email protected]> + +- fix segfault with -p (boo#1221403) + add nmap-7.94-handle-unknown-service-name-in-p.patch + +------------------------------------------------------------------- New: ---- nmap-7.94-handle-unknown-service-name-in-p.patch BETA DEBUG BEGIN: New:- fix segfault with -p (boo#1221403) add nmap-7.94-handle-unknown-service-name-in-p.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.f5Gnvg/_old 2024-03-18 16:42:37.126663273 +0100 +++ /var/tmp/diff_new_pack.f5Gnvg/_new 2024-03-18 16:42:37.130663421 +0100 @@ -2,6 +2,7 @@ # spec file for package nmap # # Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 Andreas Stieger <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +33,7 @@ # nmap 7.94 is licensed under Nmap Public Source License Version 0.95 # https://nmap.org/npsl/ # https://bugzilla.opensuse.org/show_bug.cgi?id=1211571 -License: SUSE-NonFree +License: NonFree Group: Productivity/Networking/Diagnostic URL: https://nmap.org/ Source: https://nmap.org/dist/nmap-%{version}.tar.bz2 @@ -42,6 +43,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 BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ @@ -112,11 +114,7 @@ Service attacks, route tracing, etc. %prep -%setup -q -%patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 +%autosetup -p1 # use system provided libraries rm -rf libpcap libpcre macosx mswin32 ++++++ nmap-4.75-nostrip.patch ++++++ --- /var/tmp/diff_new_pack.f5Gnvg/_old 2024-03-18 16:42:37.150664160 +0100 +++ /var/tmp/diff_new_pack.f5Gnvg/_new 2024-03-18 16:42:37.150664160 +0100 @@ -1,8 +1,8 @@ -Index: Makefile.in +Index: nmap-7.94/Makefile.in =================================================================== ---- Makefile.in.orig 2012-09-13 01:17:42.000000000 +0100 -+++ Makefile.in 2012-12-02 11:47:22.000000000 +0000 -@@ -253,9 +253,6 @@ my_distclean: +--- nmap-7.94.orig/Makefile.in ++++ nmap-7.94/Makefile.in +@@ -316,9 +316,6 @@ distclean-%: clean-% install-nmap: $(TARGET) $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap ++++++ nmap-7.94-handle-unknown-service-name-in-p.patch ++++++ >From c13ce4536e09be371977f72d32a565662acad736 Mon Sep 17 00:00:00 2001 From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419> Date: Fri, 16 Jun 2023 18:20:16 +0000 Subject: [PATCH] Handle 'unknown' service name in -p. Fixes #2658 --- services.cc | 2 ++ utils.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/services.cc b/services.cc index 6631e2d703..493a8475b1 100644 --- a/services.cc +++ b/services.cc @@ -285,6 +285,8 @@ int addportsfromservmask(const char *mask, u8 *porttbl, int range_type) { for (i = service_table.begin(); i != service_table.end(); i++) { const service_node& current = i->second; + if (!current.s_name) + continue; if (wildtest(mask, current.s_name)) { if ((range_type & SCAN_TCP_PORT) && strcmp(current.s_proto, "tcp") == 0) { porttbl[current.s_port] |= SCAN_TCP_PORT; diff --git a/utils.cc b/utils.cc index 8a8ec2e60b..ea39c639e7 100644 --- a/utils.cc +++ b/utils.cc @@ -81,6 +81,8 @@ extern NmapOps o; int wildtest(const char *wild, const char *test) { int i; + assert(wild); + assert(test); while (*wild != '\0' || *test != '\0') { if (*wild == '*') { /* --- Deal with multiple asterisks. --- */ ++++++ su-to-zenmap.patch ++++++ --- /var/tmp/diff_new_pack.f5Gnvg/_old 2024-03-18 16:42:37.202666078 +0100 +++ /var/tmp/diff_new_pack.f5Gnvg/_new 2024-03-18 16:42:37.206666225 +0100 @@ -1,8 +1,8 @@ -Index: zenmap/install_scripts/unix/su-to-zenmap.sh +Index: nmap-7.94/zenmap/install_scripts/unix/su-to-zenmap.sh =================================================================== ---- zenmap/install_scripts/unix/su-to-zenmap.sh.orig 2012-08-19 21:11:06.000000000 +0100 -+++ zenmap/install_scripts/unix/su-to-zenmap.sh 2012-12-02 11:48:38.000000000 +0000 -@@ -13,8 +13,8 @@ if test "$euid" = "$privid"; then +--- nmap-7.94.orig/zenmap/install_scripts/unix/su-to-zenmap.sh ++++ nmap-7.94/zenmap/install_scripts/unix/su-to-zenmap.sh +@@ -19,8 +19,8 @@ if test "$euid" = "$privid"; then $COMMAND else if test -z "$SU_TO_ROOT_X"; then @@ -13,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,7 +39,7 @@ else +@@ -45,7 +45,7 @@ else fi fi case $SU_TO_ROOT_X in
