Rename Umit to Zenmap to reduce confusion between the version we ship with Nmap as the integrated GUI and the version maintained separately at umit.sourceforge.net

2025-12-24 16:39:03 +00:00 · 2007-10-24 21:45:50 +00:00
parent 25de001e67
commit 02db0e5981
8 changed files with 84 additions and 78 deletions
--- a/6
+++ b/6
@@ -1,4 +1,10 @@
 # Nmap Changelog ($Id$); -*-text-*-
+
+o Renamed Umit to Zenmap to reduce confusion between the version we
+  ship with Nmap and the version maintained separately at
+  umit.sourceforge.net.  We are excited about Zenmap and expect to
+  remove NmapFE in the near future.
+
 4.22SOC7

 o Integrated all of your OS detection new fingerprint submissions and
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ DBGFLAGS =
 LIBPCAPDIR = @libpcapdir@
 LIBPCREDIR = @LIBPCREDIR@
 export LIBDNETDIR = @LIBDNETDIR@
-UMITDIR = umit
+ZENMAPDIR = zenmap
 PYTHON = python
 DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" -DNMAPLIBEXECDIR=\"$(nmaplibexecdir)\"
 # For mtrace debugging -- see MTRACE define in main.cc for instructions
@@ -56,8 +56,8 @@ TARGET = nmap
 TARGETNMAPFE=@TARGETNMAPFE@
 INSTALLNMAPFE=@INSTALLNMAPFE@
 INSTALLNSE=@INSTALLNSE@
-BUILDUMIT=@BUILDUMIT@
-INSTALLUMIT=@INSTALLUMIT@
+BUILDZENMAP=@BUILDZENMAP@
+INSTALLZENMAP=@INSTALLZENMAP@

 ifneq (@LIBLUA_LIBS@,)
 NSE_SRC=nse_main.cc nse_auxiliar.cc nse_nsock.cc nse_init.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc 
@@ -77,7 +77,7 @@ OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@

 all: @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(NSESTDLIB)
-	$(MAKE) $(TARGET) $(TARGETNMAPFE) $(BUILDUMIT)
+	$(MAKE) $(TARGET) $(TARGETNMAPFE) $(BUILDZENMAP)

 $(TARGET): $(OBJS)
 	echo Compiling nmap
@@ -139,7 +139,7 @@ distro:
 web:
 	cd $(NMAPDEVDIR) && $(MAKE) web

-clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@ @UMIT_CLEAN@
+clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@ @ZENMAP_CLEAN@

 my_clean:
 	rm -f dependencies.mk
@@ -160,8 +160,8 @@ lua_clean:
 	-cd $(LIBLUADIR) && $(MAKE) clean
 nselib_clean:
 	-cd nselib && $(MAKE) clean
-umit_clean:
-	-cd $(UMITDIR) && $(PYTHON) setup.py clean --all
+zenmap_clean:
+	-cd $(ZENMAPDIR) && $(PYTHON) setup.py clean --all
 pcap_dist_clean:
 	-cd $(LIBPCAPDIR) && $(MAKE) distclean
 pcre_dist_clean:
@@ -178,12 +178,12 @@ nbase_dist_clean:
 	-cd $(NBASEDIR) && $(MAKE) distclean
 nsock_dist_clean:
 	-cd $(NSOCKDIR)/src && $(MAKE) distclean
-umit_dist_clean: umit_clean
-	-cd $(UMITDIR) && rm -rf MANIFEST build/ dist/
+zenmap_dist_clean: zenmap_clean
+	-cd $(ZENMAPDIR) && rm -rf MANIFEST build/ dist/
 debugclean:
 	rm -f *.gcov *.gcda *.gcno gmon.out

-distclean: my_clean my_distclean @LUA_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ nmapfe_dist_clean  @NSELIB_DIST_CLEAN@ @UMIT_DIST_CLEAN@
+distclean: my_clean my_distclean @LUA_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ nmapfe_dist_clean  @NSELIB_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@

 my_distclean:
 	rm -f Makefile Makefile.bak makefile.dep config.h stamp-h stamp-h.in \
@@ -208,18 +208,18 @@ install-nmapfe: $(TARGETNMAPFE)
 	@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

-$(UMITDIR)/setup.py:
-	cd $(UMITDIR) && install_scripts/unix/setup.sh
+$(ZENMAPDIR)/setup.py:
+	cd $(ZENMAPDIR) && install_scripts/unix/setup.sh

-# Update the version number used by Umit.
-$(UMITDIR)/umitCore/Version.py $(UMITDIR)/share/umit/config/umit_version: nmap.h
-	cd $(UMITDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)"
+# Update the version number used by Zenmap.
+$(ZENMAPDIR)/umitCore/Version.py $(ZENMAPDIR)/share/umit/config/umit_version: nmap.h
+	cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)"

-build-umit: $(UMITDIR)/setup.py $(UMITDIR)/umitCore/Version.py
-	cd $(UMITDIR) && $(PYTHON) setup.py build
+build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/umitCore/Version.py
+	cd $(ZENMAPDIR) && $(PYTHON) setup.py build

-install-umit: $(UMITDIR)/setup.py
-	cd $(UMITDIR) && $(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
+install-zenmap: $(ZENMAPDIR)/setup.py
+	cd $(ZENMAPDIR) && $(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)

 NSE_FILES = scripts/script.db scripts/*.nse
 NSE_LIB_LUA_FILES = nselib/*.lua
@@ -233,7 +233,7 @@ install-nse: $(TARGET)
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(nmaplibexecdir)/nse
 	cp -f $(NSE_LIB_SO_FILES) $(DESTDIR)$(nmaplibexecdir)/nse

-install: install-nmap $(INSTALLNMAPFE) $(INSTALLNSE) $(INSTALLUMIT)
+install: install-nmap $(INSTALLNMAPFE) $(INSTALLNSE) $(INSTALLZENMAP)
 	@echo "NMAP SUCCESSFULLY INSTALLED"

 uninstall:
--- a/42
+++ b/42
@@ -679,10 +679,10 @@ GREP
 EGREP
 TARGETNMAPFE
 INSTALLNMAPFE
-BUILDUMIT
-INSTALLUMIT
-UMIT_CLEAN
-UMIT_DIST_CLEAN
+BUILDZENMAP
+INSTALLZENMAP
+ZENMAP_CLEAN
+ZENMAP_DIST_CLEAN
 OPENSSL_LIBS
 PCAP_DEPENDS
 PCAP_CLEAN
@@ -1313,7 +1313,7 @@ Optional Packages:
  --with-localdirs        Explicitly ask compiler to use
                          /usr/local/{include,libs} if they exist
  --without-nmapfe        Skip nmapfe X-window GUI
-  --without-umit          Skip installation of the UMIT graphical frontend
+  --without-zenmap        Skip installation of the Zenmap graphical frontend
  --with-openssl=DIR      Use optional openssl libs and includes from
                          DIR/lib/ and DIR/include/openssl/)
  --with-libpcap=DIR      Look for pcap in DIR/include and DIR/libs.
@@ -4585,20 +4585,20 @@ fi



-# Do they want UMIT?
-BUILDUMIT=build-umit
-INSTALLUMIT=install-umit
-UMIT_CLEAN=umit_clean
-UMIT_DIST_CLEAN=umit_dist_clean
+# Do they want Zenmap?
+BUILDZENMAP=build-zenmap
+INSTALLZENMAP=install-zenmap
+ZENMAP_CLEAN=zenmap_clean
+ZENMAP_DIST_CLEAN=zenmap_dist_clean

-# Check whether --with-umit was given.
-if test "${with_umit+set}" = set; then
-  withval=$with_umit;  case "$with_umit" in
+# Check whether --with-zenmap was given.
+if test "${with_zenmap+set}" = set; then
+  withval=$with_zenmap;  case "$with_zenmap" in
   no)
-    BUILDUMIT=""
-    INSTALLUMIT=""
-    UMIT_CLEAN=""
-    UMIT_DIST_CLEAN=""
+    BUILDZENMAP=""
+    INSTALLZENMAP=""
+    ZENMAP_CLEAN=""
+    ZENMAP_DIST_CLEAN=""
    ;;
   esac

@@ -8424,10 +8424,10 @@ GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 TARGETNMAPFE!$TARGETNMAPFE$ac_delim
 INSTALLNMAPFE!$INSTALLNMAPFE$ac_delim
-BUILDUMIT!$BUILDUMIT$ac_delim
-INSTALLUMIT!$INSTALLUMIT$ac_delim
-UMIT_CLEAN!$UMIT_CLEAN$ac_delim
-UMIT_DIST_CLEAN!$UMIT_DIST_CLEAN$ac_delim
+BUILDZENMAP!$BUILDZENMAP$ac_delim
+INSTALLZENMAP!$INSTALLZENMAP$ac_delim
+ZENMAP_CLEAN!$ZENMAP_CLEAN$ac_delim
+ZENMAP_DIST_CLEAN!$ZENMAP_DIST_CLEAN$ac_delim
 OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
 PCAP_DEPENDS!$PCAP_DEPENDS$ac_delim
 PCAP_CLEAN!$PCAP_CLEAN$ac_delim
--- a/configure.ac
+++ b/configure.ac
@@ -186,25 +186,25 @@ AC_ARG_WITH(nmapfe, AC_HELP_STRING([--without-nmapfe], [Skip nmapfe X-window GUI
 AC_SUBST(TARGETNMAPFE)
 AC_SUBST(INSTALLNMAPFE)

-# Do they want UMIT?
-BUILDUMIT=build-umit
-INSTALLUMIT=install-umit
-UMIT_CLEAN=umit_clean
-UMIT_DIST_CLEAN=umit_dist_clean
-AC_ARG_WITH(umit, AC_HELP_STRING([--without-umit], [Skip installation of the UMIT graphical frontend]),
- [ case "$with_umit" in
+# Do they want Zenmap?
+BUILDZENMAP=build-zenmap
+INSTALLZENMAP=install-zenmap
+ZENMAP_CLEAN=zenmap_clean
+ZENMAP_DIST_CLEAN=zenmap_dist_clean
+AC_ARG_WITH(zenmap, AC_HELP_STRING([--without-zenmap], [Skip installation of the Zenmap graphical frontend]),
+ [ case "$with_zenmap" in
   no)
-    BUILDUMIT=""
-    INSTALLUMIT=""
-    UMIT_CLEAN=""
-    UMIT_DIST_CLEAN=""
+    BUILDZENMAP=""
+    INSTALLZENMAP=""
+    ZENMAP_CLEAN=""
+    ZENMAP_DIST_CLEAN=""
    ;;
   esac]
 )
-AC_SUBST(BUILDUMIT)
-AC_SUBST(INSTALLUMIT)
-AC_SUBST(UMIT_CLEAN)
-AC_SUBST(UMIT_DIST_CLEAN)
+AC_SUBST(BUILDZENMAP)
+AC_SUBST(INSTALLZENMAP)
+AC_SUBST(ZENMAP_CLEAN)
+AC_SUBST(ZENMAP_DIST_CLEAN)


 # We test whether they specified openssl desires explicitly
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -28,9 +28,9 @@ winbuild:
 	cd Release && cp -f $(NSE_LIB_FILES) ../nmap-$(NMAP_VERSION)/nselib/
 	zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION)
 	cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION)
-	mkdir nmap-$(NMAP_VERSION)/umit
-	cd ../umit && install_scripts/windows/copy_and_compile.bat
-	cp -R ../umit/dist/* ../umit/COPYING* ../umit/README nmap-$(NMAP_VERSION)/umit
+	mkdir nmap-$(NMAP_VERSION)/zenmap
+	cd ../zenmap && install_scripts/windows/copy_and_compile.bat
+	cp -R ../zenmap/dist/* ../zenmap/COPYING* ../zenmap/README nmap-$(NMAP_VERSION)/zenmap
 	cp nsis/AddToPath.nsh nsis/Nmap.nsi nsis/shortcuts.ini nmap-$(NMAP_VERSION)
 	$(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi
 	mv nmap-$(NMAP_VERSION)/NmapInstaller.exe nmap-$(NMAP_VERSION)-setup.exe
--- a/mswin32/buildguide.txt
+++ b/mswin32/buildguide.txt
@@ -2,10 +2,10 @@
                   =======================================


-I. UMIT BUILD DEPENDENCIES
+I. ZENMAP BUILD DEPENDENCIES


-I've listed the build dependencies for UMIT, the versions I am using, and
+I've listed the build dependencies for Zenmap, the versions I am using, and
 where to get them:

 GTK (2.10.11) - http://gladewin32.sourceforge.net
@@ -52,7 +52,7 @@ IV. INSTALLATION PATHS / PROBLEMS

 If you have Python installed to a directory other than C:\Python25, then
 you need to edit the copy_and_compile.bat file under
-umit/install_scripts/windows and change the "set PythonEXE" line with your
+zenmap/install_scripts/windows and change the "set PythonEXE" line with your
 installed directory.

 If you have GTK installed to a different directory, follow the same directions
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -56,7 +56,7 @@
 ;--------------------------------
 ;Variables

-Var umitset
+Var zenmapset

 ;--------------------------------
 ;Reserves
@@ -73,7 +73,7 @@ FunctionEnd


 Function shortcutsPage
-  StrCmp $umitset "" skip
+  StrCmp $zenmapset "" skip

  !insertmacro MUI_HEADER_TEXT "Create Shortcuts" ""
  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "shortcuts.ini"  
@@ -82,20 +82,20 @@ Function shortcutsPage
 FunctionEnd

 Function makeShortcuts
-  StrCmp $umitset "" skip
+  StrCmp $zenmapset "" skip

-  SetOutPath "$INSTDIR\umit"
+  SetOutPath "$INSTDIR\zenmap"

  ReadINIStr $0 "$PLUGINSDIR\shortcuts.ini" "Field 1" "State"
  StrCmp $0 "0" skipdesktop
-  CreateShortCut "$DESKTOP\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
+  CreateShortCut "$DESKTOP\Nmap - Zenmap GUI.lnk" "$INSTDIR\zenmap\zenmap.exe"

  skipdesktop:

  ReadINIStr $0 "$PLUGINSDIR\shortcuts.ini" "Field 2" "State"
  StrCmp $0 "0" skipstartmenu
  CreateDirectory "$SMPROGRAMS\Nmap"
-  CreateShortCut "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
+  CreateShortCut "$SMPROGRAMS\Nmap\Nmap - Zenmap GUI.lnk" "$INSTDIR\zenmap\zenmap.exe"

  skipstartmenu:

@@ -141,12 +141,12 @@ Section "Nmap Core Files" SecCore
  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoModify" 1 
  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Nmap" "NoRepair" 1 

-  ;Register .usr files with umit
-  ;This is commented out till umit supports opening log files from the command-line
+  ;Register .usr files with Zenmap
+  ;This is commented out till Zenmap supports opening log files from the command-line
  ;WriteRegStr HKCR ".usr" "" "UmitScan"
  ;WriteRegStr HKCR "UmitScan" "" "Umit Saved Port Scan"
  ;WriteRegStr HKCR "UmitScan\DefaultIcon" "" "$INSTDIR\umit_128.ico,0"
-  ;WriteRegStr HKCR "UmitScan\shell\open\command" "" '"$INSTDIR\umit.exe" "%1"'
+  ;WriteRegStr HKCR "UmitScan\shell\open\command" "" '"$INSTDIR\zenmap.exe" "%1"'
  ;WriteRegStr HKCR "UmitScan\shell" "" "open"
  ;System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
  
@@ -168,9 +168,9 @@ Section "Network Performance Improvements (Registry Changes)" SecPerfRegistryMod
  Exec 'regedt32 /S "$INSTDIR\nmap_performance.reg"' 
 SectionEnd 

-Section "UMIT (GUI frontend)" SecUmit
-  File /r ..\nmap-${VERSION}\umit
-  StrCpy $umitset "true"
+Section "Zenmap (GUI frontend)" SecZenmap
+  File /r ..\nmap-${VERSION}\zenmap
+  StrCpy $zenmapset "true"
 SectionEnd

 
@@ -233,12 +233,12 @@ Section "Uninstall"
  Push $INSTDIR 
  Call un.RemoveFromPath 

-  Delete "$DESKTOP\Nmap - UMIT GUI.lnk"
-  Delete "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk"
+  Delete "$DESKTOP\Nmap - Zenmap GUI.lnk"
+  Delete "$SMPROGRAMS\Nmap\Nmap - Zenmap GUI.lnk"
  RMDIR "$SMPROGRAMS\Nmap"

  ;Remove file association
-  ;This is commented out till umit supports opening log files from the command-line
+  ;This is commented out till Zenmap supports opening log files from the command-line
  ;DeleteRegKey HKCR ".usr"
  ;DeleteRegKey HKCR "UmitScan"
  ;System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
--- a/nmap.spec.in
+++ b/nmap.spec.in
@@ -55,7 +55,7 @@ be installed before installing nmap-frontend.
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=%{prefix} --mandir=%{prefix}/share/man --without-openssl --without-umit
+./configure --prefix=%{prefix} --mandir=%{prefix}/share/man --without-openssl --without-zenmap
 %if "%{static}" == "1"
 make static
 %else